From 09cd25df2989f16e9a0e7b52a39adf0473f3a78a Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 30 Mar 2020 07:58:16 -0400
Subject: [PATCH] forth: Forth-ify "OVER"

---
 emul/forth/z80c.bin | Bin 1114 -> 1134 bytes
 forth/forth.asm     |  19 ++-----------------
 forth/icore.fs      |   2 +-
 forth/z80c.fs       |  10 ++++++++++
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 913ef961915687cda539b910db1bac0f9e31adba..22f9c50a057e6e18f79b54d81b37f0a4e6f0f2fd 100644
GIT binary patch
delta 385
zcmcb`@s4AHh@^j*Ymg8Fi#Wr>i)UpSu0FkbSc<{OB{V>Aqogg9Xua???kH{!W=AGR
zC;y-jVFp${hR>6;nItu{I31ZZ3W_rGN;E|o*!dX3+0;40*$%VZXX0S6WV2**WHRDZ
zU|?ieHF+(QiuV*wka}kw83rakhKsDKY~mas60CszBC7yUd3dnBGy^jqg93vhgA_z7
z`(YMGrV#&d{~#9$1~xv1nJnRKe<sT?%L$5eak2|QwL?U`ndQP)v2!qk+^Uh9S5j1|
zDGqWM$Qm=QBo>%;yV%3oKo+{O?E+e?%61=!cLDX?<Am@)PVw{$aSaLxat*O(;N)X4
zn|y%TBWORDBa@XZLn9wUEtdiV9|H%o8CMO^w_-q_pW*=dx`Vl%i3KQL&&0*>4rpoz
gb23*w)2;uGOxC6#eF_YYOdQM$IY40(&(FXJ0Ibhb82|tP

delta 319
zcmaFIaf@Su2&<7xXn@d0U0Wv6eBoo<Ufdkaj!ceD{y`za46J+%_b1mgNot01Ix=Y#
z6lLa>Xo@nh^D%_833G(A9cH=D#KB<6X36HrB*&@1z{oId@<ApQnFdafdS@LO1|~j+
zi>#__%p4#RqJWWEScVOvnEfz|BU6ZfxPOp~1Opo%!%UWNwilBPnB@eSxiZ-VAR5>q
zqVddfjMFC9F^k(PaV4?9j9bPY&UTSifX$6<89PYqJ`gWs=U_g?3E>F<UFPW*;u;hX
z<Qihnz{$s;H2Dg%hv{lAM<y#-hDJVyOfCfmJ_ZhEC9WEvZ^VE;+r|O%RR?oD6AMth
co{5X$9njPcX8*~7EW%v993bDu^D{6402E_E?*IS*

diff --git a/forth/forth.asm b/forth/forth.asm
index b76d4c0..455d6a3 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -952,25 +952,10 @@ DUP:
 	push	hl
 	jp	next
 
-; ( a b -- a b a )
-	.db "OVER"
-	.dw $-DUP
-	.db 4
-OVER:
-	.dw nativeWord
-	pop	hl	; B
-	pop	de	; A
-	call	chkPS
-	push	de
-	push	hl
-	push	de
-	jp	next
-
-
-.fill 112
+.fill 132
 
 	.db	"_bend"
-	.dw	$-OVER
+	.dw	$-DUP
 	.db	5
 ; Offset: 06ee
 .out $
diff --git a/forth/icore.fs b/forth/icore.fs
index 072f4ca..cbc22c2 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -98,7 +98,7 @@
     BEGIN
         ( We take advantage of the fact that char MSB is
           always zero to pre-write our null-termination )
-        OVER !                  ( a )
+        _c OVER !               ( a )
         1 _c +                  ( a+1 )
         C<                      ( a c )
         DUP _c WS?
diff --git a/forth/z80c.fs b/forth/z80c.fs
index d1809a5..bfca503 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -31,6 +31,16 @@ CODE ROT
     BC PUSHqq,      ( A )
 ;CODE
 
+( a b -- a b a )
+CODE OVER
+    HL POPqq,       ( B )
+    DE POPqq,       ( A )
+    chkPS,
+    DE PUSHqq,      ( A )
+    HL PUSHqq,      ( B )
+    DE PUSHqq,      ( A )
+;CODE
+
 ( a b -- a b a b )
 CODE 2DUP
     HL POPqq,       ( B )