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/patch'

Browse source 
Conflicts:
	Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java
This commit is contained in:
Ryan Kurtz 2022-03-19 01:28:52 -04:00
commit 042030b8fd
13 changed files with 167 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/service/FidServiceLibraryIngest.java
View file

@ -54,12 +54,10 @@ class FidServiceLibraryIngest {
private LibraryRecord library = null; // Database record of the library we are creating
private CompilerSpec compilerSpec = null;
private Map<FunctionRecord, Set<ChildSymbol>> unresolvedSymbols =
new HashMap<>();
private Map<FunctionRecord, Set<ChildSymbol>> unresolvedSymbols = new HashMap<>();
private TreeSet<Long> globalUniqueFunction = new TreeSet<>();
private FidPopulateResult result = null;
private TreeMap<String, FidPopulateResult.Count> childHistogram =
new TreeMap<>(); // Counts of child references to function symbols
private TreeMap<String, FidPopulateResult.Count> childHistogram = new TreeMap<>(); // Counts of child references to function symbols
private static class FunctionRow {
public FunctionRecord functionRecord;
@ -604,7 +602,8 @@ class FidServiceLibraryIngest {
return false;
}
if (compilerSpec != null) {
if (!compilerSpec.equals(program.getCompilerSpec())) {
if (!compilerSpec.getCompilerSpecID()
.equals(program.getCompilerSpec().getCompilerSpecID())) {
throw new IllegalArgumentException(
"Program " + program.getName() + " has different compiler spec (" +
program.getCompilerSpec().getCompilerSpecID() +