yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GT-3577_AliasBlock'

Browse source
This commit is contained in:
ghidra1 2020-03-26 15:00:32 -04:00
commit 63a0b5e61e
11 changed files with 130 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
View file

@ -202,7 +202,7 @@ public class HighFunctionDBUtil {
* @param highFunction is the decompiler's model of the function
* @param source is the desired SourceType for the commit
*/
public static void commitLocalsToDatabase(HighFunction highFunction, SourceType source) {
public static void commitLocalNamesToDatabase(HighFunction highFunction, SourceType source) {
Function function = highFunction.getFunction();
@ -216,19 +216,7 @@ public class HighFunctionDBUtil {
}
String name = sym.getName();
try {
Variable var =
clearConflictingLocalVariables(function, sym.getStorage(), sym.getPCAddress());
if (var == null) {
var = createLocalVariable(function, sym.getDataType(), sym.getStorage(),
sym.getPCAddress(), source);
if (name != null) {
var.setName(name, source);
}
}
else {
var.setDataType(sym.getDataType(), sym.getStorage(), false, source);
var.setName(name, source);
}
HighFunctionDBUtil.updateDBVariable(sym, null, null, source);
}
catch (UsrException e) {
Msg.error(HighFunctionDBUtil.class, "Local variable commit failed for " +