notwa/mm
1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-06-16 00:23:05 -07:00
Code Issues Releases Wiki Activity

handle malformed data a little better

Browse Source
This commit is contained in:
Connor Olding 2016-09-28 20:54:17 -07:00
parent f28e6e78c6
commit a756b777ae
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
z64dump.py
View File

@ -31,7 +31,11 @@ lament = lambda *args, **kwargs: print(*args, file=sys.stderr, **kwargs)
dma_sig = b"\x00\x00\x00\x00\x00\x00\x10\x60\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x60" dma_sig = b"\x00\x00\x00\x00\x00\x00\x10\x60\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x60"
def dump_wrap(data, fn, size): def dump_wrap(data, fn, size):
kind = detect_format(BytesIO(data), fn) try:
kind = detect_format(BytesIO(data), fn)
except Exception as e:
lament(fn, e)
kind = None
if kind is not None: if kind is not None:
fn += '.' + kind fn += '.' + kind
dump_as(data, fn, size) dump_as(data, fn, size)
@ -188,7 +192,7 @@ def z_read_file(path, fn=None):
def z_write_dma(f, dma): def z_write_dma(f, dma):
dma.sort(key=lambda vf: vf[0]) # sort by vs dma.sort(key=lambda vf: vf[0]) # sort by vs
assert(len(dma) > 2) assert len(dma) > 2
dma_entry = dma[2] # assumption dma_entry = dma[2] # assumption
vs, ve, ps, pe = dma_entry vs, ve, ps, pe = dma_entry
@ -205,7 +209,7 @@ def z_write_dma(f, dma):
f.write(W4(ve)) f.write(W4(ve))
f.write(W4(ps)) f.write(W4(ps))
f.write(W4(pe)) f.write(W4(pe))
assert(f.tell() <= (pe or ve)) assert f.tell() <= (pe or ve)
def fix_rom(f): def fix_rom(f):
bootcode = n64.bootcode_version(f) bootcode = n64.bootcode_version(f)
@ -273,10 +277,17 @@ def create_rom(d, compress=False):
pe = 0xFFFFFFFF pe = 0xFFFFFFFF
ve = vs ve = vs
assert(start_v <= rom_size) assert start_v <= rom_size
assert(start_v + size_v <= rom_size) assert start_v + size_v <= rom_size
assert(vs < rom_size) assert vs < rom_size
assert(ve <= rom_size) assert ve <= rom_size
# TODO: do we really want to do any of this?
# i'm not sure how picky the game is with the dmatable.
#ve = align(ve)
#print(fn)
assert vs % 0x10 == 0
assert ve % 0x10 == 0
if unempty: if unempty:
f.seek(start_p) f.seek(start_p)