diff --git a/nemu/1 b/nemu/1 index 4e1b6e2..3f56f7d 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 = 381 us -[INFO] src/cpu/cpu-exec.c:93 statistic() host time spent = 381 us +[INFO] src/cpu/cpu-exec.c:93 statistic() host time spent = 374 us +[INFO] src/cpu/cpu-exec.c:93 statistic() host time spent = 374 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 = 322,834 inst/s -[INFO] src/cpu/cpu-exec.c:95 statistic() simulation frequency = 322,834 inst/s +[INFO] src/cpu/cpu-exec.c:95 statistic() simulation frequency = 328,877 inst/s +[INFO] src/cpu/cpu-exec.c:95 statistic() simulation frequency = 328,877 inst/s diff --git a/nemu/Makefile b/nemu/Makefile index e5ab7e4..fbda0f6 100644 --- a/nemu/Makefile +++ b/nemu/Makefile @@ -84,7 +84,7 @@ $(IMAGES): %: %.bin $(BINARY) @$(BINARY) -b $< >/dev/null 2&>1 || printf "\t%14s\n" $(notdir $<) >> $(RESULT) integration-tests: $(IMAGES) - @printf "$(COLOR_BLUE)RESULT:$(COLOR_NONE)\n\tALL: %s, FAILED: %s\n" $(words $(IMAGES)) $(shell wc -l $(RESULT) | cut -f1 -d' ') + @printf "$(COLOR_BLUE)RESULT:$(COLOR_NONE)\n\tALL: %s\nFAILED: %s\n" $(words $(IMAGES)) $(shell wc -l $(RESULT) | cut -f1 -d' ') @printf "$(COLOR_RED)FAILED:$(COLOR_NONE)\n" @cat $(RESULT) @$(RM) $(RESULT)