mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Revert GP-290 due PDB anonymous function def rename due to bad

Browse Source 
interaction with re-use
This commit is contained in:
ghidra1
2021-02-10 18:07:27 -05:00
parent 4271493467
commit e293ab24ca
2 changed files with 0 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/FunctionSymbolApplier.java
View File

@@ -19,7 +19,6 @@ import java.util.*;
import ghidra.app.cmd.disassemble.DisassembleCommand;
import ghidra.app.cmd.function.*;
import ghidra.app.util.SymbolPath;
import ghidra.app.util.bin.format.pdb2.pdbreader.PdbException;
import ghidra.app.util.bin.format.pdb2.pdbreader.RecordNumber;
import ghidra.app.util.bin.format.pdb2.pdbreader.symbol.*;
@@ -301,9 +300,6 @@ public class FunctionSymbolApplier extends MsSymbolApplier {
}
}
applicator.addFunctionUse(procedureSymbol, new SymbolPath(function.getSymbol()));
DataType dataType = applier.getDataType();
// Since we know the applier is an AbstractionFunctionTypeApplier, then dataType is either
// FunctionDefinition or no type (typedef).
@@ -317,7 +313,6 @@ public class FunctionSymbolApplier extends MsSymbolApplier {
" due to " + sigCmd.getStatusMsg() + "; dataType: " + def.getName());
return false;
}
// TODO: Move datatype to correct category
}
return true;
}

79
Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbApplicator.java
View File

@@ -37,7 +37,6 @@ import ghidra.program.model.data.*;
import ghidra.program.model.lang.Register;
import ghidra.program.model.listing.*;
import ghidra.program.model.symbol.*;
import ghidra.util.InvalidNameException;
import ghidra.util.Msg;
import ghidra.util.exception.*;
import ghidra.util.task.CancelOnlyWrappingTaskMonitor;
@@ -65,7 +64,6 @@ import ghidra.util.task.TaskMonitor;
public class PdbApplicator {
private static final String THUNK_NAME_PREFIX = "[thunk]:";
private static final SymbolPath DUMMY_SYMBOL_PATH = new SymbolPath("/");
//==============================================================================================
/**
@@ -145,13 +143,6 @@ public class PdbApplicator {
*/
private Map<SymbolPath, Boolean> isClassByNamespace;
/**
* Map for tracking use of procedure type records by function symbols.
* If a type record is used more than once it will get mapped to the
* {@link #DUMMY_SYMBOL_PATH} to indicate non-unique use.
*/
private Map<RecordNumber, SymbolPath> procedureSymbolNameMap;
//==============================================================================================
private SymbolApplierFactory symbolApplierParser;
@@ -208,7 +199,6 @@ public class PdbApplicator {
case NONE:
processTypes();
processSymbols();
renameAnonymousFunctions();
break;
default:
throw new PdbException("Invalid Restriction");
@@ -326,7 +316,6 @@ public class PdbApplicator {
complexApplierMapper = new ComplexTypeApplierMapper(this);
applierDependencyGraph = new JungDirectedGraph<>();
isClassByNamespace = new TreeMap<>();
procedureSymbolNameMap = new HashMap<>();
if (program != null) {
// Currently, this must happen after symbolGroups are created.
PdbVbtManager pdbVbtManager = new PdbVbtManager(this);
@@ -1246,74 +1235,6 @@ public class PdbApplicator {
}
}
void addFunctionUse(AbstractProcedureMsSymbol procedureSymbol, SymbolPath symbolPath) {
RecordNumber rn = procedureSymbol.getTypeRecordNumber();
SymbolPath n = procedureSymbolNameMap.get(rn);
if (n == null) {
procedureSymbolNameMap.put(rn, symbolPath);
}
else if (!symbolPath.equals(n)) {
procedureSymbolNameMap.put(rn, DUMMY_SYMBOL_PATH);
}
}
private void renameAnonymousFunctions() throws CancelledException {
monitor.setMessage("Renaming function definitions...");
monitor.setProgress(0);
monitor.setMaximum(procedureSymbolNameMap.size());
int cnt = 0;
int renamedCnt = 0;
for (RecordNumber rn : procedureSymbolNameMap.keySet()) {
monitor.checkCanceled();
monitor.setProgress(++cnt);
SymbolPath symbolPath = procedureSymbolNameMap.get(rn);
if (symbolPath != DUMMY_SYMBOL_PATH) {
// unique name exists for function definition (single use)
MsTypeApplier typeApplier = getTypeApplier(rn);
DataType dt = typeApplier.getDataType();
CategoryPath category = categoryUtils.getCategory(symbolPath.getParent());
Category newCategory = dataTypeManager.createCategory(category);
String newName = symbolPath.getName();
try {
if (newCategory.getDataType(newName) == null) {
// fast approach should generally work
dt.setName(newName);
dt.setCategoryPath(category);
}
else {
// use slow approach if conflict exists
DataType newDt = dt.copy(dataTypeManager);
newDt.setName(symbolPath.getName());
newDt.setCategoryPath(category);
newDt = resolve(newDt);
dataTypeManager.replaceDataType(dt, newDt, false);
typeApplier.resolvedDataType = newDt;
}
++renamedCnt;
}
catch (InvalidNameException | DuplicateNameException
| DataTypeDependencyException e) {
// unexpected - skip
Msg.error(this, "PDB Function definition rename failed: " + dt.getName() +
" -> " + symbolPath);
}
}
}
if (renamedCnt != 0) {
Msg.debug(this, "PDB Renamed " + renamedCnt + " of " + cnt + " function definitions");
Category anonymousCategory =
dataTypeManager.getCategory(getAnonymousFunctionsCategory());
if (anonymousCategory != null) {
Msg.debug(this, "PDB Remaining anonymous function definition count: " +
anonymousCategory.getDataTypes().length);
}
}
}
//==============================================================================================
//==============================================================================================
//==============================================================================================