isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-30 11:27:40 -05:00
Code Issues Projects Releases Packages Wiki Activity

Handle duplicate thunks in BETA10 (#1113)

Browse source
This commit is contained in:
MS 2024-10-17 23:17:00 -04:00 committed by GitHub
parent 8446a7ffa1
commit 91205be031
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/isledecomp/isledecomp/compare/core.py
View file

@ -428,11 +428,6 @@ def _match_thunks(self):
points at a function we have already matched, we can find the matching points at a function we have already matched, we can find the matching
thunk in recomp because it points to the same place.""" thunk in recomp because it points to the same place."""
# Turn this one inside out for easy lookup
recomp_thunks = {
func_addr: thunk_addr for (thunk_addr, func_addr) in self.recomp_bin.thunks
}
# Mark all recomp thunks first. This allows us to use their name # Mark all recomp thunks first. This allows us to use their name
# when we sanitize the asm. # when we sanitize the asm.
for recomp_thunk, recomp_addr in self.recomp_bin.thunks: for recomp_thunk, recomp_addr in self.recomp_bin.thunks:
@ -442,17 +437,29 @@ def _match_thunks(self):
self._db.create_recomp_thunk(recomp_thunk, recomp_func.name) self._db.create_recomp_thunk(recomp_thunk, recomp_func.name)
# Thunks may be non-unique, so use a list as dict value when
# inverting the list of tuples from self.recomp_bin.
recomp_thunks = {}
for thunk_addr, func_addr in self.recomp_bin.thunks:
recomp_thunks.setdefault(func_addr, []).append(thunk_addr)
# Now match the thunks from orig where we can.
for orig_thunk, orig_addr in self.orig_bin.thunks: for orig_thunk, orig_addr in self.orig_bin.thunks:
orig_func = self._db.get_by_orig(orig_addr) orig_func = self._db.get_by_orig(orig_addr)
if orig_func is None: if orig_func is None:
continue continue
# Check whether the thunk destination is a matched symbol # Check whether the thunk destination is a matched symbol
recomp_thunk = recomp_thunks.get(orig_func.recomp_addr) if orig_func.recomp_addr not in recomp_thunks:
if recomp_thunk is None:
self._db.create_orig_thunk(orig_thunk, orig_func.name) self._db.create_orig_thunk(orig_thunk, orig_func.name)
continue continue
# If there are multiple thunks, they are already in v.addr order.
# Pop the earliest one and match it.
recomp_thunk = recomp_thunks[orig_func.recomp_addr].pop(0)
if len(recomp_thunks[orig_func.recomp_addr]) == 0:
del recomp_thunks[orig_func.recomp_addr]
self._db.set_function_pair(orig_thunk, recomp_thunk) self._db.set_function_pair(orig_thunk, recomp_thunk)
# Don't compare thunk functions for now. The comparison isn't # Don't compare thunk functions for now. The comparison isn't