From 941224be9462fa3a3e0926ce110e0a98896a4ed0 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 27 Mar 2020 11:36:58 -0400
Subject: [PATCH] forth: Forth-ify "-"

---
 emul/forth/z80c.bin | Bin 620 -> 558 bytes
 forth/forth.asm     |  16 ++--------------
 forth/z80c.fs       |   9 +++++++++
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 532dc5ad02ef8e761d8fb3235e4a1b8353ff522d..d47ac11c51f52794d7f7afa5ecd6492434a64da5 100644
GIT binary patch
delta 83
zcmaFEvW{iK5)oY?21ap)ix1DrGHibv^z^V4gBJhBW&Df^7bO%J*cgf>6&MQGizUOk
l-f?m;J2H9tg}4R<1i6MNPgZ5J<onNI$p*rXO!2}Di~uqp7To{<

delta 160
zcmZ3-@`h!?5+*I7jXU@m>ysoD7}ywAvW2rLFfcG`N-8k0FciVb0(N8>R<I0+e8GuO
z&juC+k@ZNT>|jw4$-(T%<mngU8Wa%Z8dA)_`HJy7OAX6AHam7P1%}Dr7`6D`a#*r~
Lup?8vFask17%Cmx

diff --git a/forth/forth.asm b/forth/forth.asm
index 0b4ef89..6e68927 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -1318,23 +1318,11 @@ PLUS:
 	push	hl
 	jp	next
 
-; ( a b -- c ) A - B
-	.db "-"
-	.dw $-PLUS
-	.db 1
-MINUS:
-	.dw nativeWord
-	pop	de		; B
-	pop	hl		; A
-	call	chkPS
-	or	a		; reset carry
-	sbc	hl, de
-	push	hl
-	jp	next
+.fill 18
 
 ; ( a1 a2 -- b )
 	.db "SCMP"
-	.dw $-MINUS
+	.dw $-PLUS
 	.db 4
 SCMP:
 	.dw nativeWord
diff --git a/forth/z80c.fs b/forth/z80c.fs
index e55364d..dd81f4b 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -113,6 +113,15 @@ CODE XOR
     HL PUSHqq,
 ;CODE
 
+CODE -
+    DE POPqq,
+    HL POPqq,
+    chkPS,
+    A ORr,
+    DE SBCHLss,
+    HL PUSHqq,
+;CODE
+
 CODE *
     DE POPqq,
     BC POPqq,