mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2683_FunctionPurgeConventionFix'

Browse Source 
(Closes #4294)
This commit is contained in:
Ryan Kurtz
2022-10-12 01:06:47 -04:00
parent e87fba638c 3e59f1b610
commit 5b30bb95c0
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java
View File

@@ -1709,38 +1709,36 @@ public class SymbolicPropogator {
private int getFunctionPurge(Program prog, Function function) {
if (function == null) {
return getDefaultStackDepthChange(prog, Function.UNKNOWN_STACK_DEPTH_CHANGE);
}
int depth = function.getStackPurgeSize();
if (function.isStackPurgeSizeValid()) {
return getDefaultStackDepthChange(prog, depth);
return getDefaultStackDepthChange(prog, null, Function.UNKNOWN_STACK_DEPTH_CHANGE);
}
PrototypeModel conv = function.getCallingConvention();
if (conv == null) {
conv = prog.getCompilerSpec().getDefaultCallingConvention();
if (function.isStackPurgeSizeValid()) {
int depth = function.getStackPurgeSize();
return getDefaultStackDepthChange(prog, conv, depth);
}
if (conv != null) {
int callStackMod = conv.getExtrapop();
int callStackShift = conv.getStackshift();
if (callStackMod != PrototypeModel.UNKNOWN_EXTRAPOP) {
return callStackShift;
}
}
return Function.UNKNOWN_STACK_DEPTH_CHANGE;
return getDefaultStackDepthChange(prog, conv, Function.UNKNOWN_STACK_DEPTH_CHANGE);
}
/**
* Get the default/assumed stack depth change for this language
*
* @param model calling convention to use
* @param depth stack depth to return if the default is unknown for the language
* @return
* @return default assumed stack depth
*/
private int getDefaultStackDepthChange(Program prog, int depth) {
PrototypeModel defaultModel = prog.getCompilerSpec().getDefaultCallingConvention();
int callStackMod = defaultModel.getExtrapop();
int callStackShift = defaultModel.getStackshift();
private int getDefaultStackDepthChange(Program prog, PrototypeModel model, int depth) {
if (model == null) {
model = prog.getCompilerSpec().getDefaultCallingConvention();
}
if (model == null) {
return Function.UNKNOWN_STACK_DEPTH_CHANGE;
}
int callStackMod = model.getExtrapop();
int callStackShift = model.getStackshift();
if (callStackMod != PrototypeModel.UNKNOWN_EXTRAPOP) {
return callStackShift;
}

5
Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java
View File

@@ -365,10 +365,7 @@ public class VarnodeContext implements ProcessorContext {
if (stackReg == null) {
return null;
}
Register stackBaseReg = stackReg.getParentRegister();
if (stackBaseReg != null && stackBaseReg.getChildRegisters().size() == 1) {
stackReg = stackBaseReg;
}
return stackReg;
}