From 26871be6f232beeb496dfec9dc31550aeb063371 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 27 Mar 2020 19:12:46 -0400
Subject: [PATCH] forth: Forth-ify "C,"

---
 emul/forth/z80c.bin | Bin 725 -> 754 bytes
 forth/forth.asm     |  18 ++----------------
 forth/icore.fs      |   7 ++++++-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 5b6f9f0c2ec06210ea86221890f728b89f89eaca..231bbb56776691c0afe39ef69e6594345f727034 100644
GIT binary patch
delta 83
zcmcc0`iXVJaYoipf^WD=CZA!fQFYc)VPN88xX7x?R>}b)6&M&9X0lym6<~8@(n!rK
gDXP?zpB%uXBfOUrBz+$&VP($H$j5MhazB$B00|iu;Q#;t

delta 54
zcmV-60LlOI1=R(x#{mV?5zh)&lgt5p2q<N4baHtqDU)piEEDqr(FG+2-vtl`K>|8A
M0D%qw!jr55MjG-FumAu6

diff --git a/forth/forth.asm b/forth/forth.asm
index e328f07..2eb3019 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -720,24 +720,10 @@ EMIT:
 	.dw	EXIT
 
 
-.fill 49
-
-	.db	"C,"
-	.dw	$-EMIT
-	.db	2
-CWR:
-	.dw	nativeWord
-	pop	de
-	call	chkPS
-	ld	hl, (HERE)
-	ld	(hl), e
-	inc	hl
-	ld	(HERE), hl
-	jp	next
-
+.fill 71
 
 	.db	","
-	.dw	$-CWR
+	.dw	$-EMIT
 	.db	1
 WR:
 	.dw	nativeWord
diff --git a/forth/icore.fs b/forth/icore.fs
index d5d36a1..ce69f11 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -81,6 +81,11 @@
     AGAIN
 ;
 
+: C,
+    HERE @ _c C!
+    HERE @ 1 + HERE !
+;
+
 : (entry)
     HERE @          ( h )
     WORD            ( h s )
@@ -92,7 +97,7 @@
     ( write prev value )
     HERE @ CURRENT @ _c - ,
     ( write size )
-    C,
+    _c C,
     HERE @ CURRENT !
 ;