test the high level prototype M0-macro-compact against well known bin…

…aries
markjenkins · Feb 23, 2020 · 84128fa · 84128fa
1 parent 7683ccb
commit 84128fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/makefile b/makefile
@@ -127,7 +127,7 @@ test: ALL-ROMS test/SHA256SUMS test_stage0_monitor_asm_match
 	sha256sum -c test/SHA256SUMS
 
 # Prototypes
-ALL-PROTOTYPES: prototype_dehex prototype_M0 prototype_more prototype_SET prototype_stage1_assembler-1 prototype_stage1_assembler-2 prototype_lisp
+ALL-PROTOTYPES: prototype_dehex prototype_M0 prototype_more prototype_SET prototype_stage1_assembler-1 prototype_stage1_assembler-2 prototype_M0-macro-compact prototype_lisp
 
 prototype_dehex: dehex.c | prototypes
 	gcc stage1/High_level_prototypes/dehex.c -o prototypes/prototype_dehex
@@ -147,6 +147,9 @@ prototype_stage1_assembler-1: stage1_assembler-1.c | prototypes
 prototype_stage1_assembler-2: stage1_assembler-2.c | prototypes
 	gcc stage1/High_level_prototypes/stage1_assembler-2.c -o prototypes/prototype_stage1_assembler-2
 
+prototype_M0-macro-compact: M0-macro-compact.c | prototypes
+	gcc stage1/High_level_prototypes/M0-macro-compact.c -o prototypes/prototype_M0-macro-compact
+
 prototype_lisp: lisp.c lisp.h lisp_cell.c lisp_eval.c lisp_print.c lisp_read.c | prototypes
 	gcc -O2 stage2/High_level_prototypes/lisp.h \
 	        stage2/High_level_prototypes/lisp.c \

diff --git a/testM0-macro-compact.sh b/testM0-macro-compact.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 make vm \
+     prototype_M0-macro-compact \
      stage0_monitor stage1_assembler-0 stage1_assembler-1 stage1_assembler-2 \
      CAT cc_x86 DEHEX forth lisp M0 SET > /dev/null 2>&1
 
@@ -35,10 +36,7 @@ for vm in $VM_LIST; do \
 for prog in $ASSEMBLER_PROG_LIST; do \
 
     cat High_level_prototypes/defs "$prog".s > "$prog"_cat.s
-
-   ./bin/$vm --memory 256K --rom roms/M0 \
-	       --tape_01 "$prog"_cat.s \
-	       --tape_02 "$prog"_"$vm".hex2 > /dev/null 2>&1
+    ./prototypes/prototype_M0-macro-compact "$prog"_cat.s > "$prog"_"$vm".hex2
     rm -f "$prog"_cat.s
 
     ./bin/vm --memory 256K --rom roms/stage1_assembler-2 \