yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

no need to hold equate symbols in a separate list

Browse source
This commit is contained in:
caheckman 2020-11-04 11:54:57 -05:00
parent 3e5da19f28
commit 78717038cf
1 changed files with 1 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/LocalSymbolMap.java
View file

@ -499,7 +499,6 @@ public class LocalSymbolMap {
* @param dbFunction is the function to pull equates for * @param dbFunction is the function to pull equates for
*/ */
private void grabEquates(Function dbFunction) { private void grabEquates(Function dbFunction) {
ArrayList<HighSymbol> equateSymbolList = null;
// Find named constants via Equates // Find named constants via Equates
Program program = dbFunction.getProgram(); Program program = dbFunction.getProgram();
EquateTable equateTable = program.getEquateTable(); EquateTable equateTable = program.getEquateTable();
@ -519,9 +518,6 @@ public class LocalSymbolMap {
Arrays.sort(hash); // Sort in preparation for deduping Arrays.sort(hash); // Sort in preparation for deduping
String displayName = eq.getDisplayName(); String displayName = eq.getDisplayName();
long eqValue = eq.getValue(); long eqValue = eq.getValue();
if (equateSymbolList == null) {
equateSymbolList = new ArrayList<HighSymbol>();
}
EquateSymbol eqSymbol; EquateSymbol eqSymbol;
for (int i = 0; i < hash.length; ++i) { for (int i = 0; i < hash.length; ++i) {
@ -529,30 +525,10 @@ public class LocalSymbolMap {
continue; // Found a duplicate, skip it continue; // Found a duplicate, skip it
} }
eqSymbol = newEquateSymbol(0, displayName, eqValue, hash[i], defAddr); eqSymbol = newEquateSymbol(0, displayName, eqValue, hash[i], defAddr);
equateSymbolList.add(eqSymbol); symbolMap.put(eqSymbol.getId(), eqSymbol);
} }
} }
} }
// TODO: Find typed constants via DataTypeReferences
// -- for each datatype reference within the scope of the function
// MappedVarKey key = new MappedVarKey(AddressSpace.HASH_SPACE.getAddress(hash),defAddr);
// DynamicSymbol sym = constantSymbolMap.get(key);
// String name = sym != null ? sym.getName() : null;
// sym = new DynamicSymbol(name, dt, dt.getLength(), hash, defAddr, func, 0); // format??
// if (name != null) {
// sym.setTypeLock(true);
// }
// sym.setTypeLock(true);
// sym.setReadOnly(true);
//
// Add constant dynamic symbols to map
if (equateSymbolList != null) {
for (HighSymbol sym : equateSymbolList) {
symbolMap.put(sym.getId(), sym);
}
}
} }
private void grabMerges(ArrayList<String> mergeNames) { private void grabMerges(ArrayList<String> mergeNames) {