From 3460886356e8b666dd86f98a9cb2f228b5ad6a0c Mon Sep 17 00:00:00 2001
From: jonschz <jonschz@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:21:41 +0200
Subject: [PATCH] Review: remove redundant code

---
 tools/isledecomp/isledecomp/compare/core.py | 48 ---------------------
 tools/isledecomp/isledecomp/compare/db.py   | 12 ------
 2 files changed, 60 deletions(-)

diff --git a/tools/isledecomp/isledecomp/compare/core.py b/tools/isledecomp/isledecomp/compare/core.py
index 6484744b..7de58716 100644
--- a/tools/isledecomp/isledecomp/compare/core.py
+++ b/tools/isledecomp/isledecomp/compare/core.py
@@ -508,8 +508,6 @@ def _find_vtordisp(self):
 
                 if self._db.is_vtordisp(recomp_addr):
                     self._match_vtordisp_in_vtable(orig_addr, recomp_addr)
-                elif self._db.is_thunk_of(recomp_addr):
-                    self._match_thunk_in_vtable(orig_addr, recomp_addr)
 
     def _match_vtordisp_in_vtable(self, orig_addr, recomp_addr):
         thunk_fn = self.get_by_recomp(recomp_addr)
@@ -559,52 +557,6 @@ def _match_vtordisp_in_vtable(self, orig_addr, recomp_addr):
                 )
             self._db.set_function_pair(orig_addr, recomp_addr)
 
-    def _match_thunk_in_vtable(self, orig_addr, recomp_addr):
-        thunk_fn = self.get_by_recomp(recomp_addr)
-        assert thunk_fn is not None
-
-        # These thunks always consist of one jump instruction, which is 5 bytes long.
-        thunk_size = 5
-        assert thunk_fn.size == thunk_size
-
-        orig_thunk_bin = self.orig_bin.read(orig_addr, thunk_size)
-        recomp_thunk_bin = self.recomp_bin.read(recomp_addr, thunk_size)
-        assert orig_thunk_bin is not None and recomp_thunk_bin is not None
-
-        # Read jump opcode and displacement (1+4 bytes)
-        (orig_jmp, orig_disp) = struct.unpack("<Bi", orig_thunk_bin)
-        (recomp_jmp, recomp_disp) = struct.unpack("<Bi", recomp_thunk_bin)
-
-        # Make sure it's a JMP
-        if orig_jmp != 0xE9 or recomp_jmp != 0xE9:
-            logger.warning(
-                "Not a jump in Thunk at (0x%x, 0x%x)", orig_addr, recomp_addr
-            )
-            return
-
-        # Calculate jump destination from the end of the JMP instruction
-        # i.e. the end of the function
-        orig_jump_target = orig_addr + len(orig_thunk_bin) + orig_disp
-        recomp_jump_target = recomp_addr + len(recomp_thunk_bin) + recomp_disp
-
-        # If they are thunking the same function, then this must be a match.
-        pointer_match = self._db.get_by_orig(orig_jump_target)
-        if pointer_match is None:
-            logger.info(
-                "Thunk at 0x%x jumps to 0x%x which is not annotated",
-                orig_addr,
-                orig_jump_target,
-            )
-            return
-
-        if pointer_match.recomp_addr != recomp_jump_target:
-            logger.warning(
-                "Thunk jump target mismatch at (%x, %x)", orig_addr, recomp_addr
-            )
-
-        logger.debug("Thunk match at (%x, %x)", orig_addr, recomp_addr)
-        self._db.set_function_pair(orig_addr, recomp_addr)
-
     def _dump_asm(self, orig_combined, recomp_combined):
         """Append the provided assembly output to the debug files"""
         with open(f"orig-{self.runid}.txt", "a", encoding="utf-8") as f:
diff --git a/tools/isledecomp/isledecomp/compare/db.py b/tools/isledecomp/isledecomp/compare/db.py
index 74068e27..ad030548 100644
--- a/tools/isledecomp/isledecomp/compare/db.py
+++ b/tools/isledecomp/isledecomp/compare/db.py
@@ -381,18 +381,6 @@ def is_vtordisp(self, recomp_addr: int) -> bool:
 
         return True
 
-    def is_thunk_of(self, recomp_addr: int) -> bool:
-        """Check whether this function is a thunk of a debug build based on its name."""
-
-        name = self._db.execute(
-            """SELECT name
-            FROM `symbols`
-            WHERE recomp_addr = ?""",
-            (recomp_addr,),
-        ).fetchone()[0]
-
-        return name.startswith("Thunk of")
-
     def _find_potential_match(
         self, name: str, compare_type: SymbolType
     ) -> Optional[int]: