MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghidra: add type name to anonymous fields/vmethods 

ghidra: fix static array sizing when determined by index-enum
develop
Ben Lubar 2020-03-21 07:46:03 -05:00
parent 666b35f1f6
commit 60892cade2
No known key found for this signature in database
GPG Key ID: 92939677AB59EDA4
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
reversing/import_df_structures.java
Unescape Escape View File

@ -9,11 +9,8 @@ import ghidra.app.script.*;
import ghidra.program.model.address.*; import ghidra.program.model.address.*;
import ghidra.program.model.data.*; import ghidra.program.model.data.*;
import ghidra.program.model.listing.*; import ghidra.program.model.listing.*;
import ghidra.program.model.listing.Function.FunctionUpdateType;
import ghidra.program.model.symbol.*; import ghidra.program.model.symbol.*;
import ghidra.program.model.util.*; import ghidra.program.model.util.*;
import ghidra.util.exception.DuplicateNameException;
import ghidra.util.exception.InvalidInputException;
import ghidra.util.task.*; import ghidra.util.task.*;
public class import_df_structures extends GhidraScript public class import_df_structures extends GhidraScript
@ -1077,9 +1074,11 @@ public class import_df_structures extends GhidraScript
if ("global".equals(f.item.meta) || "compound".equals(f.item.meta)) if ("global".equals(f.item.meta) || "compound".equals(f.item.meta))
{ {
/*
var t = codegen.typesByName.get(f.item.typeName); var t = codegen.typesByName.get(f.item.typeName);
if (t != null && t.hasSubClasses) if (t != null && t.hasSubClasses)
return findOrCreateBaseClassUnion(t); return dtm.getPointer(findOrCreateBaseClassUnion(t), currentProgram.getDefaultPointerSize());
*/
} }
return dtm.getPointer(getDataType(f.item), currentProgram.getDefaultPointerSize()); return dtm.getPointer(getDataType(f.item), currentProgram.getDefaultPointerSize());
@ -1093,7 +1092,8 @@ public class import_df_structures extends GhidraScript
case "static-array": case "static-array":
if (f.hasCount) if (f.hasCount)
return new ArrayDataType(getDataType(f.item), f.count, 0); return new ArrayDataType(getDataType(f.item), f.count, 0);
return new ArrayDataType(getDataType(f.item), codegen.typesByName.get(f.indexEnum).enumItems.size(), 0); var enumItems = codegen.typesByName.get(f.indexEnum).enumItems;
return new ArrayDataType(getDataType(f.item), (int)enumItems.get(enumItems.size() - 1).value + 1, 0);
case "bytes": case "bytes":
switch (f.subtype) switch (f.subtype)
{ {
@ -1123,13 +1123,13 @@ public class import_df_structures extends GhidraScript
return createDataType(dtcEnums, et); return createDataType(dtcEnums, et);
} }
private void addStructField(Composite st, TypeDef.Field f) throws Exception private void addStructField(Composite st, TypeDef t, TypeDef.Field f) throws Exception
{ {
String name = null; String name = null;
if (f.hasName) if (f.hasName)
name = f.name; name = f.name;
else if (f.hasAnonName) else if (f.hasAnonName)
name = f.anonName; name = t.typeName + "_" + f.anonName;
st.add(getDataType(f), f.size, name, null); st.add(getDataType(f), f.size, name, null);
} }
@ -1149,7 +1149,7 @@ public class import_df_structures extends GhidraScript
for (var f : t.fields) for (var f : t.fields)
{ {
addStructField(st, f); addStructField(st, t, f);
} }
} }
@ -1217,11 +1217,9 @@ public class import_df_structures extends GhidraScript
if (vm.hasName) if (vm.hasName)
mname = vm.name; mname = vm.name;
else if (vm.hasAnonName) else if (vm.hasAnonName)
mname = vm.anonName; mname = name + "_" + vm.anonName;
else if (vm.isDestructor) else if (vm.isDestructor)
mname = "~" + name; mname = "~" + name;
else
mname = "_anon_vmethod_" + (st.getLength() / currentProgram.getDefaultPointerSize());
st.add(dtm.getPointer(createMethodDataType(name + "::" + mname, vm), currentProgram.getDefaultPointerSize()), mname, null); st.add(dtm.getPointer(createMethodDataType(name + "::" + mname, vm), currentProgram.getDefaultPointerSize()), mname, null);
} }
@ -1230,14 +1228,14 @@ public class import_df_structures extends GhidraScript
private Union findOrCreateBaseClassUnion(TypeDef t) throws Exception private Union findOrCreateBaseClassUnion(TypeDef t) throws Exception
{ {
var typeName = "virtual_" + (t.originalName == null ? t.typeName : t.originalName) + "_ptr"; var typeName = "virtual_" + (t.originalName == null ? t.typeName : t.originalName);
var existing = (Union)dtc.getDataType(typeName); var existing = (Union)dtc.getDataType(typeName);
if (existing != null) if (existing != null)
return existing; return existing;
var ut = new UnionDataType(typeName); var ut = new UnionDataType(typeName);
dtc.addDataType(ut, DataTypeConflictHandler.REPLACE_HANDLER); dtc.addDataType(ut, DataTypeConflictHandler.REPLACE_HANDLER);
ut.add(dtm.getPointer(createDataType(t), currentProgram.getDefaultPointerSize())); ut.add(createDataType(t), t.typeName, null);
return (Union)createDataType(dtc, ut); return (Union)createDataType(dtc, ut);
} }
@ -1246,14 +1244,9 @@ public class import_df_structures extends GhidraScript
if (t.inheritsFrom == null) if (t.inheritsFrom == null)
return; return;
DataType ptr; var self = t.hasSubClasses ? findOrCreateBaseClassUnion(t) : st;
if (t.hasSubClasses)
ptr = findOrCreateBaseClassUnion(t);
else
ptr = dtm.getPointer(st, currentProgram.getDefaultPointerSize());
var parent = findOrCreateBaseClassUnion(codegen.typesByName.get(t.inheritsFrom)); var parent = findOrCreateBaseClassUnion(codegen.typesByName.get(t.inheritsFrom));
parent.add(ptr); parent.add(self);
} }
private DataType createClassDataType(TypeDef t) throws Exception private DataType createClassDataType(TypeDef t) throws Exception
@ -1289,7 +1282,7 @@ public class import_df_structures extends GhidraScript
if (f.hasName) if (f.hasName)
name = f.name; name = f.name;
else if (f.hasAnonName) else if (f.hasAnonName)
name = f.anonName; name = t.typeName + "_" + f.anonName;
int count = f.hasCount ? f.count : 1; int count = f.hasCount ? f.count : 1;
st.addBitField(dtUint32, count, name, null); st.addBitField(dtUint32, count, name, null);
} }
@ -1373,7 +1366,7 @@ public class import_df_structures extends GhidraScript
for (var arg : funcType.getArguments()) for (var arg : funcType.getArguments())
params.add(new ParameterImpl(arg.getName(), arg.getDataType(), currentProgram)); params.add(new ParameterImpl(arg.getName(), arg.getDataType(), currentProgram));
func.updateFunction("__thiscall", ret, params, FunctionUpdateType.DYNAMIC_STORAGE_FORMAL_PARAMS, true, SourceType.IMPORTED); func.updateFunction("__thiscall", ret, params, Function.FunctionUpdateType.DYNAMIC_STORAGE_FORMAL_PARAMS, true, SourceType.IMPORTED);
} }
else else
{ {