github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-10 06:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5248_dev747368_fix_ccname_issues' into Ghidra_11.3

Browse Source
This commit is contained in:
ghidra1
2025-01-10 08:15:22 -05:00
parent 8771b870d0 05506d5210
commit 2c4882c16a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/FunctionDefinitionDataType.java
View File

@@ -189,7 +189,8 @@ public class FunctionDefinitionDataType extends GenericDataType implements Funct
if (GenericCallingConvention
.getGenericCallingConvention(conventionName) == GenericCallingConvention.unknown &&
(dataMgr == null || !dataMgr.getKnownCallingConventionNames().contains(name))) {
(dataMgr == null ||
!dataMgr.getKnownCallingConventionNames().contains(conventionName))) {
throw new InvalidInputException("Unknown calling convention name: " + conventionName);
}

3
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
View File

@@ -703,7 +703,8 @@ public class HighFunctionDBUtil {
throws InvalidInputException {
ParameterDefinition[] params = sig.getArguments();
FunctionDefinitionDataType fsig = new FunctionDefinitionDataType("tmpname"); // Empty datatype, will get renamed later
FunctionDefinitionDataType fsig =
new FunctionDefinitionDataType("tmpname", function.getProgram().getDataTypeManager()); // Empty datatype, will get renamed later
fsig.setCallingConvention(sig.getCallingConventionName());
fsig.setArguments(params);
fsig.setReturnType(sig.getReturnType());