From 8ef9e7d0dae569c5fd0436a35a07362088d85f35 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 30 Mar 2020 14:05:07 -0400
Subject: [PATCH] forth: Forth-ify "@"

---
 emul/forth/z80c.bin | Bin 1300 -> 1318 bytes
 forth/forth.asm     |  16 ++--------------
 forth/icore.fs      |  18 +++++++++---------
 forth/z80a.fs       |   1 +
 forth/z80c.fs       |  10 ++++++++++
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 94454433ab746c5bb0034b025ee10ccdb9cd3d00..e46633f426d96222f609a7b0fad7825c4ef66c1d 100644
GIT binary patch
delta 438
zcmbQjwTx>+3Ztll5(A?+!^5+(3~|a~ub&>4VsKUz*qqK7#wZgl@|(M!n}gYrDKOMC
zM2LZfk3oTff#Dac0NcjNH<{$E=W(cWIx=Y#Bo-B?YVtF%^D(%v9%i}E#KPbY7B9-o
zE724Mi6^pMVoziP$+0o)WpiZuFxi+{%dwIZq|Vt!hJguWG|!9m>>WVcoOSp>0vB1=
zvmasykqQiq49-B708nRmu)Q<`Gf252!;Q)Fn8jERawf8Un7or&uAZA~GMfM!L^W8H
z^FGtN|9gQVd@q3ROwB7Ps?^j5xd&vb7FQAr%=BQO>p<o=umyu{ybqKQX6InO#0gSy
zA8fOyUx;f^K#*&QJp(5ngBDi}&^Ho5cQArOq=Q+39~wCIOdJgFfZ8UfvbZtMn!JWZ
z!6SkT=mrK3W{55^V0e^r+y^S_V6F#-76*{z0&D4D=I5?wy7k|Y$=Z~m5#&opCJtsF
Mj$)wC<M|mF0U^I;oB#j-

delta 324
zcmZ3+HHB+K3L~?#qVncS#xO=19g#cS3EUjaj!c1}o*_aEEPM<K3=9mvSOwVTPkzlL
z&)mZyI+>SQT+x=(kx8SVC^N4_Q<Q<7k0Fum0DB_aVV3($Yz%wZ9GUJ-c4gLbOy>lt
zbGDITU;-J$^Fo!a18BCh4j)M1BC9If26hmsz`)4h3}guab%qDqOEWNolq)hEo4kQp
zjCDO{BHO*mr<vshe{xP{6M(9Qi2h=h)=_1X;7VeFnG+0j2gsxbwqUT?_krdIvvV*X
z-~_3d?8qX*C^0#VMV<-BDQ9tG?3lcdMM2n&OM!upfrD9ss|M%?F`$2vCx2uSRsuQr
gFIPR&t^bZp)}{=NAa^-3aWGqP6a(EF&(FXJ0P4?182|tP

diff --git a/forth/forth.asm b/forth/forth.asm
index e9a9be3..d3aad8c 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -857,22 +857,10 @@ STORE:
 	ld	(iy+1), h
 	jp	next
 
-; ( a -- n )
-	.db "@"
-	.dw $-STORE
-	.db 1
-FETCH:
-	.dw nativeWord
-	pop	hl
-	call	chkPS
-	call	intoHL
-	push	hl
-	jp	next
-
-.fill 13
+.fill 30
 
 	.db	"_bend"
-	.dw	$-FETCH
+	.dw	$-STORE
 	.db	5
 ; Offset: 0647
 .out $
diff --git a/forth/icore.fs b/forth/icore.fs
index f0de5ed..6be7318 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -86,12 +86,12 @@
 
 : C<
     ( JTBL+40 == CINPTR )
-    [ JTBL 40 + @ LITN ] @ EXECUTE
+    [ JTBL 40 + @ LITN ] _c @ EXECUTE
 ;
 
 : C,
-    HERE @ _c C!
-    HERE @ 1 _c + HERE !
+    HERE _c @ _c C!
+    HERE _c @ 1 _c + HERE !
 ;
 
 ( The NOT is to normalize the negative/positive numbers to 1
@@ -126,18 +126,18 @@
 ;
 
 : (entry)
-    HERE @          ( h )
+    HERE _c @       ( h )
     _c WORD         ( h s )
     SCPY            ( h )
     ( Adjust HERE -1 because SCPY copies the null )
-    HERE @ 1 _c -   ( h h' )
+    HERE _c @ 1 _c - ( h h' )
     _c DUP HERE !   ( h h' )
     _c SWAP _c -       ( sz )
     ( write prev value )
-    HERE @ CURRENT @ _c - ,
+    HERE _c @ CURRENT _c @ _c - ,
     ( write size )
     _c C,
-    HERE @ CURRENT !
+    HERE _c @ CURRENT !
 ;
 
 : INTERPRET
@@ -149,7 +149,7 @@
         EXECUTE
         0 FLAGS !
     ELSE
-        (parse*) @ EXECUTE
+        (parse*) _c @ EXECUTE
     THEN
     AGAIN
 ;
@@ -185,7 +185,7 @@
     ( is word )
     IF _c DUP _c IMMED? IF EXECUTE ELSE , THEN
     ( maybe number )
-    ELSE (parse*) @ EXECUTE _c LITN THEN
+    ELSE (parse*) _c @ EXECUTE _c LITN THEN
     AGAIN
 ; IMMEDIATE
 
diff --git a/forth/z80a.fs b/forth/z80a.fs
index 9d36c3e..2c69b7c 100644
--- a/forth/z80a.fs
+++ b/forth/z80a.fs
@@ -37,6 +37,7 @@
 
 ( -- )
 : OP1 CREATE C, DOES> C@ A, ;
+0xeb OP1 EXDEHL,
 0x76 OP1 HALT,
 0xc9 OP1 RET,
 0x17 OP1 RLA,
diff --git a/forth/z80c.fs b/forth/z80c.fs
index e820fb9..49b5cdc 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -213,6 +213,16 @@ CODE /MOD
     BC PUSHqq,
 ;CODE
 
+CODE @
+    HL POPqq,
+    chkPS,
+    E (HL) LDrr,
+    HL INCss,
+    D (HL) LDrr,
+    EXDEHL,
+    HL PUSHqq,
+;CODE
+
 CODE C!
     HL POPqq,
     DE POPqq,