Working on sequencer logic

Author: mirkosertic

src/main/java/de/mirkosertic/metair/ir/CFGDominatorTree.java

@@ -110,7 +110,7 @@ private Node intersectIDoms(Node v1, Node v2) {
     }
 
     /**
-     * Check wheter a node dominates another one.
+     * Check whether a node dominates another one.
      *
      * @return true, if <code>dominator</code> dominates <code>dominated</code> w.r.t to the entry node
      */

src/main/java/de/mirkosertic/metair/ir/DOTExporter.java

@@ -349,7 +349,7 @@ public static void writeTo(final CFGDominatorTree tree, final PrintStream ps) {
                    c3 [style = invis];
                    d8 [style = invis];
                    d9 [style = invis];
-                   
+                
                   }
                   c0 -> c1 [label="Control flow", style=solid, color=red]
                   c2 -> c3 [label="Control flow back edge", style=dashed, color=red]
@@ -369,8 +369,8 @@ public static void writeBytecodeCFGTo(final MethodAnalyzer analyzer, final Print
         if (optCode.isPresent()) {
             final CodeModel code = optCode.get();
 
-            final MethodAnalyzer.Frame[] frames = analyzer.getFrames();
-            final List<MethodAnalyzer.Frame> topologicalOrder = analyzer.getCodeModelTopologicalOrder();
+            final Frame[] frames = analyzer.getFrames();
+            final List<Frame> topologicalOrder = analyzer.getCodeModelTopologicalOrder();
 
             final List<CodeElement> elements = code.elementList();
             for (int i = 0; i < elements.size(); i++) {
@@ -393,9 +393,9 @@ public static void writeBytecodeCFGTo(final MethodAnalyzer analyzer, final Print
             }
 
             for (int elementIndex = 0; elementIndex < frames.length; elementIndex++) {
-                final MethodAnalyzer.Frame frame = frames[elementIndex];
+                final Frame frame = frames[elementIndex];
                 if (frame != null) {
-                    for (final MethodAnalyzer.CFGEdge edge : frame.predecessors) {
+                    for (final FrameCFGEdge edge : frame.predecessors) {
                         ps.print(" node");
                         ps.print(edge.fromIndex());
                         ps.print(" -> node");
@@ -406,6 +406,13 @@ public static void writeBytecodeCFGTo(final MethodAnalyzer analyzer, final Print
                         }
                         ps.println("];");
                     }
+                    if (frame.immediateDominator != null) {
+                        ps.print(" node");
+                        ps.print(elementIndex);
+                        ps.print(" -> node");
+                        ps.print(topologicalOrder.indexOf(frame.immediateDominator));
+                        ps.println("[color=fuchsia];");
+                    }
                 }
             }
         }

src/main/java/de/mirkosertic/metair/ir/Frame.java

@@ -0,0 +1,31 @@
+package de.mirkosertic.metair.ir;
+
+import java.lang.classfile.CodeElement;
+import java.lang.classfile.attribute.StackMapFrameInfo;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Frame {
+
+    protected final CodeElement codeElement;
+    protected final List<FrameCFGEdge> predecessors;
+    protected Frame immediateDominator;
+    protected final int elementIndex;
+    protected int indexInTopologicalOrder;
+    protected Node entryPoint;
+    protected Status in;
+    protected Status out;
+    protected List<StackMapFrameInfo> verificationInfos;
+
+    public Frame(final int elementIndex, final CodeElement codeElement) {
+        this.predecessors = new ArrayList<>();
+        this.elementIndex = elementIndex;
+        this.indexInTopologicalOrder = -1;
+        this.codeElement = codeElement;
+    }
+
+    public Status copyIncomingToOutgoing() {
+        out = in.copy();
+        return out;
+    }
+}

src/main/java/de/mirkosertic/metair/ir/FrameCFGEdge.java

@@ -0,0 +1,4 @@
+package de.mirkosertic.metair.ir;
+
+public record FrameCFGEdge(int fromIndex, FrameNamedProjection projection, FlowType flowType) {
+}

src/main/java/de/mirkosertic/metair/ir/FrameNamedProjection.java

@@ -0,0 +1,5 @@
+package de.mirkosertic.metair.ir;
+
+public record FrameNamedProjection(String name) {
+    public static final FrameNamedProjection DEFAULT = new FrameNamedProjection("default");
+}

src/main/java/de/mirkosertic/metair/ir/Goto.java

@@ -9,4 +9,15 @@ public class Goto extends Node {
     public String debugDescription() {
         return getClass().getSimpleName();
     }
+
+    public Node getJumpTarget() {
+        for (final Node user : usedBy) {
+            for (final UseEdge edge : user.uses) {
+                if (edge.node() == this && edge.use() instanceof ControlFlowUse) {
+                    return user;
+                }
+            }
+        }
+        throw new IllegalStateException("Cannot find the jump target");
+    }
 }

src/main/java/de/mirkosertic/metair/ir/LoopHeaderNode.java

@@ -1,6 +1,6 @@
 package de.mirkosertic.metair.ir;
 
-public class LoopHeaderNode extends MultiInputNode {
+public class LoopHeaderNode extends Node {
 
     public final String label;
 

src/main/java/de/mirkosertic/metair/ir/MergeNode.java

@@ -1,6 +1,6 @@
 package de.mirkosertic.metair.ir;
 
-public class MergeNode extends MultiInputNode {
+public class MergeNode extends Node {
 
     public final String label;