development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-03 00:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2023-05-22 12:19:44 -04:00
parent ce8fadf7a8 69549f576f
commit 3b9dbae6ad
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/SpecifyCPrototypeAction.java
View file

@ -30,6 +30,7 @@ import ghidra.program.model.pcode.*;
import ghidra.program.model.symbol.SourceType;
import ghidra.util.HelpLocation;
import ghidra.util.UndefinedFunction;
import ghidra.util.exception.InvalidInputException;
public class SpecifyCPrototypeAction extends AbstractDecompilerAction {
@ -117,6 +118,13 @@ public class SpecifyCPrototypeAction extends AbstractDecompilerAction {
func.getName(), func.getProgram().getDataTypeManager());
FunctionPrototype functionPrototype = hf.getFunctionPrototype();
try {
fsig.setCallingConvention(functionPrototype.getModelName());
}
catch (InvalidInputException e) {
// ignore
}
int np = hf.getLocalSymbolMap().getNumParams();
fsig.setReturnType(functionPrototype.getReturnType());
@ -172,7 +180,6 @@ public class SpecifyCPrototypeAction extends AbstractDecompilerAction {
if (function.getEntryPoint().equals(hf.getFunction().getEntryPoint())) {
if (function.getSignatureSource() == SourceType.DEFAULT) {
model.setUseCustomizeStorage(false);
model.setCallingConventionName(functionPrototype.getModelName());
model.setFunctionData(buildSignature(hf));
verifyDynamicEditorModel(hf, model);
}