From 29dcddb8cdb5654f8498a2cf43761556b6e7b601 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 27 Mar 2020 18:38:42 -0400
Subject: [PATCH] forth: improve assembler a bit

---
 forth/z80a.fs | 4 ++--
 forth/z80c.fs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forth/z80a.fs b/forth/z80a.fs
index 55a2c68..3aec066 100644
--- a/forth/z80a.fs
+++ b/forth/z80a.fs
@@ -54,7 +54,6 @@
 ;
 0x04 OP1r INCr,
 0x05 OP1r DECr,
-0x46 OP1r LDr(HL),
 
 ( r -- )
 : OP1r0
@@ -63,7 +62,6 @@
     C@              ( r op )
     OR A,
 ;
-0x70 OP1r0 LD(HL)r,
 0xa0 OP1r0 ANDr,
 0xb0 OP1r0 ORr,
 0xa8 OP1r0 XORr,
@@ -208,6 +206,8 @@
 ;
 0xcd OP3nn CALLnn,
 0xc3 OP3nn JPnn,
+0x22 OP3nn LD(nn)HL,
+0x2a OP3nn LDHL(nn),
 
 : OPJR
     CREATE C,
diff --git a/forth/z80c.fs b/forth/z80c.fs
index 557cfad..f45f769 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -173,13 +173,13 @@ CODE C!
     HL POPqq,
     DE POPqq,
     chkPS,
-    E LD(HL)r,
+    (HL) E LDrr,
 ;CODE
 
 CODE C@
     HL POPqq,
     chkPS,
-    L LDr(HL),
+    L (HL) LDrr,
     H 0 LDrn,
     HL PUSHqq,
 ;CODE