From 5adbf88591403b60e11689db9a2dfd7e1afb8176 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 8 Aug 2020 08:19:31 -0400
Subject: [PATCH] z80: move lbluflw code around

with uflw checks not being in next anymore, we can save ourselves
a forward jump.
---
 blk/282 | 2 +-
 blk/285 | 3 ---
 blk/286 | 2 +-
 blk/287 | 2 +-
 blk/290 | 5 ++++-
 blk/310 | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 blk/285

diff --git a/blk/282 b/blk/282
index 02c092c..6b007b0 100644
--- a/blk/282
+++ b/blk/282
@@ -1 +1 @@
-VARIABLE lblofl VARIABLE lblexec
+VARIABLE lbluflw VARIABLE lblexec
diff --git a/blk/285 b/blk/285
deleted file mode 100644
index 6eb87fb..0000000
--- a/blk/285
+++ /dev/null
@@ -1,3 +0,0 @@
-lblofl BSET ( abortUnderflow )
-    DE BIN( @ 0x06 ( uflw ) + LDdd(n),
-    JR, L2 FWR ( execute, B287 )
diff --git a/blk/286 b/blk/286
index 60e8d3e..2e24e7c 100644
--- a/blk/286
+++ b/blk/286
@@ -8,7 +8,7 @@ lblnext BSET PC ORG @ 0x1b + ! ( next )
     IFNC, ( SP <= IX? overflow )
         SP PS_ADDR LDdn, IX RS_ADDR LDdn,
         DE BIN( @ 0x13 ( oflw ) + LDdd(n),
-        JR, L3 FWR ( execute, B287 )
+        JR, L2 FWR ( execute, B287 )
     THEN,
     LDA(BC), E A LDrr, BC INCd,
     LDA(BC), D A LDrr, BC INCd,
diff --git a/blk/287 b/blk/287
index 3ff378d..43dbbae 100644
--- a/blk/287
+++ b/blk/287
@@ -1,4 +1,4 @@
-lblexec BSET L1 FSET ( B284 ) L2 FSET ( B285 ) L3 FSET ( B286 )
+lblexec BSET L1 FSET ( B284 ) L2 FSET ( B286 )
     ( DE -> wordref )
     ( When we have a BIN( offset, we need to adjust stable
       ABI offsets. )
diff --git a/blk/290 b/blk/290
index 81d69c2..a36e85e 100644
--- a/blk/290
+++ b/blk/290
@@ -1,3 +1,6 @@
+lbluflw BSET ( abortUnderflow )
+    DE BIN( @ 0x06 ( uflw ) + LDdd(n),
+    JR, lblexec BWR
 lblchkPS BSET ( chkPS )
 ( Note that you only need to call this in words that push
   back to PSP. If they don't, calling chkPS is redundant with
@@ -9,4 +12,4 @@ lblchkPS BSET ( chkPS )
     SP SUBHLd,
     EXX,
     CNC RETc, ( PS_ADDR >= SP? good )
-    JR, lblofl BWR ( abortUnderflow-B298 )
+    JR, lbluflw BWR
diff --git a/blk/310 b/blk/310
index 2997436..c311f96 100644
--- a/blk/310
+++ b/blk/310
@@ -10,6 +10,6 @@ CODE PICK EXX, ( protect BC )
     EXDEHL,
     HL PS_ADDR LDdn,
     DE SUBHLd,
-    IFC, EXX, lblofl @ JP, THEN,
+    IFC, EXX, lbluflw @ JP, THEN,
     BC PUSH,
 EXX, ( unprotect BC ) ;CODE