Cool_Tools/bemaniutils
1
0
Fork 0
mirror of synced 2025-02-17 19:19:19 +01:00
Code Releases Activity

Teach struct how to deal with NULL pointers, better output of parsed structures.

Browse Source
This commit is contained in:
Jennifer Taylor 2021-04-05 00:51:34 +00:00
parent c7e739c6e2
commit d26f3e0238
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bemani/utils/struct.py
View File

@ -161,11 +161,15 @@ class StructPrinter:
# Resolve the physical address of this pointer, trick the substructure into
# parsing only one iteration.
pointer = self.virtual_to_physical(pointer)
subparse = self.__parse_struct(pointer, pointer + 1, prefix, spec)
if len(subparse) != 1:
raise Exception("Logic error!")
line.append(subparse[0])
if pointer == 0x0:
# Null pointer
line.append(None)
else:
pointer = self.virtual_to_physical(pointer)
subparse = self.__parse_struct(pointer, pointer + 1, prefix, spec)
if len(subparse) != 1:
raise Exception("Logic error!")
line.append(subparse[0])
output.append(line)
@ -214,10 +218,21 @@ def main() -> None:
data = fp.read()
fp.close()
def __str(obj: object) -> str:
if obj is None:
return "NULL"
elif isinstance(obj, list):
if len(obj) == 1:
return __str(obj[0])
else:
return f"({', '.join(__str(o) for o in obj)})"
else:
return repr(obj)
printer = StructPrinter(data)
lines = printer.parse_struct(args.start, args.end, args.format)
for line in lines:
print(line)
print(", ".join(__str(entry) for entry in line))
if __name__ == '__main__':