From e569e406650f52bacec35a8c3f8baf82c6a3dbbd Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 20 Apr 2020 23:18:57 -0400
Subject: [PATCH] Forth-ify 2DUP 2OVER 2SWAP

2DROP was left in boot.z80 because it's used in icore.
---
 emul/forth/z80c.bin | Bin 2240 -> 2162 bytes
 forth/boot.z80      |  41 -----------------------------------------
 forth/core.fs       |  18 +++++++++++-------
 3 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index e260c9c54e49fd8c0487c0aff005de74b96c7772..1e712c7c28aee7000c255644bb411c0723f74b27 100644
GIT binary patch
delta 981
zcmYjPO-K}B7=FKRzL{N3M{RS(B3PH8U9oVXgV^qhqf@Qu&N?%)^dn;aEK8wc76|6r
zF~O6Nr|lS>mY@!?NCaIC?;S!x_7I*Fyl&4oqts<)-sk<9=Xu`ud)rCtrw|X>RxU(p
z$Km16>-6I)4Q7X%KCkdsytK{@x;Hv_-_c3cBNU_^VNh&odilj%cf5^)z#2X5foYq~
zBoGTP9-6RiGwXKyHRJzdtrXA?#2F^X=8Frn@n+KWQ^ZxKVEFh%#%;l%g!m|GCH_^3
zQYPz~cFs0kQq&4tV+IWxmhDDC>4Va)8k7nW(~p!QMkf8w5n%#PH+p!=3wo26h=X6f
zG>O#I((LriObdQpW)bS5oLYdo3QK`PgnDU<m)SG5<bxvsWmyAFo|j3a3Z#+V^L3s;
z<eM@Zw_r+{g%w$Ui%isC#@M{rR}*5BZ9%0$2~lOQ)iRUQJH74-tD;8sZQ{$%9oJJO
zFyCYqwD{xWkKo<DTI2=T+z%N;$revk6AV7%(wZI}n)eXYxO~18d!hzkhI-mjD3O37
zpZRk<?+k=Vfh}Ehq~wLP(6#cGJsg5HX-zA$4XwC+tX(VZh<Dl^tD!UPp#?grck&47
z-fo?t+{2q#n=iefNs1bT8<ZCg{iz%Dcy3{3d37=h1(HCO{nq4r9;zk9D!h@gyo4=o
zX$3EP>XDD3wQqSf-iO{Vni4SnokS}&NC-Axp_DusnBbibcVO-=hHZZfbb$OB78+Kn
zSnxVX-v()Ei(y%Amv^=t$N{kEh1K4%?E;aEE;^8Xy12NKjC<J#N#A8pCYzDhDHpoN
z98dW;XpUyw>=TTC9>Gyrnx%pH*qAvy&<1zsMOcZ@2F1YRu1;_C8)Ts9ts-6PmupN1
iq`d{r7Z}D3b_OqgAyDez{-ne;rUo7Q1(T=l5c><L0N!K(

delta 1044
zcmYjPT}V@57=FKVzMajL$G=iAg*l>}sEF)BY9%|{s)6q3oHM0A!kUdB)Jz0HICU4!
zyWMy*yV{j7f)r_2g>=;lx{z324cbk3CDHAAzB4s%&h|d<&-c8~`y91?Y<t%s&7>0T
z#Jj5BzxL98ZNIkHO`~Bw4$#q6tpXH4d@7==0{H%^Qmp{2)GD9%YvL=?#&j^zb2fdN
z3dX{n@2^P9l2w*8x-}8JZD5Y-As5xSM*Ryji!Wyfd~M_c=C-jr5k1mO95J`!P)gS$
zF>|0%lRS&Hl2aXagk=nR`fM)kYbHevA}+Bch9^@|vju}J{+IiwWQBVv8Z#q$LXVh~
zbQIYt(<rFLb<+z<f8-|)jc&MzsiS-sWCM-A8$1X6rrXA|b}$k+M-uqet*zV(M~AiP
z$Y7r$%i>WFjnILVXCIES4PbfZp(ffogOq@{=};<5)~O0<UmPmrSy~qLLzF{(JEj(R
zuVV2vb|96&*WxAi#gS*?#UZ=9Xt5HCMB^I%HIj#QL3NE4(b5pvcMoFqD!Wn!y1v0m
zp+Jkh#d#<imW39BDwgbqetube_jtF%4{bw(7f~pXl#LgT@o8hclVsJ?Lwz*L3$|!x
zd^)a&J8*|}CC|PoySYu}l2zlslrr<n1>Qh2bW|UbJfzykG(w5HS8=Dt>N_??1&eD`
z;0FD!Yjl5hZfSAlp%)tn8YMR96u;Y8T2L%O8xf1sLwjXMX+(m2KU&8YSA1jWm7GbZ
z_TK}o)FdFte1WpUBM`y%iflk!H-_aFoLwLv#zoS2CCkeoJq*%fvKEh<eYQ^}Aj9C{
zJ(1dWmm7#+bkc$B<N5iefX~i)Na!wlqOqv3qd4d)Ge~Uy7BnZKX6ymRKli{>c_pua
z`Q&6IJl+Ozw|N?KU(qsrdR?X0>Scn>lpnHC?V32_x>Lxzqcj%mga<ROlP5Sz4fs#2
Ph$meJ{e;Mm{KWnNkPP)y

diff --git a/forth/boot.z80 b/forth/boot.z80
index 60df6c5..2126c87 100644
--- a/forth/boot.z80
+++ b/forth/boot.z80
@@ -424,17 +424,6 @@ CODE (roll)
     LDDR,
 ;CODE
 
-( a b -- a b a b )
-CODE 2DUP
-    HL POPqq,       ( B )
-    DE POPqq,       ( A )
-    chkPS,
-    DE PUSHqq,      ( A )
-    HL PUSHqq,      ( B )
-    DE PUSHqq,      ( A )
-    HL PUSHqq,      ( B )
-;CODE
-
 ( a b -- )
 CODE 2DROP
     HL POPqq,
@@ -442,36 +431,6 @@ CODE 2DROP
     chkPS,
 ;CODE
 
-( a b c d -- a b c d a b )
-
-CODE 2OVER
-    HL POPqq,       ( D )
-    DE POPqq,       ( C )
-    BC POPqq,       ( B )
-    EXX, HL POPqq, EXX, ( A )
-    chkPS,
-    EXX, HL PUSHqq, EXX, ( A )
-    BC PUSHqq,      ( B )
-    DE PUSHqq,      ( C )
-    HL PUSHqq,      ( D )
-    EXX, HL PUSHqq, EXX, ( A )
-    BC PUSHqq,      ( B )
-;CODE
-
-( a b c d -- c d a b )
-
-CODE 2SWAP
-    HL POPqq,       ( D )
-    DE POPqq,       ( C )
-    BC POPqq,       ( B )
-    EXX, HL POPqq, EXX, ( A )
-    chkPS,
-    DE PUSHqq,      ( C )
-    HL PUSHqq,      ( D )
-    EXX, HL PUSHqq, EXX, ( A )
-    BC PUSHqq,      ( B )
-;CODE
-
 CODE AND
     HL POPqq,
     DE POPqq,
diff --git a/forth/core.fs b/forth/core.fs
index 584ea2cd..0bfab65 100644
--- a/forth/core.fs
+++ b/forth/core.fs
@@ -55,13 +55,6 @@
     H@ 2-          ( push a. -2 for allot offset )
 ; IMMEDIATE
 
-: ROLL
-    DUP NOT IF EXIT THEN
-    1+ DUP PICK          ( n val )
-    SWAP 2 * (roll)      ( val )
-    SWAP DROP
-;
-
 ( During a CASE, the stack grows by 1 at each ENDOF so that
   we can fill all those ENDOF branching addrs. So that we
   know when to stop, we put a 0 on PSP. That's our stopgap. )
@@ -143,6 +136,17 @@
 
 : LEAVE R> R> DROP I 1- >R >R ;
 
+: ROLL
+    DUP NOT IF EXIT THEN
+    1+ DUP PICK          ( n val )
+    SWAP 2 * (roll)      ( val )
+    SWAP DROP
+;
+
+: 2DUP OVER OVER ;
+: 2OVER 3 PICK 3 PICK ;
+: 2SWAP 3 ROLL 3 ROLL ;
+
 ( a1 a2 u -- )
 : MOVE
     ( u ) 0 DO