From a2f880b1453f2309b953e2cedb623fad635daf61 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sun, 5 Jul 2020 13:44:38 -0400
Subject: [PATCH] z80: remove popRS from stable ABI

---
 blk/283 | 2 +-
 blk/297 | 2 +-
 blk/305 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blk/283 b/blk/283
index 1b863e5..bae9859 100644
--- a/blk/283
+++ b/blk/283
@@ -2,7 +2,7 @@ H@ ORG !
 0 JP, ( 00, main ) NOP, ( unused ) NOP, NOP, ( 04, BOOT )
 NOP, NOP, ( 06, uflw ) NOP, NOP, ( 08, LATEST ) NOP, ( unused )
 0 A, 0 JP, ( 0b, EXIT ) NOP, ( unused )
-0 JP, ( RST 10 )  NOP, ( unused ) 0 JP, ( 14, popRS )
+0 JP, ( RST 10 )  NOP, NOP, NOP, NOP, ( unused )
 NOP, NOP, NOP, ( unused )
 0 JP, ( 1a, next ) NOP, NOP, NOP, ( unused )
 0 JP, ( RST 20 )
diff --git a/blk/297 b/blk/297
index fec81aa..006c146 100644
--- a/blk/297
+++ b/blk/297
@@ -4,7 +4,7 @@ lblpushRS BSET
     1 IX+ H LDIXYr,
     RET,
 
-lblpopRS BSET PC ORG @ 0x15 + ! ( popRS )
+lblpopRS BSET
     L 0 IX+ LDrIXY,
     H 1 IX+ LDrIXY,
     IX DECd, IX DECd,
diff --git a/blk/305 b/blk/305
index 4666016..856f65b 100644
--- a/blk/305
+++ b/blk/305
@@ -6,6 +6,6 @@ CODE EXECUTE
 
 CODE EXIT
 PC ORG @ 0x0d + ! ( stable ABI JP )
-    0x14 BCALL,      ( popRS )
+    lblpopRS @ CALL,
     HL PUSH, IY POP, ( --> IP )
     JPNEXT,