Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-10-23 05:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-1-dragonmacher-decompiler-task-fix' into patch (Closes #6459)
This commit is contained in:
Ryan Kurtz 2024-04-24 09:08:47 -04:00
commit 8449054f13
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/PCodeCfgGraphTask.java
View File

@ -40,7 +40,7 @@ import ghidra.util.task.TaskMonitor;
* Task to create a PCode control flow graph based on decompiler output
*/
public class PCodeCfgGraphTask extends Task {
enum PcodeGraphSubType {
public enum PcodeGraphSubType {
CONTROL_FLOW_GRAPH("AST Control Flow"), DATA_FLOW_GRAPH("AST Data Flow");
private String name;
@ -95,8 +95,7 @@ public class PCodeCfgGraphTask extends Task {
createControlFlowGraph(graph, monitor);
}
GraphDisplay display =
graphService.getDefaultGraphDisplay(!newGraph, monitor);
GraphDisplay display = graphService.getDefaultGraphDisplay(!newGraph, monitor);
PCodeCfgDisplayListener displayListener =
new PCodeCfgDisplayListener(tool, display, hfunction, pcodeGraphType);
@ -270,10 +269,9 @@ public class PCodeCfgGraphTask extends Task {
protected void createControlFlowGraph(AttributedGraph graph, TaskMonitor monitor)
throws CancelledException {
Iterator<PcodeBlockBasic> pblockIter = hfunction.getBasicBlocks().iterator();
while (pblockIter.hasNext()) {
for (PcodeBlockBasic element : hfunction.getBasicBlocks()) {
monitor.checkCancelled();
graphPcodeBlock(graph, pblockIter.next(), monitor);
graphPcodeBlock(graph, element, monitor);
}
}