Magic-Mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-26 07:56:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1624_ghidra1_FuncDefOrdinalAdjustment' into patch

Browse Source
This commit is contained in:
ghidra1 2021-12-22 15:31:23 -05:00
commit 49ab23c011
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,11 +97,13 @@ public class FunctionDefinitionDataType extends GenericDataType implements Funct
Parameter[] parameters = function.getParameters();
ArrayList<ParameterDefinition> paramList = new ArrayList<ParameterDefinition>();
int ordinalAdjustment = 0;
for (Parameter parameter : parameters) {
if (formalSignature && parameter.isAutoParameter()) {
--ordinalAdjustment;
continue;
}
paramList.add(getParameterDefinition(parameter, formalSignature));
paramList.add(getParameterDefinition(parameter, formalSignature, ordinalAdjustment));
}
params = paramList.toArray(new ParameterDefinition[paramList.size()]);
@ -117,10 +119,11 @@ public class FunctionDefinitionDataType extends GenericDataType implements Funct
}
}
private ParameterDefinition getParameterDefinition(Parameter param, boolean useFormalType) {
private ParameterDefinition getParameterDefinition(Parameter param, boolean useFormalType,
int ordinalAdjustment) {
return new ParameterDefinitionImpl(param.getName(),
useFormalType ? param.getFormalDataType() : param.getDataType(), param.getComment(),
param.getOrdinal());
param.getOrdinal() + ordinalAdjustment);
}
private void init(FunctionSignature sig) {