From 3ea221d0eb006a46cc7363bfae2fcae1081e7fad Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sun, 5 Jul 2020 21:54:01 -0400
Subject: [PATCH] z80: inline all uses of pushRS/popRS

I'm trying to move stuff around and it simplifies things. Will make
a lot more sense to inline when BC replaces IY.
---
 blk/282 |  3 +--
 blk/297 | 11 -----------
 blk/303 |  4 +++-
 blk/305 |  4 +++-
 blk/306 |  1 -
 blk/326 | 15 ++++++++-------
 6 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 blk/297

diff --git a/blk/282 b/blk/282
index 862f9b9..844f5ad 100644
--- a/blk/282
+++ b/blk/282
@@ -1,2 +1 @@
-VARIABLE lblofl VARIABLE lblpushRS VARIABLE lblpopRS
-VARIABLE lblexec VARIABLE lblfind
+VARIABLE lblofl VARIABLE lblexec VARIABLE lblfind
diff --git a/blk/297 b/blk/297
deleted file mode 100644
index 006c146..0000000
--- a/blk/297
+++ /dev/null
@@ -1,11 +0,0 @@
-lblpushRS BSET
-    IX INCd, IX INCd,
-    0 IX+ L LDIXYr,
-    1 IX+ H LDIXYr,
-    RET,
-
-lblpopRS BSET
-    L 0 IX+ LDrIXY,
-    H 1 IX+ LDrIXY,
-    IX DECd, IX DECd,
-    RET,
diff --git a/blk/303 b/blk/303
index f20a10b..cf1c020 100644
--- a/blk/303
+++ b/blk/303
@@ -3,7 +3,9 @@
   2. Set new IP to the second atom of the list
   3. Execute the first atom of the list. )
     IY PUSH, HL POP, ( <-- IP )
-    lblpushRS @ ( pushRS ) CALL,
+    IX INCd, IX INCd,
+    0 IX+ L LDIXYr,
+    1 IX+ H LDIXYr,
     EXDEHL,          ( HL points to PFA )
 ( While we inc, dereference into DE for execute call later. )
     LDDE(HL),
diff --git a/blk/305 b/blk/305
index 856f65b..2906ef3 100644
--- a/blk/305
+++ b/blk/305
@@ -6,6 +6,8 @@ CODE EXECUTE
 
 CODE EXIT
 PC ORG @ 0x0d + ! ( stable ABI JP )
-    lblpopRS @ CALL,
+    L 0 IX+ LDrIXY,
+    H 1 IX+ LDrIXY,
+    IX DECd, IX DECd,
     HL PUSH, IY POP, ( --> IP )
     JPNEXT,
diff --git a/blk/306 b/blk/306
index ac1b21f..0908ce2 100644
--- a/blk/306
+++ b/blk/306
@@ -8,4 +8,3 @@ PC ORG @ 0x25 + ! ( stable ABI JP )
     IY INCd, IY INCd,
     DE PUSH,
 ;CODE
-( END OF STABLE ABI )
diff --git a/blk/326 b/blk/326
index 0a29173..7c380b5 100644
--- a/blk/326
+++ b/blk/326
@@ -1,15 +1,16 @@
 CODE >R
-    HL POP, lblpushRS @ CALL,
+    HL POP, IX INCd, IX INCd, 0 IX+ L LDIXYr, 1 IX+ H LDIXYr,
 ;CODE
 CODE R>
-    lblpopRS @ CALL, HL PUSH,
+    L 0 IX+ LDrIXY, H 1 IX+ LDrIXY, IX DECd, IX DECd, HL PUSH,
 ;CODE
-CODE 2>R
-PC ORG @ 0x35 + ! ( stable ABI JP )
+CODE 2>R PC ORG @ 0x35 + ! ( stable ABI JP )
     DE POP, HL POP,
-    lblpushRS @ CALL, EXDEHL, lblpushRS @ CALL,
+    IX INCd, IX INCd, 0 IX+ L LDIXYr, 1 IX+ H LDIXYr,
+    IX INCd, IX INCd, 0 IX+ E LDIXYr, 1 IX+ D LDIXYr,
 ;CODE
 CODE 2R>
-    lblpopRS @ CALL, EXDEHL, lblpopRS @ CALL,
-    HL PUSH, DE PUSH,
+    L 0 IX+ LDrIXY, H 1 IX+ LDrIXY, IX DECd, IX DECd,
+    E 0 IX+ LDrIXY, D 1 IX+ LDrIXY, IX DECd, IX DECd,
+    DE PUSH, HL PUSH,
 ;CODE