From a2c258afba572a95025739258ced391628b48064 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 28 Mar 2020 15:18:25 -0400
Subject: [PATCH] forth: Forth-ify "CMP"

forth.asm under 1K lines!
---
 emul/forth/z80c.bin | Bin 1075 -> 1098 bytes
 forth/forth.asm     |  20 ++------------------
 forth/icore.fs      |   2 +-
 forth/z80c.fs       |  11 +++++++++++
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 8bee94b5433efde23a67df09a0ab44ec295d0aae..86b28776e310d0dc4e208e049ee61d29c12814b2 100644
GIT binary patch
delta 195
zcmdnYaf)LD6O(|mZ-58`vpB=Ui)UpSw!aOU{F~8)HDCA`x7TD7CQU}S$#G1IOnjV^
z8<{kj3pm{-uVvC<`o=N&Hj|{m4bH<X_nBB29GNWH>Y3jCcVr6p4|0)VVBup>VBmZ4
znKP43fK7pckzpp=OqOuA8<SO-&6tF^CdV)<G47gN&nyYz%wl#Ina$<MWF^bc$j1=L
q1=PvF!3>o6%B&z~&sEQK3uvyjDM(TQXcGr>Er%tWBU3y-10w)*WH1B(

delta 168
zcmX@bv6*876Vqf#CSBGD;q~0clf9WV8TBWZGAS~B=a@W$Ns~E}Q-AUiCLNipYzhpF
z3^Umdvp6z^_=o!kxkxau@iEL~31>SvnTJ_U@D67tn*dZ1MAVwujOjP$<YHzenZ=wJ
zSykEYvkI^|GI{!ixCR9TxrW#?aPlz#6>Ma77ir;gWU`WFXyjvX;!<GXW8h#0O7O5K
LFltQJWswB{!-OY~

diff --git a/forth/forth.asm b/forth/forth.asm
index db6cd21..f31284b 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -982,25 +982,9 @@ PLUS:
 	push	hl
 	jp	next
 
-.fill 42
-
-; ( n1 n2 -- f )
-	.db "CMP"
-	.dw $-PLUS
-	.db 3
-CMP:
-	.dw nativeWord
-	pop	hl
-	pop	de
-	call	chkPS
-	or	a	; clear carry
-	sbc	hl, de
-	call	flagsToBC
-	push	bc
-	jp	next
-
+.fill 65
 	.db	"_bend"
-	.dw	$-CMP
+	.dw	$-PLUS
 	.db	5
 ; Offset: 06ee
 .out $
diff --git a/forth/icore.fs b/forth/icore.fs
index ad6d542..663c843 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -81,7 +81,7 @@
 ( The NOT is to normalize the negative/positive numbers to 1
   or 0. Hadn't we wanted to normalize, we'd have written:
   32 CMP 1 - )
-: WS? 33 CMP 1 + NOT ;
+: WS? 33 _c CMP 1 + NOT ;
 
 : TOWORD
     BEGIN
diff --git a/forth/z80c.fs b/forth/z80c.fs
index cdc5925..edf882c 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -266,3 +266,14 @@ CODE SCMP
     BC PUSHqq,
 ;CODE
 
+CODE CMP
+    HL  POPqq,
+    DE  POPqq,
+    chkPS,
+    A ORr,      ( clear carry )
+    DE SBCHLss,
+    ( JTBL+32 == flagsToBC )
+    JTBL 32 + CALLnn,
+    BC PUSHqq,
+;CODE
+