ref: fee0f0d6a4ab194f8aa1ecc1a886cbca22052c6b
parent: 3a1f843e783a7a654ccd7e72f5e3fa4a40ea4009
author: yenatch <[email protected]>
date: Fri Jun 28 12:06:39 EDT 2013
gbz80disasm: don't read data where there is none
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -550,6 +550,8 @@
##0x18, #jr
###0xda, 0xe9, 0xd2, 0xc2, 0xca, 0xc3, 0x38, 0x30, 0x20, 0x28, 0x18, 0xd8, 0xd0, 0xc0, 0xc8, 0xc9
]
+
+discrete_jumps = [0xda, 0xe9, 0xd2, 0xc2, 0xca, 0xc3]
relative_jumps = [0x38, 0x30, 0x20, 0x28, 0x18, 0xc3, 0xda, 0xc2]
relative_unconditional_jumps = [0xc3, 0x18]
@@ -789,12 +791,13 @@
number = byte1
number += byte2 << 8
- pointer = get_global_address(number, bank_id)
- if pointer not in data_tables.keys():
- data_tables[pointer] = {}- data_tables[pointer]['usage'] = 0
- else:
- data_tables[pointer]['usage'] += 1
+ if current_byte not in call_commands + discrete_jumps + relative_jumps:
+ pointer = get_global_address(number, bank_id)
+ if pointer not in data_tables.keys():
+ data_tables[pointer] = {}+ data_tables[pointer]['usage'] = 0
+ else:
+ data_tables[pointer]['usage'] += 1
insertion = "$%.4x" % (number)
result = find_label(insertion, bank_id)
@@ -848,7 +851,7 @@
keep_reading = False
is_data = False #cleanup
break
- elif offset not in byte_labels.keys() or offset in data_tables.keys():
+ elif offset not in byte_labels.keys() and offset in data_tables.keys():
is_data = True
keep_reading = True
else: