isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Simplify vtable name check

Browse Source
This commit is contained in:
disinvite 2024-03-23 17:06:58 -04:00
parent f0ef4f7835
commit bae788fc45
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/isledecomp/isledecomp/compare/db.py
View File

@ -358,21 +358,24 @@ def match_function(self, addr: int, name: str) -> bool:
def match_vtable(
self, addr: int, name: str, base_class: Optional[str] = None
) -> bool:
temp_base = base_class if base_class is not None else name
name_option0 = f"{name}::`vftable'"
name_option1 = f"{name}::`vftable'{{for `{temp_base}'}}"
# Only allow a match against "Class:`vftable'"
# if this is the derived class.
name = (
f"{name}::`vftable'"
if base_class is None or base_class == name
else f"{name}::`vftable'{{for `{base_class}'}}"
)
row = self._db.execute(
"""
SELECT recomp_addr
FROM `symbols`
WHERE orig_addr IS NULL
AND (name = ? OR name = ?)
AND name = ?
AND (compare_type = ?)
LIMIT 1
""",
(name_option0, name_option1, SymbolType.VTABLE.value),
(name, SymbolType.VTABLE.value),
).fetchone()
if row is not None and self.set_pair(addr, row[0], SymbolType.VTABLE):