From d3e44811129deba7b51ecb6903068823a3e5cc9f Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Sun, 22 Sep 2024 21:41:41 +0200
Subject: [PATCH] fix asm optimizer bug where it erroneously discarded `rts`
 with a label

---
 .../src/prog8/codegen/cpu6502/AsmOptimizer.kt | 55 ++++++++++---------
 .../_static/symboldumps/skeletons-c64.txt     |  8 ---
 examples/test.p8                              | 18 ++++--
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/codeGenCpu6502/src/prog8/codegen/cpu6502/AsmOptimizer.kt b/codeGenCpu6502/src/prog8/codegen/cpu6502/AsmOptimizer.kt
index 9721144e6..dc0075f8d 100644
--- a/codeGenCpu6502/src/prog8/codegen/cpu6502/AsmOptimizer.kt
+++ b/codeGenCpu6502/src/prog8/codegen/cpu6502/AsmOptimizer.kt
@@ -516,34 +516,35 @@ private fun optimizeJsrRtsAndOtherCombinations(linesByFour: Sequence<List<Indexe
         val first = lines[0].value
         val second = lines[1].value
         val third = lines[2].value
-        if ((" jsr" in first || "\tjsr" in first ) && (" rts" in second || "\trts" in second)) {
-            mods += Modification(lines[0].index, false, lines[0].value.replace("jsr", "jmp"))
-            mods += Modification(lines[1].index, true, null)
-        }
-        else if (" rts" in first || "\trts" in first) {
-            if (" jmp" in second || "\tjmp" in second)
-                mods += Modification(lines[1].index, true, null)
-            else if (" bra" in second || "\tbra" in second)
-                mods += Modification(lines[1].index, true, null)
-            else if (" bcc" in second || "\tbcc" in second)
-                mods += Modification(lines[1].index, true, null)
-            else if (" bcs" in second || "\tbcs" in second)
-                mods += Modification(lines[1].index, true, null)
-            else if (" beq" in second || "\tbeq" in second)
-                mods += Modification(lines[1].index, true, null)
-            else if (" bne" in second || "\tbne" in second)
-                mods += Modification(lines[1].index, true, null)
-            else if (" bmi" in second || "\tbmi" in second)
-                mods += Modification(lines[1].index, true, null)
-            else if (" bpl" in second || "\tbpl" in second)
-                mods += Modification(lines[1].index, true, null)
-            else if (" bvs" in second || "\tbvs" in second)
-                mods += Modification(lines[1].index, true, null)
-            else if (" bvc" in second || "\tbvc" in second)
-                mods += Modification(lines[1].index, true, null)
-        }
 
-        if (!haslabel(second)) {
+        if(!haslabel(second)) {
+            if ((" jsr" in first || "\tjsr" in first ) && (" rts" in second || "\trts" in second)) {
+                mods += Modification(lines[0].index, false, lines[0].value.replace("jsr", "jmp"))
+                mods += Modification(lines[1].index, true, null)
+            }
+            else if (" rts" in first || "\trts" in first) {
+                if (" jmp" in second || "\tjmp" in second)
+                    mods += Modification(lines[1].index, true, null)
+                else if (" bra" in second || "\tbra" in second)
+                    mods += Modification(lines[1].index, true, null)
+                else if (" bcc" in second || "\tbcc" in second)
+                    mods += Modification(lines[1].index, true, null)
+                else if (" bcs" in second || "\tbcs" in second)
+                    mods += Modification(lines[1].index, true, null)
+                else if (" beq" in second || "\tbeq" in second)
+                    mods += Modification(lines[1].index, true, null)
+                else if (" bne" in second || "\tbne" in second)
+                    mods += Modification(lines[1].index, true, null)
+                else if (" bmi" in second || "\tbmi" in second)
+                    mods += Modification(lines[1].index, true, null)
+                else if (" bpl" in second || "\tbpl" in second)
+                    mods += Modification(lines[1].index, true, null)
+                else if (" bvs" in second || "\tbvs" in second)
+                    mods += Modification(lines[1].index, true, null)
+                else if (" bvc" in second || "\tbvc" in second)
+                    mods += Modification(lines[1].index, true, null)
+            }
+
             if ((" lda" in first || "\tlda" in first) && (" cmp  #0" in second || "\tcmp  #0" in second) ||
                 (" ldx" in first || "\tldx" in first) && (" cpx  #0" in second || "\tcpx  #0" in second) ||
                 (" ldy" in first || "\tldy" in first) && (" cpy  #0" in second || "\tcpy  #0" in second)
diff --git a/docs/source/_static/symboldumps/skeletons-c64.txt b/docs/source/_static/symboldumps/skeletons-c64.txt
index 3a5406db9..b964ae1be 100644
--- a/docs/source/_static/symboldumps/skeletons-c64.txt
+++ b/docs/source/_static/symboldumps/skeletons-c64.txt
@@ -469,9 +469,6 @@ cx16  {
 }
 
 
-LIBRARY MODULE NAME: shared_cbm_textio_functions
-------------------------------------------------
-
 LIBRARY MODULE NAME: diskio
 ---------------------------
 diskio  {
@@ -550,9 +547,6 @@ string  {
 }
 
 
-LIBRARY MODULE NAME: shared_string_functions
---------------------------------------------
-
 LIBRARY MODULE NAME: floats
 ---------------------------
 floats  {
@@ -712,5 +706,3 @@ test_stack  {
     test  () 
 }
 
-
-
diff --git a/examples/test.p8 b/examples/test.p8
index eb5d0a37c..9d37dd7ec 100644
--- a/examples/test.p8
+++ b/examples/test.p8
@@ -1,10 +1,16 @@
+%import textio
+%import floats
+%zeropage basicsafe
+
 main {
     sub start() {
-        ubyte i
-        i++
-
-        ubyte i, j              ; redefinition
-        i++
-        j++
+        float fl = 5.23
+        fl = floats.ceil(fl)
+        floats.print(fl)
+        txt.nl()
+        fl = 5.23
+        fl = floats.floor(fl)
+        floats.print(fl)
+        txt.nl()
     }
 }