rndtrash/JSRF-Decompilation
1
0
Fork 0
mirror of https://codeberg.org/KeybadeBlox/JSRF-Decompilation.git synced 2026-05-22 17:37:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for delinking

Browse source 
Fixes delink failures in Action.obj and ActSequence.obj.

Some missing data types have been added to each corresponding header
file, and entries have been added to the symbol table to fix errors from
undefined types.  The mangling script has also been amended to handle
method pointers as they're currently imported into Ghidra (which are
missing the calling convention, and likely behind a typedef).
This commit is contained in:
KeybadeBlox 2026-05-02 20:34:05 -04:00
parent f50945266c
commit 20fecdd5fb
6 changed files with 74 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ghidra/ghidra_scripts/MSVC7Mangle.java
View file

@ -432,7 +432,12 @@ public class MSVC7Mangle extends GhidraScript {
case DoubleDataType x -> "N";
case LongDoubleDataType x -> "O";
case Pointer p -> "P" +
(p.getDataType() instanceof FunctionSignature f ? (
((
p.getDataType() instanceof FunctionSignature || (
p.getDataType () instanceof TypeDef d &&
d.getBaseDataType() instanceof FunctionSignature
)
) ? (
classNamespace.isPresent() ? "8" : "6"
) : "A"
) + mangleType(p.getDataType(), classNamespace, dict, loc);
@ -519,7 +524,10 @@ public class MSVC7Mangle extends GhidraScript {
List<DataType> args = Arrays.stream(f.getArguments())
.map(ParameterDefinition::getDataType)
.toList();
args = args.subList(isMethodPtr ? 1 : 0, args.size());
if (
isMethodPtr &&
f.getCallingConventionName().equals("__thiscall")
) args = args.subList(1, args.size());
final ArrayList<DataType> argDict = new ArrayList<>();