From 5471ef02a7ee0fb31e460520e91ab2f6fcf06f4d Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 28 Mar 2020 09:08:46 -0400
Subject: [PATCH] forth: Forth-ify "BOOT"

---
 emul/forth/z80c.bin | Bin 805 -> 840 bytes
 forth/forth.asm     |  19 ++++++-------------
 forth/icore.fs      |   5 +++++
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 85d8145a98963fb3d965c0ed308df0ced9dd8c4f..ad2283f1903af1c85009952c99e0b36f907764b2 100644
GIT binary patch
delta 89
zcmZ3=c7kogFGkiNAzSXFlm9c?Xgm4)hv+k~@G&ScXe8UHXfo8WykoOtXX{|LV`sKx
tYv6Qb(kMtQDo)i@p6txjDJ;x&kyVxLKC1wmBa@XmLn9x9>E!!NZU7)57AgP$

delta 54
zcmX@Xwv=tdFGf}gA!hFG$^RK`I5Y|pi;7b<jV7ltbqasryvVA`cAr&%&5_B<oS~7A
KL1;1)vl{@`pAR4a

diff --git a/forth/forth.asm b/forth/forth.asm
index 59ff6a4..7d7d374 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -173,8 +173,9 @@ forthMain:
 	; Set up SYSVNXT
 	ld	hl, SYSVBUF
 	ld	(SYSVNXT), hl
-	ld	hl, BEGIN
-	push	hl
+	ld	hl, .bootName
+	call	find
+	push	de
 	jp	EXECUTE+2
 
 .parseName:
@@ -187,16 +188,8 @@ forthMain:
 	.db	"(print)", 0
 .keyName:
 	.db	"KEY", 0
-
-BEGIN:
-	.dw	compiledWord
-	.dw	LIT
-	.db	"(c<$)", 0
-	.dw	FIND_
-	.dw	NOT
-	.dw	CSKIP
-	.dw	EXECUTE
-	.dw	INTERPRET
+.bootName:
+	.db	"BOOT", 0
 
 INTERPRET:
 	.dw	compiledWord
@@ -206,7 +199,7 @@ INTERPRET:
 	.dw	DROP
 	.dw	EXECUTE
 
-.fill 13
+.fill 25
 
 ; *** Collapse OS lib copy ***
 ; In the process of Forth-ifying Collapse OS, apps will be slowly rewritten to
diff --git a/forth/icore.fs b/forth/icore.fs
index be1fa54..199cbf9 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -63,6 +63,11 @@
     AGAIN
 ;
 
+: BOOT
+    LIT< (c<$) (find) IF EXECUTE ELSE DROP THEN
+    _c INTERPRET
+;
+
 ( This is only the "early parser" in earlier stages. No need
   for an abort message )
 : (parse)