Merge pull request #34 from cormacj/bugfixing

bugfix for dropped JP (IY)

Author: cormacj

CHANGELOG.md

@@ -3,3 +3,4 @@
 2025-03-21: Bump to v0.80 - Add support for external labels, such as BIOS calls. Improved code detection methods.
 2025-06-13: Bump to v0.85 - Add the ability to define user-defined labels to the labels file. Increased error handling, more informational messages.
 2025-06-18: Bump to v0.87 - Corrected issues with string detection where strings weren't being properly decoded.
+2025-06-20: Bump to v0.89 - Bugfix for dropped `JP (IY)` instructions. Made JR decoding match the style of other jumps.

z80-disassembler.py

@@ -90,7 +90,7 @@ class Pointer(NamedTuple):
 str_sizes = {}
 style = "asm"
 hexstyle = "0x"
-myversion = "0.87"
+myversion = "0.89"
 
 
 #--- Debugging functions ---
@@ -1722,6 +1722,17 @@ def findstring(memstart, memend):
                 )
                 program_counter += b.len
             else:
+                #It's something like JP (IY)
+                tmp=z80.disasm(b)
+                if "+0)" in tmp:
+                    tmp=tmp.split("+0)")[0]+")" #The code library produces a JP (IY+0) which while techically ok, isn't understood by many assemblers.
+                code_output(
+                    program_counter,
+                    tmp,
+                    list_address,
+                    explain.code(z80.disasm(b),explainlevel),
+                    add_extra_info(decode_buffer),
+                )
                 program_counter += b.len
         elif b.op is b.op.LD:  # and b.operands[0][0] is not b.operands[0][0].REG_DEREF:
             # debug("C2 - 3")