Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-25 13:42:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GT-3216_RenamingThisCall' into Ghidra_9.1

Browse Source
This commit is contained in:
Ryan Kurtz 2019-10-16 07:52:39 -04:00
commit 405a32001f
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/RetypeVariableAction.java
View File

@ -303,7 +303,8 @@ public class RetypeVariableAction extends AbstractDecompilerAction {
return true;
}
VariableStorage storage = param.getStorage();
if (!storage.equals(parameters[i].getVariableStorage())) {
// Don't compare using the equals method so that DynamicVariableStorage can match
if (0 != storage.compareTo(parameters[i].getVariableStorage())) {
return true;
}
}

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

@ -359,12 +359,13 @@ public class HighFunctionDBUtil {
}
/**
* Get database parameter which corresponds to HighParam committing all parameters to
* database if necessary
* @param param
* @return matching parameter or null if not found
* @throws DuplicateNameException
* @throws InvalidInputException
* Get database parameter which corresponds to HighParam, where we anticipate that
* the parameter will be modified to match the HighParam. The entire prototype is
* committed to the database if necessary. An exception is thrown if a modifiable parameter
* can't be found/created.
* @param param is the HighParam describing the desired function parameter
* @return the matching parameter that can be modified
* @throws InvalidInputException if the desired parameter cannot be modified
*/
private static Parameter getDatabaseParameter(HighParam param) throws InvalidInputException {
@ -373,6 +374,12 @@ public class HighFunctionDBUtil {
int slot = param.getSlot();
Parameter[] parameters = function.getParameters();
if (slot < parameters.length) {
if (parameters[slot].isAutoParameter()) {
throw new InvalidInputException(
"Cannot modify auto-parameter: " + parameters[slot].getName());
}
}
if (slot >= parameters.length ||
!parameters[slot].getVariableStorage().equals(param.getStorage())) {
try {