From a6efb650105e2cebfe341d9e6f61a1cba96a4904 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 10 Apr 2020 14:16:45 -0400
Subject: [PATCH] emul: extract capture mark from icore into xstop.fs

---
 emul/Makefile       | 14 ++++++++++----
 emul/forth/xstop.fs |  3 +++
 forth/icore.fs      |  3 ---
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 emul/forth/xstop.fs

diff --git a/emul/Makefile b/emul/Makefile
index eda22c2..2f4d0cb 100644
--- a/emul/Makefile
+++ b/emul/Makefile
@@ -1,6 +1,14 @@
 TARGETS = runbin/runbin forth/forth
 BIN2C = ../tools/bin2c
 # Those Forth source files are in a particular order
+BOOTSRCS = ./forth/conf.fs \
+	../forth/xcomp.fs \
+	./forth/xcomp.fs \
+	../forth/boot.fs \
+	../forth/z80c.fs \
+	../forth/icore.fs \
+	./forth/xstop.fs
+
 FORTHSRCS = core.fs cmp.fs print.fs str.fs parse.fs readln.fs fmt.fs z80a.fs
 FORTHSRC_PATHS = ${FORTHSRCS:%=../forth/%} forth/run.fs
 OBJS = emul.o libz80/libz80.o
@@ -60,11 +68,9 @@ emul.o: emul.c
 	$(CC) -c -o emul.o emul.c
 
 
-forth/z80c.bin: forth/stage2
-	cat ./forth/conf.fs ../forth/xcomp.fs ./forth/xcomp.fs ../forth/boot.fs ../forth/z80c.fs ../forth/icore.fs | ./forth/stage2 | tee $@ > /dev/null
-
 .PHONY: updatebootstrap
-updatebootstrap: forth/z80c.bin
+updatebootstrap: forth/stage2
+	cat $(BOOTSRCS) | ./forth/stage2 > ./forth/z80c.bin
 
 .PHONY: clean
 clean:
diff --git a/emul/forth/xstop.fs b/emul/forth/xstop.fs
new file mode 100644
index 0000000..1c14d32
--- /dev/null
+++ b/emul/forth/xstop.fs
@@ -0,0 +1,3 @@
+(xentry) _
+H@ 256 /MOD 2 PC! 2 PC!
+
diff --git a/forth/icore.fs b/forth/icore.fs
index 1b073e3..ab5f615 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -231,6 +231,3 @@
     ELSE (parse*) @ EXECUTE LITN THEN
     AGAIN
 ;
-
-(xentry) _
-H@ 256 /MOD 2 PC! 2 PC!