Skip to content

Commit 5881597

Browse files
committed
Add target run-nox-<program>
This target allows starting ucore with the specified user program in pure terminal. Signed-off-by: Junjie Mao <[email protected]>
1 parent 2d1c200 commit 5881597

File tree

9 files changed

+26
-1
lines changed

9 files changed

+26
-1
lines changed

Diff for: .gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ a.out
1818
*.log
1919
*.exe
2020
chytesting
21-
disk0
21+
disk0
22+
*.orig

Diff for: labcodes/lab5/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,9 @@ MAKEOPTS := --quiet --no-print-directory
294294
run-%: build-%
295295
$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
296296

297+
run-nox-%: build-%
298+
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
299+
297300
build-%: touch
298301
$(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size"
299302

Diff for: labcodes/lab6/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,9 @@ MAKEOPTS := --quiet --no-print-directory
294294
run-%: build-%
295295
$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
296296

297+
run-nox-%: build-%
298+
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
299+
297300
build-%: touch
298301
$(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size"
299302

Diff for: labcodes/lab7/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,9 @@ MAKEOPTS := --quiet --no-print-directory
294294
run-%: build-%
295295
$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
296296

297+
run-nox-%: build-%
298+
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
299+
297300
build-%: touch
298301
$(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size"
299302

Diff for: labcodes/lab8/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,9 @@ run-%: build-%
343343
sh-%: script-%
344344
$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
345345

346+
run-nox-%: build-%
347+
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
348+
346349
build-%: touch
347350
$(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$*"
348351

Diff for: labcodes_answer/lab5_result/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ MAKEOPTS := --quiet --no-print-directory
285285
run-%: build-%
286286
$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
287287

288+
run-nox-%: build-%
289+
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
290+
288291
build-%: touch
289292
$(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size"
290293

Diff for: labcodes_answer/lab6_result/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ MAKEOPTS := --quiet --no-print-directory
285285
run-%: build-%
286286
$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
287287

288+
run-nox-%: build-%
289+
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
290+
288291
build-%: touch
289292
$(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size"
290293

Diff for: labcodes_answer/lab7_result/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ MAKEOPTS := --quiet --no-print-directory
285285
run-%: build-%
286286
$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
287287

288+
run-nox-%: build-%
289+
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
290+
288291
build-%: touch
289292
$(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$* -DTESTSTART=$(RUN_PREFIX)$*_out_start -DTESTSIZE=$(RUN_PREFIX)$*_out_size"
290293

Diff for: labcodes_answer/lab8_result/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,9 @@ run-%: build-%
335335
sh-%: script-%
336336
$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
337337

338+
run-nox-%: build-%
339+
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
340+
338341
build-%: touch
339342
$(V)$(MAKE) $(MAKEOPTS) "DEFS+=-DTEST=$*"
340343

0 commit comments

Comments
 (0)