From 2db6ebc24776ecd9a5dda73894cbfd5650e1d380 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 28 Mar 2020 10:14:27 -0400
Subject: [PATCH] forth: Forth-ify "BYE"

---
 emul/forth/z80c.bin | Bin 910 -> 922 bytes
 forth/forth.asm     |  11 ++---------
 forth/z80c.fs       |   4 ++++
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 13f40bfb8224c805d0942e0f09b4c5ac7bccf8ef..e16eee8ec3080c235f9e2cbb0700cae8c28ab63b 100644
GIT binary patch
delta 116
zcmV-)0E_>Q2bu@4%K;QZSw$8A0~Y{x!x{i6a%FQ<P$><Q(*Zga;Sz`o5DN$cK>|TS
zPf}D900j;JQIjG9TNSSfK>{dnVRCb2DI)*}4gf?2?gpEak^)Qv8w#6~;Q~|>WeU*+
WB?jLG5C%a4IyV4;4giOfNCQT`#2pd<

delta 104
zcmV-u0GI!o2aX4@%K-=|a%FQ<P$?Rd-vK%mz7k~%?FtA3K>|TSPf}D900j;JMUyT9
zTNR@TK>{dnVRCb2DI)*}4gf?2?go#Oo&rn*4+@Wy?E+L2SqjkwB?jLG5C%a4IyV4;
K4gh<TR0BrT^cyY!

diff --git a/forth/forth.asm b/forth/forth.asm
index 6e5a86d..51f6bf5 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -660,21 +660,14 @@ abortUnderflow:
 .name:
 	.db "(uflw)", 0
 
-.fill 41
-
-	.db "BYE"
-	.dw $-QUIT
-	.db 3
-BYE:
-	.dw nativeWord
-	halt
+.fill 50
 
 ; STABLE ABI
 ; Offset: 02aa
 .out $
 ; ( c -- )
 	.db "EMIT"
-	.dw $-BYE
+	.dw $-QUIT
 	.db 4
 EMIT:
 	.dw	compiledWord
diff --git a/forth/z80c.fs b/forth/z80c.fs
index 9ed22b2..1639b10 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -246,6 +246,10 @@ CODE IMMED?
     DE PUSHqq,
 ;CODE
 
+CODE BYE
+    HALT,
+;CODE
+
 CODE (resSP)
     ( INITIAL_SP == JTBL+28 )
     SP JTBL 28 + @ LDdd(nn),