From f9c3a0444c5b68b81801d47db8602278a80ec033 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 30 Mar 2020 13:57:06 -0400
Subject: [PATCH] forth: Forth-ify "DROP"

---
 emul/forth/z80c.bin | Bin 1287 -> 1300 bytes
 forth/forth.asm     |  12 ++----------
 forth/icore.fs      |  10 +++++-----
 forth/z80c.fs       |   5 +++++
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 19c2a3f6f01141d42067828bd462ca2986611a16..94454433ab746c5bb0034b025ee10ccdb9cd3d00 100644
GIT binary patch
delta 453
zcmXv~%}WA76o1Z)v$JEYCY4(nY|+vOUL)vBHZu@HZFj?CS%-)qB0CD^r95;9wtIg<
z^#=rk(7kI!(yf#Cf~YrIm&Y*g_w|04@<v|U@pZRYiULc(dwUGLvQv@|a~EVaJ@gvc
zjR@+Ht?j%Y2WEf;0AJx4zZH{^FZemP<mP;+u_|vO%vmeCz71gmuEcQAC5h=3-61n4
zr-#R9v%{bnP~k1D!rQDvI6QKPya@|JkPXsws(zp=bapufL>Ucy*ger~+E5?QVVmD;
zYW5iTiXp%3Ws*P@d;*^OT3VYq#4nbM?z#!wfIGdy-*jckz#&y$C*2<;;yTs8$oTlw
z10IY23HR|GL_G%YG+~=^kNw+v7+x8lbFUYrgK<1f&{i<cMnh(>!1AGL&|t|UEJQkF
zGw&BN%H=6+feBfJsyY`3p<%#=w7>vCO<BWmBiPNp=nw%-TF0mYr-UvVH0igjlNSuV
TG_QCTo+0R>sN(%QQ3(A44WD1f

delta 452
zcmX|-&r1S99L2xR%+Aj4!fMeE!KhUbk_fzHYz51N3PPyqrqHDfJamyzFOjfxu}%?f
ze?k2NhNsR#cRP03tA~ir9jaNiuJ66?%;&v(^-8^sOXVsr2A?*&$cfFpY88!Pj`k07
z_AC$`3;_6&LiCQsAeXl@rD7>#Lx-63TEzHnp=8HF(!pU&;b`@&)@;=iL6CJwO9SE|
z0?D!7JZ-cS^S)lAeYr+`k3x@fG-L(@ASFA<-N8|Os3hHEyy85{Ln%%t)=&U&R4rQ(
zz&=tGo~K6x!jWC57E0+bP#qqW8XYQ=e>pO#gFb%5p|F=GW%SXz(xsv4yOX#lLOr4A
zBT=B<XgALjYv6uk+0xV#@<)*s&^||tX2)cnpv%e(_Z2_kjS2q;vOv*6bJHXjFx?vx
zNtyIQ<!CQw=Pe)PMKT~PIy3B#y)^@uI+&_J0ERWSBeq!(J5^kdEG~bl4tf(Uwm1Bg
P0UR;B&P*}LQ4j*ZrJY~}

diff --git a/forth/forth.asm b/forth/forth.asm
index a8c4f71..e9a9be3 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -869,18 +869,10 @@ FETCH:
 	push	hl
 	jp	next
 
-; ( a -- )
-	.db "DROP"
-	.dw $-FETCH
-	.db 4
-; STABLE ABI
-DROP:
-	.dw nativeWord
-	pop	hl
-	jp	next
+.fill 13
 
 	.db	"_bend"
-	.dw	$-DROP
+	.dw	$-FETCH
 	.db	5
 ; Offset: 0647
 .out $
diff --git a/forth/icore.fs b/forth/icore.fs
index d7e8420..f0de5ed 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -57,7 +57,7 @@
 
 : QUIT
     0 FLAGS ! _c (resRS)
-    LIT< INTERPRET (find) DROP EXECUTE
+    LIT< INTERPRET (find) _c DROP EXECUTE
 ;
 
 : ABORT _c (resSP) _c QUIT ;
@@ -101,7 +101,7 @@
 
 : TOWORD
     BEGIN
-    _c C< _c DUP _c WS? NOT IF EXIT THEN DROP
+    _c C< _c DUP _c WS? NOT IF EXIT THEN _c DROP
     AGAIN
 ;
 
@@ -155,10 +155,10 @@
 ;
 
 : BOOT
-    LIT< (c<) (find) NOT IF LIT< KEY (find) DROP THEN
+    LIT< (c<) (find) NOT IF LIT< KEY (find) _c DROP THEN
     ( JTBL+40 == CINPTR )
     [ JTBL 40 + @ LITN ] !
-    LIT< (c<$) (find) IF EXECUTE ELSE DROP THEN
+    LIT< (c<$) (find) IF EXECUTE ELSE _c DROP THEN
     _c INTERPRET
 ;
 
@@ -191,7 +191,7 @@
 
 : Y
     ['] EXIT ,
-    _c R> DROP     ( exit : )
+    _c R> _c DROP     ( exit : )
 ; IMMEDIATE
 
 ( Give ":" and ";" their real name )
diff --git a/forth/z80c.fs b/forth/z80c.fs
index f91760c..e820fb9 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -39,6 +39,11 @@ CODE DUP
     HL PUSHqq,      ( A )
 ;CODE
 
+( a -- )
+CODE DROP
+    HL POPqq,
+;CODE
+
 ( a b -- b a )
 CODE SWAP
     HL POPqq,       ( B )