Merge pull request #33 from cormacj/bugfixing

update readme. Minor display tweak on conditional relative jumps

Author: cormacj

README.md

@@ -367,7 +367,9 @@ S_109:                         ;
 ```
 # Known Issues
 * The disassembler can generate references to labels that don't exist
+* Some labels are generated, but never called.
 * String detection fails oddly towards the end of a ROM and maybe elsewhere, so use the `generate_string_locations.sh` helper script to make a template if this happens.
+* Some code that gets moved around using LDIR won't get properly decoded, because the disassembler doesn't know if its data or code. The recommended workaround is to tell the disassembler what to do using the template options, eg `0xc300,0xc309,c,RELOCATE_BUILTIN_MSG`. This that cause the disassembler treats the data between 0xc300 and 0xc309 as code and assigns the label `RELOCATE_BUILTIN_MSG`
 
 # ToDo
 

z80-disassembler.py

@@ -1151,7 +1151,7 @@ def findstring(memstart, memend):
         # else:
         #     relative_correction=0
         # print("jump:",jump_addr)
-        if (jump_addr and jump_addr not in labels):  # Its a jump, but area is already data
+        if (jump_addr and (jump_addr not in labels)):  # Its a jump, but area is already data
             # if jump_addr==0xd8dc:
             # print("----> Mark Handled",hex(jump_addr))
 
@@ -1219,17 +1219,17 @@ def findstring(memstart, memend):
 loc = 0
 
 if args.labelsfile:
-    print(f"Loading labels file: {args.labelsfile}... ",end="")
+    print(f"\n    Loading labels file: {args.labelsfile}... ",end="")
     load_labels(args.labelsfile)
     print("Done!",end="")
     if args.quiet:
         print("\n")
 
 # dump_code_array()
 if args.templatefile is not None:
-    print(f"Loading template file: {args.templatefile}...",end="")
+    print(f"\n    Loading template file: {args.templatefile}...",end="")
     process_template(args.templatefile)
-    print(" Done!",end="")
+    print(" Done!")
     if args.quiet:
         print("\n")
 
@@ -1676,7 +1676,10 @@ def findstring(memstart, memend):
                     # if its positive
                     tmp=f"{this_opcode} ${oper}{handle_jump(b,program_counter,True)} "
                 else:
-                    tmp = f"{this_opcode} " + lookup_label(jump_addr)
+                    if "," in this_opcode: # Fixup for JR nz, ADDR so this removes the space if it's a conditional JR
+                        tmp = f"{this_opcode}" + lookup_label(jump_addr)
+                    else:
+                        tmp = f"{this_opcode} " + lookup_label(jump_addr)
                 code_output(
                     program_counter,
                     tmp,