Macintosh-Tools/tbxi
1
0
Fork 0
mirror of https://github.com/elliotnunn/tbxi.git synced 2024-12-21 00:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix sanity-checking of complex ROMs

Browse Source
This commit is contained in:
Elliot Nunn 2019-06-11 12:00:15 +08:00
parent 7a3ece33d8
commit f5f2ce1dea
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tbxi/powerpc_build.py
View File

@ -106,14 +106,14 @@ def parse_configinfo(src_path):
def insert_and_assert(binary, insertee, offset):
print(hex(offset))
new_len = offset + len(insertee)
binary.extend(b'\0' * (new_len - len(binary)))
existing = binary[offset:offset+len(insertee)]
if existing != insertee and any(existing):
open('/tmp/elmo', 'wb').write(existing)
raise ValueError('inserting over something else @%X' % offset)
if any(existing): # premature optimisation
for a, b in zip(insertee, existing):
if a != 0 and b != 0 and a != b:
raise ValueError('inserting over something else @%X' % offset)
binary[offset:offset+len(insertee)] = insertee
@ -170,7 +170,10 @@ def build(src):
# The parallel filenames dict tells us what data to put at that address
if k in filenames:
blob = dispatcher.build(path.join(src, filenames[k]))
insert_and_assert(rom, blob, v - fields['ROMImageBaseOffset'])
try:
insert_and_assert(rom, blob, v - fields['ROMImageBaseOffset'])
except ValueError:
raise ValueError('Could not insert %r at %s' % (filenames[k], v - fields['ROMImageBaseOffset']))
elif header == 'LowMemory':
for words in lines: