mild overhaul of Interpreter; now capable of performing MergeSort

[fleet.git] / src / edu / berkeley / fleet / interpreter / DebugDock.java

diff --git a/src/edu/berkeley/fleet/interpreter/DebugDock.java b/src/edu/berkeley/fleet/interpreter/DebugDock.java
index 59ba037..36ffa66 100644 (file)
--- a/src/edu/berkeley/fleet/interpreter/DebugDock.java
+++ b/src/edu/berkeley/fleet/interpreter/DebugDock.java
@@ -16,14 +16,13 @@ public class DebugDock {
     public Dock getDock()                       { return dock; }
     public int getOLC()                         { return dock.olc; }
     public int getILC()                         { return dock.ilc; }
-    public Instruction getExecuting()           { return dock.executing; }
+    public Instruction getExecuting()           { return dock.instructions.peek(); }
     public Queue<Instruction> getInstructions() { return dock.instructions; }
-    public Queue<Instruction> getEpilogue()     { return dock.epilogue; }
     public boolean getDataReadyForShip()        { return dock.dataReadyForShip; }
     public boolean getReadyForDataFromShip()    { return dock.readyForDataFromShip;}
     public long getDataFromShip()               { return dock.dataFromShip; }
-    public boolean getTorpedoWaiting()          { return dock.torpedoWaiting; }
-    public boolean isHatchOpen()                { return dock.hatchIsOpen; }
+    public boolean getTorpedoWaiting()          { throw new RuntimeException("obsolete"); }
+    public boolean isHatchOpen()                { return !dock.requeueStageInCirculatingState; }
     public boolean getFlagA()                   { return dock.flag_a; }
     public boolean getFlagB()                   { return dock.flag_b; }
     public boolean getFlagC()                   { return dock.flag_c; }
@@ -35,9 +34,10 @@ public class DebugDock {
                 values.add(p.getValue());
         return values;
     }
+    public Queue<Instruction> getEpilogue() {
+        throw new RuntimeException("this method has been removed");
+    }
     public Queue<Instruction> getInstructionsInFabric() {
-        Queue<Instruction> instr = new LinkedList<Instruction>();
-        for (Instruction inst : dock.epilogue) instr.add(inst);
-        return instr;
+        throw new RuntimeException("this method has been removed");
     }
 }