From 898684a7952788db10b1b009ee100649b0a76da2 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 25 Apr 2020 22:45:53 -0400
Subject: [PATCH] emul: merge pre.fs and emul.fs into stage1.fs

---
 emul/Makefile               | 2 +-
 emul/pre.fs                 | 2 --
 emul/{emul.fs => stage1.fs} | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 emul/pre.fs
 rename emul/{emul.fs => stage1.fs} (81%)

diff --git a/emul/Makefile b/emul/Makefile
index 3190525..94a01b5 100644
--- a/emul/Makefile
+++ b/emul/Makefile
@@ -25,7 +25,7 @@ $(BLKUNPACK): $(BLKPACK)
 # binary that should be updated manually through make updatebootstrap.
 forth0.bin:
 	cp z80c.bin $@
-	cat pre.fs emul.fs >> $@
+	cat stage1.fs >> $@
 
 forth0-bin.h: forth0.bin $(BIN2C)
 	$(BIN2C) KERNEL < forth0.bin | tee $@ > /dev/null
diff --git a/emul/pre.fs b/emul/pre.fs
deleted file mode 100644
index f3e7ed1..0000000
--- a/emul/pre.fs
+++ /dev/null
@@ -1,2 +0,0 @@
-CURRENT @ HERE !
-
diff --git a/emul/emul.fs b/emul/stage1.fs
similarity index 81%
rename from emul/emul.fs
rename to emul/stage1.fs
index 245a80b..cf391dd 100644
--- a/emul/emul.fs
+++ b/emul/stage1.fs
@@ -1,3 +1,4 @@
+CURRENT @ HERE !
 HERE @ 256 /MOD 2 PC! 2 PC!
 : EMIT 0 PC! ;
 : KEY 0 PC@ ;