The ARM11 exception handlers are now working.
Refactored the exception handling code in general.
This commit is contained in:
@@ -78,33 +78,25 @@ if __name__ == "__main__":
|
||||
if unpack_from("<2I", data) != (0xdeadc0de, 0xdeadcafe):
|
||||
raise SystemExit("Invalid file format")
|
||||
|
||||
processor, exceptionType, _, _, codeDumpSize, stackDumpSize = unpack_from("<6I", data, 12)
|
||||
processor, exceptionType, _, nbRegisters, codeDumpSize, stackDumpSize = unpack_from("<6I", data, 12)
|
||||
nbRegisters //= 4
|
||||
|
||||
if processor == 9: print("Processor: ARM9")
|
||||
else: print("Processor: ARM11 (core {0})".format(processor >> 16))
|
||||
|
||||
print("Exception type: {0}".format("unknown" if exceptionType >= len(handledExceptionNames) else handledExceptionNames[exceptionType]))
|
||||
|
||||
registers = []
|
||||
registers = unpack_from("<{0}I".format(nbRegisters), data, 40)
|
||||
print("\nRegister dump:\n")
|
||||
if processor == 9:
|
||||
registers = unpack_from("<17I", data, 40)
|
||||
for i in range(0, 16, 2):
|
||||
print(makeRegisterLine(registerNames[i], registers[i], registerNames[i+1], registers[i+1]))
|
||||
print("{0:<15}{1:<20}".format(registerNames[-2], "{0:08x}".format(registers[-1])))
|
||||
else:
|
||||
registers = unpack_from("<18I", data, 40)
|
||||
for i in range(0, 18, 2):
|
||||
print(makeRegisterLine(registerNames[i], registers[i], registerNames[i+1], registers[i+1]))
|
||||
for i in range(0, nbRegisters - (nbRegisters % 2), 2):
|
||||
print(makeRegisterLine(registerNames[i], registers[i], registerNames[i+1], registers[i+1]))
|
||||
if nbRegisters % 2 == 1: print("{0:<15}{1:<20}".format(registerNames[-2], "{0:08x}".format(registers[-1])))
|
||||
|
||||
codeDump = data[40+4*len(registers) : 40+4*len(registers) + codeDumpSize]
|
||||
codeDump = data[40 + 4 * nbRegisters : 40 + 4 * nbRegisters + codeDumpSize]
|
||||
print("\nCode dump:\n")
|
||||
print(hexdump(registers[15] - codeDumpSize + 2, codeDump))
|
||||
|
||||
# Homebrew/CFW set their stack at 0x27000000, let's detect it
|
||||
if 0 <= 0x27000000 - registers[13] <= stackDumpSize: stackDumpSize = 0x27000000 - registers[13]
|
||||
|
||||
stackOffset = 40+4*len(registers) + codeDumpSize
|
||||
stackOffset = 40 + 4*nbRegisters + codeDumpSize
|
||||
stackDump = data[stackOffset : stackOffset + stackDumpSize]
|
||||
print("\nStack dump:\n")
|
||||
print(hexdump(registers[13], stackDump))
|
||||
|
||||
Reference in New Issue
Block a user