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

Merge remote-tracking branch 'origin/GP-6701_dev747368_PR-9120_evandowning_fix-cycle'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-13 19:20:38 -04:00
parent aa493d745c 48186231e3
commit b82a2b4fc2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFMacroEnumCreator.java
+8 -3
View File
@@ -69,15 +69,20 @@ public class DWARFMacroEnumCreator {
monitor.increment();
monitor.setMessage("DWARF: Processing Macros for " + cu.getName());
Map<String, ExpressionValue> macrosToValues = new HashMap<>();
Set<Long> visitedHeaders = new HashSet<>();
createEnums(cu.getMacros(), macrosToValues, catPath, includeCommandLineDefines,
monitor);
monitor, visitedHeaders);
}
}
private void createEnums(DWARFMacroHeader macroHeader,
Map<String, ExpressionValue> macrosToValues, CategoryPath catPath,
boolean includeCommandLineDefines, TaskMonitor monitor)
boolean includeCommandLineDefines, TaskMonitor monitor,
Set<Long> visitedHeaders)
throws IOException, CancelledException {
if (!visitedHeaders.add(macroHeader.getEntriesStartOffset())) {
return;
}
DataTypeManager dtManager = dprog.getGhidraProgram().getDataTypeManager();
DWARFImportSummary importSummary = dprog.getImportSummary();
for (DWARFMacroInfoEntry macroEntry : macroHeader.getEntries()) {
@@ -119,7 +124,7 @@ public class DWARFMacroEnumCreator {
break;
case DWARFMacroImport importMacro:
createEnums(importMacro.getImportedMacroHeader(), macrosToValues,
catPath, includeCommandLineDefines, monitor);
catPath, includeCommandLineDefines, monitor, visitedHeaders);
break;
default:
break;