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

---
 emul/forth/z80c.bin | Bin 1151 -> 1170 bytes
 forth/forth.asm     |  16 ++--------------
 forth/icore.fs      |   2 +-
 forth/z80c.fs       |   9 +++++++++
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 17e83588a4d2caf3b6e032621f36c72031e2050b..7736d7ea23425274625de204a9d2d6a413441174 100644
GIT binary patch
delta 327
zcmey*F^O}6szh+OV*oz`i#Wr>i)UpSo?bmH#o!<28YHk$E0u{+eDVY)NzFb^M<$Je
zqRhM!O;HARJ_ZhUZw?Oj!z}liI2bJ1EZH2H!Z;Ne7#Yq@zQm;By@L~^-dRV6fr*dd
zBC9H!H3x_UD`3CKDgaa-9&9hoz|6;>z@W%r2hj>N&XFm^KiogaMS_8ik6|VY2fM;#
zM`k%eYc5@O0jPF}XaTbv<GIQG%;IWMTuCf2!|$<kfQ^@8zXzmM+3o`|P>h+0Yw{Up
z3C5_&PnkV}9&<S|S;;aq@-ZyrQeXgjg*l3=2Ivtnpr_t(fIQT}T+hS;6t8FEVt5BM
iqJz1etDfoBe@7;3Q;<Fd21h0i=A#@SZ^!d9FaiKYk4BIH

delta 379
zcmbQl`JZEgDyx5(YY_iN+f*iJ7R~@BM<$Je#G>L<O@0P;J_Z-o!z}liSQx4~LE=T3
zc_o^nAaM?M3l0u;kQ@htC7UIiBa<_y0s|w%?#WM?RO**<g48?f$S^SRF<fL-Wz*mQ
zkzfVv7g+^>%EN>0r5Tv{7!(*38MGl<fyOy9h4_d22f0Wvu<<d>WZ_`v<$~Dn$YjY@
z&-Cs;P$N)UhJgj7lkbHFmlV4I)Le-2`#?qEAQyq89hrPQL;SQrs*kZMFi0@$X6In$
zU<P_6HLs+oQd1n{6_Cr^xsq65E<DZ70d}Js+i4)J%61=!fnv<>IVay|mSA+B{Dav;
z_5zn9la(w(BOgN_7tkgK4rX_*8enLM0Ym2Y<X9GQxe~5=rdvSwTAPAYDKI!PaWHS<
L0EJXMKLaBG)(B65

diff --git a/forth/forth.asm b/forth/forth.asm
index 3a7ae57..096af24 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -928,22 +928,10 @@ DROP:
 	pop	hl
 	jp	next
 
-; ( a b -- b a )
-	.db "SWAP"
-	.dw $-DROP
-	.db 4
-SWAP:
-	.dw nativeWord
-	pop	hl
-	call	chkPS
-	ex	(sp), hl
-	push	hl
-	jp	next
-
-.fill 149
+.fill 167
 
 	.db	"_bend"
-	.dw	$-SWAP
+	.dw	$-DROP
 	.db	5
 ; Offset: 06ee
 .out $
diff --git a/forth/icore.fs b/forth/icore.fs
index fa3220b..1627095 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -122,7 +122,7 @@
     ( Adjust HERE -1 because SCPY copies the null )
     HERE @ 1 _c -   ( h h' )
     _c DUP HERE !   ( h h' )
-    SWAP _c -       ( sz )
+    _c SWAP _c -       ( sz )
     ( write prev value )
     HERE @ CURRENT @ _c - ,
     ( write size )
diff --git a/forth/z80c.fs b/forth/z80c.fs
index f04556d..a9fe873 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -39,6 +39,15 @@ CODE DUP
     HL PUSHqq,      ( A )
 ;CODE
 
+( a b -- b a )
+CODE SWAP
+    HL POPqq,       ( B )
+    DE POPqq,       ( A )
+    chkPS,
+    HL PUSHqq,      ( B )
+    DE PUSHqq,      ( A )
+;CODE
+
 ( a b -- a b a )
 CODE OVER
     HL POPqq,       ( B )