Giuseppe Manzoni пре 3 година
родитељ
комит
2f0b37d89e
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4 4
      makefile

+ 4 - 4
makefile

@@ -122,7 +122,7 @@ Generate-rom-test: ALL-ROMS
 	mkdir -p test
 	sha256sum roms/* | sort -k2 >| test/SHA256SUMS
 
-test_stage0_monitor_asm_match: asm stage0_monitor
+test_stage0_monitor_asm_match: asm hex stage0_monitor
 	mkdir -p test/stage0_test_scratch
 	sed 's/^[^#]*# //' stage0/stage0_monitor.hex0 > test/stage0_test_scratch/stage0_monitor.hex0.s
 	bin/asm test/stage0_test_scratch/stage0_monitor.hex0.s > test/stage0_test_scratch/stage0_monitor.hex0.hex0
@@ -136,8 +136,8 @@ test_stage0_monitor_asm_match: asm stage0_monitor
 
 .SILENT: testM0
 .PHONY: testM0
-testM0: vm16 vm vm64 M0-compact prototypes/prototype_M0-macro-compact ALL-ROMS
-	echo assembling ALL-ROMS with prototype_M0-macro-compact and M0 with 32 bit vm and M0-compact with vm, vm64 and vm16; \
+testM0: vm16 vm vm64 M0-compact prototype_M0-compact ALL-ROMS
+	echo assembling ALL-ROMS with prototype_M0-compact and M0 with 32 bit vm and M0-compact with vm, vm64 and vm16; \
 	VM_LIST='vm vm64 vm16'; \
 	STAGE_1_UNIFORM_PROG_LIST="stage1_assembler-0 stage1_assembler-1 \
 stage1_assembler-2 CAT SET"; \
@@ -153,7 +153,7 @@ stage1/M0-macro stage1/M0-macro-compact stage1/dehex"; \
 	done; \
 	for prog in $$ASSEMBLER_PROG_LIST; do \
 	cat High_level_prototypes/defs "$$prog".s > "$$prog"_TEMP.s; \
-	./prototypes/prototype_M0-macro-compact "$$prog"_TEMP.s > \
+	./prototypes/prototype_M0-compact "$$prog"_TEMP.s > \
 	"$$prog"_protoM0compact_TEMP.hex2; \
 	./bin/vm --memory 256K --rom roms/stage1_assembler-2 \
 	    --tape_01 "$$prog"_protoM0compact_TEMP.hex2 \