thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

update gbz80disasm to find labels better

Browse source 
hg-commit-id: 10be245776b4
This commit is contained in:
Bryan Bishop 2012-01-24 12:49:08 -06:00
parent a33150930b
commit d2f4073eb9
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
extras/gbz80disasm.py
View file

@ -567,18 +567,22 @@ load_labels()
def find_label(local_address, bank_id=0): def find_label(local_address, bank_id=0):
global all_labels global all_labels
#keep an integer
if type(local_address) == str:
local_address1 = int(local_address.replace("$", "0x"), 16)
else: local_address1 = local_address
#turn local_address into a string #turn local_address into a string
if type(local_address) == str: if type(local_address) == str:
if "0x" in local_address: local_address = local_address.replace("0x", "$") if "0x" in local_address: local_address = local_address.replace("0x", "$")
elif not "$" in local_address: local_address = "$" + local_address elif not "$" in local_address: local_address = "$" + local_address
if type(local_address) == int: if type(local_address) == int:
local_address = "$%.2x" % (local_address) local_address = "$%.x" % (local_address)
local_address = local_address.upper() local_address = local_address.upper()
for label_entry in all_labels: for label_entry in all_labels:
if label_entry["local_pointer"].upper() == local_address: if label_entry["local_pointer"].upper() == local_address:
if label_entry["bank_id"] == bank_id: if label_entry["bank_id"] == bank_id or (local_address1 < 0x8000 and (label_entry["bank_id"] == 0 or label_entry["bank_id"] == 1)):
return label_entry["label"] return label_entry["label"]
return None return None
@ -599,8 +603,9 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
#a, oa = current_byte_number #a, oa = current_byte_number
bank_id = 0 bank_id = 0
if original_offset > 0x4000: if original_offset > 0x8000:
bank_id = original_offset / 0x4000 bank_id = original_offset / 0x4000
print "bank id is: " + str(bank_id)
last_hl_address = None #for when we're scanning the main map script last_hl_address = None #for when we're scanning the main map script
last_a_address = None last_a_address = None
@ -741,7 +746,7 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000):
insertion = "$%.4x" % (number) insertion = "$%.4x" % (number)
if maybe_byte in call_commands or current_byte in relative_unconditional_jumps or current_byte in relative_jumps: if maybe_byte in call_commands or current_byte in relative_unconditional_jumps or current_byte in relative_jumps:
result = find_label(insertion[1:], bank_id) result = find_label(insertion, bank_id)
if result != None: if result != None:
insertion = result insertion = result