Ghidra is a software reverse engineering (SRE) framework
GP-6670 a few improvements to gcc class recovery script
ghidra00729526717b4b8
diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/RecoverClassesFromRTTIScript.java b/Ghidra/Features/Decompiler/ghidra_scripts/RecoverClassesFromRTTIScript.javaindex 40722b0f64..f812b15946 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/RecoverClassesFromRTTIScript.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/RecoverClassesFromRTTIScript.java@@ -215,6 +215,8 @@ public class RecoverClassesFromRTTIScript extends GhidraScript {return;}+ nameVfunctions = true;+recoverClassesFromRTTI = new RTTIGccClassRecoverer(currentProgram, state.getTool(),this, BOOKMARK_FOUND_FUNCTIONS, USE_SHORT_TEMPLATE_NAMES_IN_STRUCTURE_FIELDS,nameVfunctions, MAKE_VFUNCTIONS_THISCALLS, hasDebugSymbols, monitor);diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/DecompilerScriptUtils.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/DecompilerScriptUtils.javaindex 5e32b90823..6b061d9496 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/DecompilerScriptUtils.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/DecompilerScriptUtils.java@@ -299,6 +299,12 @@ public class DecompilerScriptUtils {* @return a new address with the specified offset in the default address space*/public final Address toAddr(long offset) {++ long maxOffset = program.getMaxAddress().getOffset();++ if (Long.compareUnsigned(offset, maxOffset) > 0) {+ return null;+ }return program.getAddressFactory().getDefaultAddressSpace().getAddress(offset);}diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.javaindex b2f8764c48..c3bb89e723 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIGccClassRecoverer.java@@ -1623,8 +1623,14 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {internalString = "internal_";}- symbolTable.createLabel(vtable.getVfunctionTop(),- internalString + constructionString + VFTABLE_LABEL, classNamespace,+ // check for non-ideal primary symbol that another analyzer may have created and remove it+ // so it can be replaced with a better one+ Symbol primaryVftableSymbol = symbolTable.getPrimarySymbol(vtable.getVfunctionTop());+ if (primaryVftableSymbol != null && primaryVftableSymbol.getName().startsWith("vfTable_")) {+ primaryVftableSymbol.delete();+ }+ String vftableName = internalString + constructionString + VFTABLE_LABEL;+ symbolTable.createLabel(vtable.getVfunctionTop(), vftableName, classNamespace,SourceType.ANALYSIS);}@@ -3283,7 +3289,7 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {assignConstructorsAndDestructorsUsingExistingNameNew(recoveredClasses);// find gcc destructors in top of vftables- findVftableDestructors(recoveredClasses);+ findVftableDestructors();// figure out which are inlined and put on separate list to be processed laterseparateInlinedConstructorDestructors(recoveredClasses);@@ -3365,8 +3371,7 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {}}- private void findVftableDestructors(List<RecoveredClass> recoveredClasses)- throws CancelledException {+ private void findVftableDestructors() throws CancelledException {for (RecoveredClass recoveredClass : recoveredClasses) {@@ -3384,82 +3389,129 @@ public class RTTIGccClassRecoverer extends RTTIClassRecoverer {continue;}- Function firstVfunction = virtualFunctions.get(0);- Function secondVfunction = virtualFunctions.get(1);-- Address callingAddressOfFirstVfunction =- getCallingAddress(secondVfunction, firstVfunction);- if (callingAddressOfFirstVfunction == null) {+ Function deletingDestructor = getDeletingDestructor(virtualFunctions);+ if (deletingDestructor == null) {continue;}- // TODO: eventually work into new op delete discovery- Address callingAddrOfOpDelete =- getCallingAddress(secondVfunction, "operator.delete");- if (callingAddrOfOpDelete == null) {+ // find case where deleting destructor only calls operator.delete and the+ // destructor is just a RET instruction+ if (getFunctionCallMap(deletingDestructor, true).keySet().size() == 1) {+ for (Function vfunction : virtualFunctions) {+ monitor.checkCancelled();++ if (hasOnlyReturnInstruction(vfunction)) {+ recoveredClass.addDestructor(vfunction);+ recoveredClass.addDeletingDestructor(deletingDestructor);+ break;+ }+ }continue;}- // if firsrVfunction is called before op delete then valid set of- // destructor/deleting destructor- if (callingAddrOfOpDelete.getOffset() > callingAddressOfFirstVfunction- .getOffset()) {- recoveredClass.addDestructor(firstVfunction);- recoveredClass.addDeletingDestructor(secondVfunction);+ // find case where deleting destructor calls destructor then operator.delete+ for (Function vfunction : virtualFunctions) {+ monitor.checkCancelled();++ // skip deleting destructor - won't call itself+ if (vfunction.equals(deletingDestructor)) {+ continue;+ }++ Address callingAddessOfDestructor =+ getCallingAddress(deletingDestructor, vfunction);+ if (callingAddessOfDestructor != null) {+ Address callingAddrOfOpDelete =+ getCallingAddress(deletingDestructor, "operator.delete");++ if (callingAddrOfOpDelete.compareTo(callingAddessOfDestructor) > 0) {+ recoveredClass.addDestructor(vfunction);+ recoveredClass.addDeletingDestructor(deletingDestructor);+ }++ }}}}}- private Address getCallingAddress(Function function, Function expectedCalledFunction)- throws CancelledException {+ private boolean hasOnlyReturnInstruction(Function function) {InstructionIterator instructions =- function.getProgram().getListing().getInstructions(function.getBody(), true);+ program.getListing().getInstructions(function.getBody(), true);- while (instructions.hasNext()) {- monitor.checkCancelled();+ // get the first instruction+ if (instructions.hasNext()) {Instruction instruction = instructions.next();- if (instruction.getFlowType().isCall()) {+ if (instruction.getFlowType().isTerminal() && !instructions.hasNext()) {+ return true;+ }+ }+ return false;+ }++ private Function getDeletingDestructor(List<Function> functions) throws CancelledException {++ for (Function function : functions) {+ monitor.checkCancelled();++ Map<Address, Function> map = getFunctionCallMap(function, true);- Function calledFunction =- extendedFlatAPI.getReferencedFunction(instruction.getMinAddress(), false);+ for (Address address : map.keySet()) {+ monitor.checkCancelled();+ Function calledFunction = map.get(address);if (calledFunction == null) {continue;}- if (calledFunction.equals(expectedCalledFunction)) {- return instruction.getAddress();++ if (calledFunction.getName().equals("operator.delete")) {+ return function;}}}- return null;+ return null;}- private Address getCallingAddress(Function function, String expectedCalledFunctionName)+ private Address getCallingAddress(Function function, Function expectedCalledFunction)throws CancelledException {- InstructionIterator instructions =- function.getProgram().getListing().getInstructions(function.getBody(), true);+ Map<Address, Function> map = getFunctionCallMap(function, true);//should this be false?- while (instructions.hasNext()) {+ for (Address address : map.keySet()) {monitor.checkCancelled();- Instruction instruction = instructions.next();- if (instruction.getFlowType().isCall()) {- Function calledFunction =- extendedFlatAPI.getReferencedFunction(instruction.getMinAddress(), false);+ Function calledFunction = map.get(address);+ if (calledFunction == null) {+ continue;+ }- if (calledFunction != null &&- calledFunction.getName().equals(expectedCalledFunctionName)) {- return instruction.getAddress();- }+ if (calledFunction.equals(expectedCalledFunction)) {+ return address;}}return null;+ }++ private Address getCallingAddress(Function function, String name) throws CancelledException {++ Map<Address, Function> map = getFunctionCallMap(function, false);+ for (Address address : map.keySet()) {+ monitor.checkCancelled();++ Function calledFunction = map.get(address);+ if (calledFunction == null) {+ continue;+ }++ if (calledFunction.getName().equals(name)) {+ return address;+ }+ }+ return null;}private void removeFromIndeterminateLists(List<RecoveredClass> recoveredClasses,diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.javaindex fc0c19dca6..12e35d1b99 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java@@ -23,6 +23,7 @@ import ghidra.program.model.address.Address;import ghidra.program.model.data.*;import ghidra.program.model.listing.Function;import ghidra.program.model.symbol.Namespace;+import ghidra.util.Msg;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;@@ -205,9 +206,12 @@ public class RecoveredClass {// error if try to add different address to same offsetAddress address = classOffsetToVftableMap.get(offset);if (!address.equals(vftableAddress)) {- throw new Exception(name + " trying to add different vftable address (old: " +- vftableAddress.toString() + " new: " + address.toString() + ") to same offset " +- offset);+// throw new Exception(name + " trying to add different vftable address (old: " ++// vftableAddress.toString() + " new: " + address.toString() + ") to same offset " ++// offset);+ Msg.debug(this, name + " trying to add different vftable address (old: " ++ vftableAddress.toString() + " new: " + address.toString() + ") to same offset");+}}diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.javaindex b70ac04371..fbdbde4774 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java@@ -465,9 +465,11 @@ public class RecoveredClassHelper {continue;}- if (calledFunction.isExternal()) {- continue;- }+ // TODO: might redo to have separate call maps that do/don't include external+ // keeping this here for reminder+// if (calledFunction.isExternal()) {+// continue;+// }// include the null functions in map so things using map can get accurate count// of number of CALL instructions even if the call reg type@@ -4470,6 +4472,7 @@ public class RecoveredClassHelper {if (vftablePointerDataType == null) {Msg.debug(this,"vftablePointerDataType is null for vftableAddress: " + vftableAddress);+ continue;}DataType vftableDataType = vftablePointerDataType.getDataType();diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/Vtable.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/Vtable.javaindex ffcc683fd2..cd0bec8889 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/Vtable.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/Vtable.java@@ -317,7 +317,7 @@ public class Vtable {// if it has a primary non-default symbol and it isn't "vftable" then it isn't a vftableSymbol primarySymbol = symbolTable.getPrimarySymbol(topAddress);if (primarySymbol != null && primarySymbol.getSource() != SourceType.DEFAULT &&- !primarySymbol.getName().contains("vftable")) {+ !primarySymbol.getName().toLowerCase().contains("vftable")) {return numFunctionPointers;}MemoryBlock currentBlock = program.getMemory().getBlock(topAddress);