diff --git a/.gitignore b/.gitignore index 350a483..5555472 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ a.out *.log *.exe chytesting -disk0 \ No newline at end of file +disk0 +*.orig diff --git a/labcodes/lab5/Makefile b/labcodes/lab5/Makefile index d5ea58f..f416699 100644 --- a/labcodes/lab5/Makefile +++ b/labcodes/lab5/Makefile @@ -294,6 +294,9 @@ MAKEOPTS := --quiet --no-print-directory run-%: build-% $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null +run-nox-%: build-% + $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + build-%: touch $(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size" diff --git a/labcodes/lab6/Makefile b/labcodes/lab6/Makefile index fe161c0..7f21bcf 100644 --- a/labcodes/lab6/Makefile +++ b/labcodes/lab6/Makefile @@ -294,6 +294,9 @@ MAKEOPTS := --quiet --no-print-directory run-%: build-% $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null +run-nox-%: build-% + $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + build-%: touch $(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size" diff --git a/labcodes/lab7/Makefile b/labcodes/lab7/Makefile index 613b097..b680479 100644 --- a/labcodes/lab7/Makefile +++ b/labcodes/lab7/Makefile @@ -294,6 +294,9 @@ MAKEOPTS := --quiet --no-print-directory run-%: build-% $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null +run-nox-%: build-% + $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + build-%: touch $(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size" diff --git a/labcodes/lab8/Makefile b/labcodes/lab8/Makefile index 4aba038..b2e287d 100644 --- a/labcodes/lab8/Makefile +++ b/labcodes/lab8/Makefile @@ -343,6 +343,9 @@ run-%: build-% sh-%: script-% $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null +run-nox-%: build-% + $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + build-%: touch $(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$*" diff --git a/labcodes_answer/lab5_result/Makefile b/labcodes_answer/lab5_result/Makefile index 2ec80da..3ebf64c 100644 --- a/labcodes_answer/lab5_result/Makefile +++ b/labcodes_answer/lab5_result/Makefile @@ -285,6 +285,9 @@ MAKEOPTS := --quiet --no-print-directory run-%: build-% $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null +run-nox-%: build-% + $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + build-%: touch $(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size" diff --git a/labcodes_answer/lab6_result/Makefile b/labcodes_answer/lab6_result/Makefile index ff4355c..4a2caf8 100644 --- a/labcodes_answer/lab6_result/Makefile +++ b/labcodes_answer/lab6_result/Makefile @@ -285,6 +285,9 @@ MAKEOPTS := --quiet --no-print-directory run-%: build-% $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null +run-nox-%: build-% + $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + build-%: touch $(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size" diff --git a/labcodes_answer/lab7_result/Makefile b/labcodes_answer/lab7_result/Makefile index c5aa235..53da09a 100644 --- a/labcodes_answer/lab7_result/Makefile +++ b/labcodes_answer/lab7_result/Makefile @@ -285,6 +285,9 @@ MAKEOPTS := --quiet --no-print-directory run-%: build-% $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null +run-nox-%: build-% + $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + build-%: touch $(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size" diff --git a/labcodes_answer/lab8_result/Makefile b/labcodes_answer/lab8_result/Makefile index 2ca4155..1e3e279 100644 --- a/labcodes_answer/lab8_result/Makefile +++ b/labcodes_answer/lab8_result/Makefile @@ -335,6 +335,9 @@ run-%: build-% sh-%: script-% $(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null +run-nox-%: build-% + $(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic + build-%: touch $(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$*"