Set thunks for functions within the same binary as well

Adubbz · Nov 1, 2024 · a3ba3f2 · a3ba3f2
1 parent c053579
commit a3ba3f2
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/main/java/adubbz/nx/loader/common/NXProgramBuilder.java b/src/main/java/adubbz/nx/loader/common/NXProgramBuilder.java
@@ -394,6 +394,19 @@ else if (reloc.r_type == R_FAKE_RELR) {
                     if (extLoc != null) {
                         func.setThunkedFunction(extLoc.getFunction());
                     }
+                    else {
+                        // The function could still be in the same binary
+                        // TODO: Ideally we should just calculate the destination address and use that instead of searching for the function name.
+                        List<Symbol> symbols = program.getSymbolTable().getLabelOrFunctionSymbols(name, null).stream().filter(symbol -> addr != symbol.getAddress()).toList();
+                        if (symbols.isEmpty()) {
+                            continue;
+                        }
+                        if (symbols.size() > 1) {
+                            Msg.error(this, String.format("Couldn't identify thunked function for: %s (%s)", name, addr));
+                            continue;
+                        }
+                        func.setThunkedFunction(program.getFunctionManager().getFunctionAt(symbols.getFirst().getAddress()));
+                    }
                 }
             }
         }