From 82b8b5121a574b6e29c72a95fd305134fd0a08cf Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 3 Feb 2013 15:10:14 -0600 Subject: enable labels in gbz80disasm fixes #102 --- extras/gbz80disasm.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'extras/gbz80disasm.py') diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py index f2ba4839f..088a32f74 100644 --- a/extras/gbz80disasm.py +++ b/extras/gbz80disasm.py @@ -568,8 +568,6 @@ def load_labels(filename="labels.json"): crystal.scan_for_predefined_labels() def find_label(local_address, bank_id=0): - return None - global all_labels # keep an integer @@ -577,17 +575,19 @@ def find_label(local_address, bank_id=0): local_address1 = int(local_address.replace("$", "0x"), 16) else: local_address1 = local_address - # turn local_address into a string + # turn local_address into an integer + if type(local_address) == str: + if "0x" in local_address: + local_address = local_address.replace("0x", "$") + elif "$" in local_address: + local_address = local_address.replace("$", "") + if type(local_address) == str: - if "0x" in local_address: local_address = local_address.replace("0x", "$") - elif not "$" in local_address: local_address = "$" + local_address - if type(local_address) == int: - local_address = "$%.x" % (local_address) - local_address = local_address.upper() + local_address = int(local_address, 16) for label_entry in all_labels: - if label_entry["local_pointer"].upper() == local_address: - if label_entry["bank_id"] == bank_id or (local_address1 < 0x8000 and (label_entry["bank_id"] == 0 or label_entry["bank_id"] == 1)): + if label_entry["address"] == local_address: + if label_entry["bank"] == bank_id or (local_address1 < 0x8000 and (label_entry["bank"] == 0 or label_entry["bank"] == 1)): return label_entry["label"] return None -- cgit v1.2.3 From 57200b6cf75040b9696ae54bdac69d5e452a2c48 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 3 Feb 2013 15:18:06 -0600 Subject: simplify load_rom in gbz80disasm --- extras/gbz80disasm.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'extras/gbz80disasm.py') diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py index 088a32f74..d22f152f1 100644 --- a/extras/gbz80disasm.py +++ b/extras/gbz80disasm.py @@ -14,11 +14,8 @@ if not hasattr(json, "read"): from romstr import RomStr def load_rom(filename="../baserom.gbc"): - """loads bytes into memory""" global rom - file_handler = open(filename, "rb") - rom = RomStr(file_handler.read()) - file_handler.close() + rom = RomStr.load(filename=filename) return rom spacing = "\t" -- cgit v1.2.3