diff --git a/.gitmodules b/.gitmodules index 5a975de..0a44de3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,9 +9,6 @@ [submodule "bootstrap-seeds"] path = sysa/bootstrap-seeds url = https://github.com/oriansj/bootstrap-seeds -[submodule "sysa/blynn-compiler/src"] - path = sysa/blynn-compiler/src - url = https://github.com/oriansj/blynn-compiler [submodule "sysa/mes/src/mes"] path = sysa/mes/src/mes url = https://gitlab.com/janneke/mes.git diff --git a/rootfs.sh b/rootfs.sh index 21cd482..6331884 100755 --- a/rootfs.sh +++ b/rootfs.sh @@ -84,10 +84,6 @@ cp helpers.sh run.sh pre-sha.sha256sums tmp/after/ # mescc-tools-extra cp -r mescc-tools-extra tmp/after/ -# blynn-compiler -cp -r blynn-compiler tmp/after/ -mkdir -p tmp/after/blynn-compiler/src/{bin,generated} - # mes cp -r mes tmp/after/ #ln -s lib/x86-mes tmp/after/mes/src/mes/x86-mes diff --git a/sysa/after.kaem.run b/sysa/after.kaem.run index 064ef98..97f6d5b 100755 --- a/sysa/after.kaem.run +++ b/sysa/after.kaem.run @@ -38,12 +38,6 @@ chmod 755 bin/hex2 bin/M1 bin/M2-Planet bin/blood-elf \ fletcher16 mescc-tools-seed-checksums PATH=/after/bin -# Part 4: blynn-compiler -pkg="blynn-compiler" -cd ${pkg} -kaem --file ${pkg}.kaem -cd .. - # Part 5: mes pkg="mes" cd ${pkg} diff --git a/sysa/blynn-compiler/blynn-compiler.kaem b/sysa/blynn-compiler/blynn-compiler.kaem deleted file mode 100755 index 5d4bb7c..0000000 --- a/sysa/blynn-compiler/blynn-compiler.kaem +++ /dev/null @@ -1,264 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2021 fosslinux -# SPDX-FileCopyrightText: 2020-2021 Jeremiah Orians -# SPDX-FileCopyrightText: 2020-2021 2021 Paul Dersey -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -ex - -cd src - -# compile pack_blobs.c -M2-Planet --architecture x86 \ - -f functions/file.c \ - -f functions/exit.c \ - -f functions/malloc.c \ - -f functions/calloc.c \ - -f functions/file_print.c \ - -f functions/match.c \ - -f functions/require.c \ - -f pack_blobs.c \ - --debug \ - -o bin/pack_blobs.M1 - -# Create dwarf stubs for pack_blobs -blood-elf -f bin/pack_blobs.M1 --entry _start -o bin/pack_blobs-footer.M1 - -# Convert to hex2 linker format -M1 -f test/common_x86/x86_defs.M1 \ - -f test/common_x86/libc-core.M1 \ - -f bin/pack_blobs.M1 \ - -f bin/pack_blobs-footer.M1 \ - --LittleEndian \ - --architecture x86 \ - -o bin/pack_blobs.hex2 - -# Link into final static binary -hex2 -f test/common_x86/ELF-i386-debug.hex2 \ - -f bin/pack_blobs.hex2 \ - --LittleEndian \ - --architecture x86 \ - --BaseAddress 0x8048000 \ - -o bin/pack_blobs --exec_enable - -# Build blobs -./bin/pack_blobs -f blob/parenthetically.source -o generated/parenthetically -./bin/pack_blobs -f blob/exponentially.source -o generated/exponentially -./bin/pack_blobs -f blob/practically.source -o generated/practically -./bin/pack_blobs -f blob/singularity.source -o generated/singularity_blob - -# Compile to assembly vm.c -M2-Planet --architecture x86 \ - -f functions/file.c \ - -f functions/exit.c \ - -f functions/malloc.c \ - -f functions/calloc.c \ - -f functions/file_print.c \ - -f functions/in_set.c \ - -f functions/numerate_number.c \ - -f functions/match.c \ - -f functions/require.c \ - -f vm.c \ - --debug \ - -o bin/vm.M1 - -# Create dwarf stubs for vm -blood-elf -f bin/vm.M1 --entry _start -o bin/vm-footer.M1 - -# Convert to hex2 linker format -M1 -f test/common_x86/x86_defs.M1 \ - -f test/common_x86/libc-core.M1 \ - -f bin/vm.M1 \ - -f bin/vm-footer.M1 \ - --LittleEndian \ - --architecture x86 \ - -o bin/vm.hex2 - -# Link into final static binary -hex2 -f test/common_x86/ELF-i386-debug.hex2 \ - -f bin/vm.hex2 \ - --LittleEndian \ - --architecture x86 \ - --BaseAddress 0x8048000 \ - -o bin/vm --exec_enable - -# Generate raw file needed -./bin/vm --raw blob/root -pb bootstrap -lf generated/parenthetically -o bin/raw_l -./bin/vm --raw bin/raw_l -pb generated/parenthetically -lf generated/exponentially -o bin/raw_m -./bin/vm --raw bin/raw_m -pb generated/exponentially -lf generated/practically -o bin/raw_n -./bin/vm --raw bin/raw_n -pb generated/practically -lf generated/singularity_blob -o bin/raw_o -./bin/vm --raw bin/raw_o -pb generated/singularity_blob -lf singularity -o bin/raw_p -./bin/vm --raw bin/raw_p -pb singularity -lf semantically -o bin/raw_q -./bin/vm --raw bin/raw_q -pb semantically -lf stringy -o bin/raw_r -./bin/vm --raw bin/raw_r -pb stringy -lf binary -o bin/raw_s -./bin/vm --raw bin/raw_s -pb binary -lf algebraically -o bin/raw_t -./bin/vm --raw bin/raw_t -pb algebraically -lf parity.hs -o bin/raw_u -./bin/vm --raw bin/raw_u -pb parity.hs -lf fixity.hs -o bin/raw_v -./bin/vm --raw bin/raw_v -pb fixity.hs -lf typically.hs -o bin/raw_w -./bin/vm --raw bin/raw_w -pb typically.hs -lf classy.hs -o bin/raw_x -./bin/vm --raw bin/raw_x -pb classy.hs -lf barely.hs -o bin/raw_y -./bin/vm --raw bin/raw_y -pb barely.hs -lf barely.hs -o bin/raw_z -./bin/vm -l bin/raw_z -lf barely.hs -o bin/raw - -# Make lonely -./bin/vm -l bin/raw -lf effectively.hs --redo -lf lonely.hs -o generated/lonely_raw.txt - -# Make patty -./bin/vm -f patty.hs --raw generated/lonely_raw.txt --rts_c run -o generated/patty_raw.txt - -# Make guardedly -./bin/vm -f guardedly.hs --raw generated/patty_raw.txt --rts_c run -o generated/guardedly_raw.txt - -# Make assembly -./bin/vm -f assembly.hs --raw generated/guardedly_raw.txt --rts_c run -o generated/assembly_raw.txt - -# Make mutually -./bin/vm -f mutually.hs --foreign 2 --raw generated/assembly_raw.txt --rts_c run -o generated/mutually_raw.txt - -# Make uniquely -./bin/vm -f uniquely.hs --foreign 2 --raw generated/mutually_raw.txt --rts_c run -o generated/uniquely_raw.txt - -# Make virtually -./bin/vm -f virtually.hs --foreign 2 --raw generated/uniquely_raw.txt --rts_c run -o generated/virtually_raw.txt - -# Make marginally -./bin/vm -f marginally.hs --foreign 2 --raw generated/virtually_raw.txt --rts_c run -o generated/marginally.c -M2-Planet --architecture x86 \ - -f functions/file.c \ - -f functions/exit.c \ - -f functions/malloc.c \ - -f functions/calloc.c \ - -f functions/file_print.c \ - -f functions/in_set.c \ - -f functions/numerate_number.c \ - -f functions/match.c \ - -f functions/require.c \ - -f generated/marginally.c \ - --debug \ - -o bin/marginally.M1 - -blood-elf -f bin/marginally.M1 --entry _start -o bin/marginally-footer.M1 - -M1 -f test/common_x86/x86_defs.M1 \ - -f test/common_x86/libc-core.M1 \ - -f bin/marginally.M1 \ - -f bin/marginally-footer.M1 \ - --LittleEndian \ - --architecture x86 \ - -o bin/marginally.hex2 - -hex2 -f test/common_x86/ELF-i386-debug.hex2 \ - -f bin/marginally.hex2 \ - --LittleEndian \ - --architecture x86 \ - --BaseAddress 0x8048000 \ - -o bin/marginally --exec_enable - -# Make methodically -./bin/marginally methodically.hs generated/methodically.c -M2-Planet --architecture x86 \ - -f functions/file.c \ - -f functions/exit.c \ - -f functions/malloc.c \ - -f functions/calloc.c \ - -f functions/file_print.c \ - -f functions/in_set.c \ - -f functions/numerate_number.c \ - -f functions/match.c \ - -f functions/require.c \ - -f generated/methodically.c \ - --debug \ - -o bin/methodically.M1 - -blood-elf -f bin/methodically.M1 --entry _start -o bin/methodically-footer.M1 - -M1 -f test/common_x86/x86_defs.M1 \ - -f test/common_x86/libc-core.M1 \ - -f bin/methodically.M1 \ - -f bin/methodically-footer.M1 \ - --LittleEndian \ - --architecture x86 \ - -o bin/methodically.hex2 - -hex2 -f test/common_x86/ELF-i386-debug.hex2 \ - -f bin/methodically.hex2 \ - --LittleEndian \ - --architecture x86 \ - --BaseAddress 0x8048000 \ - -o bin/methodically --exec_enable - -# Make crossly -./bin/methodically crossly.hs generated/crossly.c -M2-Planet --architecture x86 \ - -f functions/file.c \ - -f functions/exit.c \ - -f functions/malloc.c \ - -f functions/calloc.c \ - -f functions/file_print.c \ - -f functions/in_set.c \ - -f functions/numerate_number.c \ - -f functions/match.c \ - -f functions/require.c \ - -f generated/crossly.c \ - --debug \ - -o bin/crossly.M1 - -blood-elf -f bin/crossly.M1 --entry _start -o bin/crossly-footer.M1 - -M1 -f test/common_x86/x86_defs.M1 \ - -f test/common_x86/libc-core.M1 \ - -f bin/crossly.M1 \ - -f bin/crossly-footer.M1 \ - --LittleEndian \ - --architecture x86 \ - -o bin/crossly.hex2 - -hex2 -f test/common_x86/ELF-i386-debug.hex2 \ - -f bin/crossly.hex2 \ - --LittleEndian \ - --architecture x86 \ - --BaseAddress 0x8048000 \ - -o bin/crossly --exec_enable - -# Make precisely -./bin/crossly precisely.hs generated/precisely.c -M2-Planet --architecture x86 \ - -f functions/file.c \ - -f functions/exit.c \ - -f functions/malloc.c \ - -f functions/calloc.c \ - -f functions/file_print.c \ - -f functions/in_set.c \ - -f functions/numerate_number.c \ - -f functions/match.c \ - -f functions/require.c \ - -f generated/precisely.c \ - --debug \ - -o bin/precisely.M1 - -blood-elf -f bin/precisely.M1 --entry _start -o bin/precisely-footer.M1 - -M1 -f test/common_x86/x86_defs.M1 \ - -f test/common_x86/libc-core.M1 \ - -f bin/precisely.M1 \ - -f bin/precisely-footer.M1 \ - --LittleEndian \ - --architecture x86 \ - -o bin/precisely.hex2 - -hex2 -f test/common_x86/ELF-i386-debug.hex2 \ - -f bin/precisely.hex2 \ - --LittleEndian \ - --architecture x86 \ - --BaseAddress 0x8048000 \ - -o bin/precisely --exec_enable - -cp bin/precisely ${bindir}/precisely -chmod 755 ${bindir}/precisely - -cd .. - -# Checksums -fletcher16 checksums diff --git a/sysa/blynn-compiler/checksums b/sysa/blynn-compiler/checksums deleted file mode 100644 index a6bd3f6..0000000 --- a/sysa/blynn-compiler/checksums +++ /dev/null @@ -1 +0,0 @@ -62114 /after/bin/precisely diff --git a/sysa/blynn-compiler/src b/sysa/blynn-compiler/src deleted file mode 160000 index 2f31a7b..0000000 --- a/sysa/blynn-compiler/src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2f31a7bcd767a14732e6e9f3f442e0545495bc44 diff --git a/sysa/pre-sha.sha256sums b/sysa/pre-sha.sha256sums index 9689bf8..2360b23 100644 --- a/sysa/pre-sha.sha256sums +++ b/sysa/pre-sha.sha256sums @@ -13,7 +13,6 @@ d41067670562f87c6e43af0b461c4070c19a8ffc15c455cb075d98419ae76c73 /after/bin/mes b91c81e543b878ead4cc975df75e3d211f7bd2dcdd4c90e42df99d44311ce71e /after/bin/mescc.scm e94a2468c045582cfd13df51acd0932afdc834fa60139f7bfb7a2d65afa39a65 /after/bin/mes-tcc 3cf426251744300a099a40f3609ccbd32ec3b9f3334601defa5736e7fd6c6f1d /after/bin/patch -e01eaee677cd4fd65a65e7d1e2905a8587a3bab82fc1d0b81cffbe2959f2813d /after/bin/precisely b4b16b3314a6f4a8be1b849aba45252e621a7123025dabdf9af6c2d4d657e9b6 /after/bin/sed bc9ddf9854bd954c71bb1cf5b0af77fd65b8fa7f290b42c75020fb8893deb53c /after/bin/sha256sum 9f83aae8cee866b3af409bb6d28e32d0a04db0e7b64680af4e38b5f43b5ece96 /after/bin/tar