Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 11:55:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1839_CompilerSpecCompare' into

Browse Source 
patch (Closes #4042)
This commit is contained in:
Ryan Kurtz
2022-03-19 00:57:00 -04:00
parent d5741b0ecf 8a8fdbedc9
commit 4162b9e812
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/service/FidServiceLibraryIngest.java
+4 -5
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() +