archived/GeckoLoader
Archived
1
0
Fork 0
Code Activity

Fixed legacy patching, hooks no longer corrupt

Browse source
This commit is contained in:
JoshuaMKW 2020-10-19 03:07:28 -05:00
parent 772d145ae2
commit c160e5df2b
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -133,3 +133,4 @@ dmypy.json
# Gct files # Gct files
*.gct *.gct
installer.py

27
kernel.py
View file

@ -8,7 +8,7 @@ from io import BytesIO
import tools import tools
from fileutils import * from fileutils import *
from dolreader import DolFile, SectionCountFullError from dolreader import DolFile, SectionCountFullError, UnmappedAddressError
try: try:
import chardet import chardet
@ -173,7 +173,7 @@ class GCT(object):
codelist += self.codeList.read(1) codelist += self.codeList.read(1)
length -= 1 length -= 1
except RuntimeError: except (RuntimeError, UnmappedAddressError):
self.codeList.seek(-8, 1) self.codeList.seek(-8, 1)
length = GCT.determine_codelength(codetype, info) length = GCT.determine_codelength(codetype, info)
codelist += self.codeList.read(length) codelist += self.codeList.read(length)
@ -295,8 +295,10 @@ class CodeHandler(object):
dolFile.seek(address) dolFile.seek(address)
ppc = read_uint32(dolFile) ppc = read_uint32(dolFile)
if (((ppc >> 24) & 0xFF) > 0x47 and ((ppc >> 24) & 0xFF) < 0x4C): if ((((ppc >> 24) & 0xFF) > 0x47 and ((ppc >> 24) & 0xFF) < 0x4C) or (((ppc >> 24) & 0xFF) > 0x3F and ((ppc >> 24) & 0xFF) < 0x44)):
to = dolFile.extract_branch_addr(address) to, conditional = dolFile.extract_branch_addr(address)
if conditional:
raise NotImplementedError("Hooking to a conditional non spr branch is unsupported")
write_uint32(self._rawData, (to - (self.initAddress + varOffset)) & 0x3FFFFFD | 0x48000000 | lk) write_uint32(self._rawData, (to - (self.initAddress + varOffset)) & 0x3FFFFFD | 0x48000000 | lk)
else: else:
write_uint32(self._rawData, ppc) write_uint32(self._rawData, ppc)
@ -385,7 +387,7 @@ class KernelLoader(object):
self._rawData.seek(-4, 1) self._rawData.seek(-4, 1)
write_uint32(self._rawData, len(self._rawData.getbuffer())) write_uint32(self._rawData, len(self._rawData.getbuffer()))
elif sample == b'HSIZ': #Found keyword "HSIZ". Goes with the size of the codeHandler elif sample == b'HSIZ': #Found keyword "HSIZ". Goes with the size of the codehandler
self._rawData.seek(-4, 1) self._rawData.seek(-4, 1)
write_sint32(self._rawData, codeHandler.handlerLength) write_sint32(self._rawData, codeHandler.handlerLength)
@ -567,15 +569,16 @@ class KernelLoader(object):
return return
if self.patchJob == 'LEGACY': if self.patchJob == 'LEGACY':
codeHandler.allocation = 0x80003000 - (codeHandler.initAddress + codeHandler.handlerLength)
codeHandler.set_variables(dolFile)
hooked = determine_codehook(dolFile, codeHandler, True)
self.patch_legacy(codeHandler, dolFile)
legacy = True legacy = True
codeHandler.allocation = 0x80003000 - (codeHandler.initAddress + codeHandler.handlerLength)
hooked = determine_codehook(dolFile, codeHandler, True)
if hooked:
self.patch_legacy(codeHandler, dolFile)
else: else:
hooked = determine_codehook(dolFile, codeHandler, False)
self.patch_arena(codeHandler, dolFile)
legacy = False legacy = False
hooked = determine_codehook(dolFile, codeHandler, False)
if hooked:
self.patch_arena(codeHandler, dolFile)
if not hooked: if not hooked:
self.error(tools.color_text('Failed to find a hook address. Try using option --codehook to use your own address\n', defaultColor=tools.TREDLIT)) self.error(tools.color_text('Failed to find a hook address. Try using option --codehook to use your own address\n', defaultColor=tools.TREDLIT))
@ -636,7 +639,9 @@ def determine_codehook(dolFile: DolFile, codeHandler: CodeHandler, hook=False):
return False return False
if hook: if hook:
codeHandler.set_variables(dolFile)
insert_code_hook(dolFile, codeHandler, codeHandler.hookAddress) insert_code_hook(dolFile, codeHandler, codeHandler.hookAddress)
return True return True