andrius
/
stage0
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'janneke' of https://gitlab.com/janneke/stage0

This commit is contained in:
Jeremiah Orians 2018-10-17 17:08:20 -04:00
parent 8c7341ddf7 137e8b7139
commit 2c2ef0b908
No known key found for this signature in database
GPG Key ID: 7457821534D2ACCD
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Linux Bootstrap/hex.c
View File

@ -62,10 +62,7 @@ int main(int argc, char *argv[])
do do
{ {
c = getchar(); c = getchar();
if (c == '#') if ((c == '#') || (c == ';')) purge_line_comments();
{
purge_line_comments();
}
else if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) else if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
{ {
if(!toggle) if(!toggle)
@ -75,9 +72,9 @@ int main(int argc, char *argv[])
} }
else else
{ {
sum = (sum * 16) + hex(c); sum = (sum << 4) + hex(c);
toggle = false; toggle = false;
putc(sum, stdout); fputc(sum, stdout);
} }
} }
}while(c != EOF); }while(c != EOF);

28
makefile
View File

@ -26,16 +26,16 @@ development: vm libvm.so asm dis ALL-ROMS
# VM Builds # VM Builds
vm-minimal: vm.h vm_minimal.c vm_instructions.c vm_decode.c | bin vm-minimal: vm.h vm_minimal.c vm_instructions.c vm_decode.c | bin
gcc vm.h vm_minimal.c vm_instructions.c vm_decode.c -o bin/vm-minimal $(CC) -DVM32=true vm.h vm_minimal.c vm_instructions.c vm_decode.c -o bin/vm-minimal
vm: vm.h vm.c vm_instructions.c vm_decode.c tty.c | bin vm: vm.h vm.c vm_instructions.c vm_decode.c tty.c | bin
gcc -ggdb -DVM32=true -Dtty_lib=true vm.h vm.c vm_instructions.c vm_decode.c tty.c -o bin/vm $(CC) -ggdb -DVM32=true -Dtty_lib=true vm.h vm.c vm_instructions.c vm_decode.c tty.c -o bin/vm
vm-production: vm.h vm.c vm_instructions.c vm_decode.c | bin vm-production: vm.h vm.c vm_instructions.c vm_decode.c | bin
gcc vm.h vm.c vm_instructions.c vm_decode.c -o bin/vm-production $(CC) -DVM32=true vm.h vm.c vm_instructions.c vm_decode.c -o bin/vm-production
vm-trace: vm.h vm.c vm_instructions.c vm_decode.c tty.c dynamic_execution_trace.c | bin vm-trace: vm.h vm.c vm_instructions.c vm_decode.c tty.c dynamic_execution_trace.c | bin
gcc -ggdb -Dtty_lib=true -DTRACE=true vm.h vm.c vm_instructions.c vm_decode.c tty.c dynamic_execution_trace.c -o bin/vm $(CC) -DVM32=true -ggdb -Dtty_lib=true -DTRACE=true vm.h vm.c vm_instructions.c vm_decode.c tty.c dynamic_execution_trace.c -o bin/vm
# Build the roms # Build the roms
ALL-ROMS: stage0_monitor stage1_assembler-0 SET DEHEX stage1_assembler-1 stage1_assembler-2 M0 CAT lisp cc_x86 forth ALL-ROMS: stage0_monitor stage1_assembler-0 SET DEHEX stage1_assembler-1 stage1_assembler-2 M0 CAT lisp cc_x86 forth
@ -87,23 +87,23 @@ forth: M0 stage1_assembler-2 vm High_level_prototypes/defs stage2/forth.s | roms
# Primitive development tools, not required but it was handy # Primitive development tools, not required but it was handy
asm: High_level_prototypes/asm.c | bin asm: High_level_prototypes/asm.c | bin
gcc -ggdb High_level_prototypes/asm.c -o bin/asm $(CC) -ggdb High_level_prototypes/asm.c -o bin/asm
dis: High_level_prototypes/disasm.c | bin dis: High_level_prototypes/disasm.c | bin
gcc -ggdb High_level_prototypes/disasm.c -o bin/dis $(CC) -ggdb High_level_prototypes/disasm.c -o bin/dis
hex: Linux\ Bootstrap/hex.c | bin hex: Linux\ Bootstrap/hex.c | bin
gcc Linux\ Bootstrap/hex.c -o bin/hex $(CC) Linux\ Bootstrap/hex.c -o bin/hex
xeh: Linux\ Bootstrap/xeh.c | bin xeh: Linux\ Bootstrap/xeh.c | bin
gcc Linux\ Bootstrap/xeh.c -o bin/xeh $(CC) Linux\ Bootstrap/xeh.c -o bin/xeh
# libVM Builds for Development tools # libVM Builds for Development tools
libvm.so: wrapper.c vm_instructions.c vm_decode.c vm.h tty.c libvm.so: wrapper.c vm_instructions.c vm_decode.c vm.h tty.c
gcc -ggdb -DVM32=true -Dtty_lib=true -shared -Wl,-soname,libvm.so -o libvm.so -fPIC wrapper.c vm_instructions.c vm_decode.c vm.h tty.c $(CC) -ggdb -DVM32=true -Dtty_lib=true -shared -Wl,-soname,libvm.so -o libvm.so -fPIC wrapper.c vm_instructions.c vm_decode.c vm.h tty.c
libvm-production.so: wrapper.c vm_instructions.c vm_decode.c vm.h libvm-production.so: wrapper.c vm_instructions.c vm_decode.c vm.h
gcc -DVM32=true -shared -Wl,-soname,libvm.so -o libvm-production.so -fPIC wrapper.c vm_instructions.c vm_decode.c vm.h $(CC) -DVM32=true -shared -Wl,-soname,libvm.so -o libvm-production.so -fPIC wrapper.c vm_instructions.c vm_decode.c vm.h
# Tests # Tests
Generate-rom-test: ALL-ROMS Generate-rom-test: ALL-ROMS
@ -147,10 +147,14 @@ prototype_lisp: lisp.c lisp.h lisp_cell.c lisp_eval.c lisp_print.c lisp_read.c |
# Clean up after ourselves # Clean up after ourselves
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf bin/ roms/ prototypes/ *.so rm -f libvm.so libvm-production.so bin/vm bin/vm-production
.PHONY: clean-hard
clean-hard: clean
rm -rf bin/ roms/ prototypes/
.PHONY: clean-hardest .PHONY: clean-hardest
clean-hard: clean-hardest:
git reset --hard git reset --hard
git clean -fd git clean -fd
rm -rf bin/ roms/ prototypes/ rm -rf bin/ roms/ prototypes/