diff --git a/nemu/1 b/nemu/1 index 05e6717..24db142 100644 --- a/nemu/1 +++ b/nemu/1 @@ -167,9 +167,9 @@ If it is the second case, remember: 0x80000068: 02 f7 66 33 rem a2, a4, a5 [INFO] src/cpu/cpu-exec.c:125 cpu_exec() nemu: ABORT at pc = 0x80000068 [INFO] src/cpu/cpu-exec.c:125 cpu_exec() nemu: ABORT at pc = 0x80000068 -[INFO] src/cpu/cpu-exec.c:93 statistic() host time spent = 386 us -[INFO] src/cpu/cpu-exec.c:93 statistic() host time spent = 386 us +[INFO] src/cpu/cpu-exec.c:93 statistic() host time spent = 369 us +[INFO] src/cpu/cpu-exec.c:93 statistic() host time spent = 369 us [INFO] src/cpu/cpu-exec.c:94 statistic() total guest instructions = 123 [INFO] src/cpu/cpu-exec.c:94 statistic() total guest instructions = 123 -[INFO] src/cpu/cpu-exec.c:95 statistic() simulation frequency = 318,652 inst/s -[INFO] src/cpu/cpu-exec.c:95 statistic() simulation frequency = 318,652 inst/s +[INFO] src/cpu/cpu-exec.c:95 statistic() simulation frequency = 333,333 inst/s +[INFO] src/cpu/cpu-exec.c:95 statistic() simulation frequency = 333,333 inst/s diff --git a/nemu/Makefile b/nemu/Makefile index 364674e..98999b6 100644 --- a/nemu/Makefile +++ b/nemu/Makefile @@ -80,12 +80,12 @@ $(shell > $(RESULT)) # Clear result file $(IMAGES): %: %.bin $(BINARY) @echo + TEST $(notdir $<) - @$(BINARY) -b $< >/dev/null 2&>1 || printf "%14s\n" $(notdir $<) >> $(RESULT) + @$(BINARY) -b $< >/dev/null 2&>1 || printf "\t%14s\n" $(notdir $<) >> $(RESULT) integration-tests: $(IMAGES) + @printf "Test result:\n ALL: %s, FAILED: %s\n" $(words $(IMAGES)) $(shell wc -l $(RESULT) | cut -f1 -d' ') @printf "$(COLOR_RED)FAILED:$(COLOR_NONE)\n" @cat $(RESULT) - @printf "Test result:\n ALL: %s, FAILED: %s\n" $(words $(IMAGES)) $(shell wc -l $(RESULT) | cut -f1 -d' ') @$(RM) $(RESULT) test: unit-tests integration-tests