diff --git a/.gitignore b/.gitignore index 01682ea..e82ecd2 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ roms/ libvm.so tape_* rom -temp* *.qst *.tmp z_disassembled diff --git a/CHANGELOG.org b/CHANGELOG.org index 86947a6..2a22960 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -26,6 +26,7 @@ Exported DEHEX rom image to makefile and added checksum ** Changed Cleaned up x86 notes and moved into x86 folder Changed the results of make all to include all of the essential roms +Made makefile parallel build friendly ** Fixed Fixed failure to lookup symbols that are identical but are in different lexical scopes diff --git a/makefile b/makefile index 76f4355..238c132 100644 --- a/makefile +++ b/makefile @@ -62,19 +62,22 @@ M0: stage1_assembler-2 vm stage1/M0-macro.hex2 | roms ./bin/vm --rom roms/stage1_assembler-2 --tape_01 stage1/M0-macro.hex2 --tape_02 roms/M0 --memory 48K CAT: M0 stage1_assembler-2 vm High_level_prototypes/defs stage1/CAT.s | roms - cat High_level_prototypes/defs stage1/CAT.s >| temp - ./bin/vm --rom roms/M0 --tape_01 temp --tape_02 temp2 --memory 48K - ./bin/vm --rom roms/stage1_assembler-2 --tape_01 temp2 --tape_02 roms/CAT --memory 48K + cat High_level_prototypes/defs stage1/CAT.s >| CAT_TEMP + ./bin/vm --rom roms/M0 --tape_01 CAT_TEMP --tape_02 CAT_TEMP2 --memory 48K + ./bin/vm --rom roms/stage1_assembler-2 --tape_01 CAT_TEMP2 --tape_02 roms/CAT --memory 48K + rm CAT_TEMP CAT_TEMP2 lisp: M0 stage1_assembler-2 vm High_level_prototypes/defs stage2/lisp.s | roms - cat High_level_prototypes/defs stage2/lisp.s > temp - ./bin/vm --rom roms/M0 --tape_01 temp --tape_02 temp2 --memory 256K - ./bin/vm --rom roms/stage1_assembler-2 --tape_01 temp2 --tape_02 roms/lisp --memory 48K + cat High_level_prototypes/defs stage2/lisp.s > lisp_TEMP + ./bin/vm --rom roms/M0 --tape_01 lisp_TEMP --tape_02 lisp_TEMP2 --memory 256K + ./bin/vm --rom roms/stage1_assembler-2 --tape_01 lisp_TEMP2 --tape_02 roms/lisp --memory 48K + rm lisp_TEMP lisp_TEMP2 forth: M0 stage1_assembler-2 vm High_level_prototypes/defs stage2/forth.s | roms - cat High_level_prototypes/defs stage2/forth.s > temp - ./bin/vm --rom roms/M0 --tape_01 temp --tape_02 temp2 --memory 128K - ./bin/vm --rom roms/stage1_assembler-2 --tape_01 temp2 --tape_02 roms/forth --memory 48K + cat High_level_prototypes/defs stage2/forth.s > forth_TEMP + ./bin/vm --rom roms/M0 --tape_01 forth_TEMP --tape_02 forth_TEMP2 --memory 128K + ./bin/vm --rom roms/stage1_assembler-2 --tape_01 forth_TEMP2 --tape_02 roms/forth --memory 48K + rm forth_TEMP forth_TEMP2 # Primitive development tools, not required but it was handy asm: High_level_prototypes/asm.c | bin