lift sloppy getPathByAddr() implementation into FleetTwoFleet
[fleet.git] / src / edu / berkeley / fleet / interpreter / Interpreter.java
index 16f36b8..556650a 100644 (file)
@@ -3,265 +3,147 @@ import java.io.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.lang.reflect.*;
-import edu.berkeley.fleet.*;
-import edu.berkeley.fleet.doc.*;
+import edu.berkeley.sbp.util.ANSI;
 import edu.berkeley.fleet.api.*;
-import edu.berkeley.fleet.ies44.*;
-import edu.berkeley.fleet.interpreter.ships.*;
-
-public class Interpreter extends Fleet {
+import edu.berkeley.fleet.two.*;
+import edu.berkeley.fleet.assembler.*;
+import edu.berkeley.fleet.util.*;
+
+public class Interpreter extends FleetTwoFleet implements Parser.FleetWithDynamicShips {
+
+    private BlockingQueue<BitVector> debugStream = new LinkedBlockingQueue<BitVector>();
+    private InterpreterShip debugShip = null;
+    private HashMap<String,InterpreterShip> ships = new HashMap<String,InterpreterShip>();
+    public Iterator<Ship> iterator() { return (Iterator<Ship>)(Object)ships.values().iterator(); }
+    public Ship getShip(String type, int ordinal) {
+        for(Ship s : this)
+            if (s.getType().equals(type))
+                if (ordinal-- < 0)
+                    return s;
+        return null;
+    }
 
-    /** some "halt ship" can turn this on to stop the interpreter */
-    public boolean       halt         = false;
-    public ArrayList<InterpreterShip> shiplist   = new ArrayList<InterpreterShip>();
-    public HashMap<String,InterpreterShip> ships = new HashMap<String,InterpreterShip>();
-    private BlockingQueue<Long> debugStream = new LinkedBlockingQueue<Long>();
-    public int[] mem = new int[0];
+    void dispatch(Instruction i) {
+        Log.dispatch(i);
+        ((InterpreterDock)i.dock).addInstruction(i);
+    }
 
+    public Ship createShip(String shipType, String shipname) {
+        try {
+            Class c = Class.forName("edu.berkeley.fleet.interpreter."+shipType);
+            Constructor con = c.getConstructor(new Class[] { Interpreter.class, String.class, ShipDescription.class });
+            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream("ships/"+shipType+".ship")));
+            ShipDescription sd = new ShipDescription(shipType, br);
+            InterpreterShip ret = (InterpreterShip)con.newInstance(new Object[] { this, shipname, sd });
+            ships.put(shipname, ret);
+            if (shipType.equals("Debug") && debugShip == null)
+                debugShip = ret;
+            return ret;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
-    public void debug(long data) {
+    void debug(long d) {
+        throw new RuntimeException();
+    }
+    void debug(BitVector data) {
         try {
-            if (debugStream != null) {
-                debugStream.put(data);
-            } else {
-                Log.println(Log.invert("   DEBUG: got a datum: " +  data+Log.clreol()));
-            }
+            if (debugStream != null) debugStream.put(data);
+            else Log.println(ANSI.invert("   DEBUG: got a datum: " +  data+ANSI.clreol()));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
-    public static class DynamicInterpreter extends Interpreter implements Fleet.WithDynamicShips {
+    // Instruction Encoding /////////////////////////////////////////////////////////////////////////
+
+    public long getDestAddr(Path path) {
+        long ret = ((InterpreterDestination)path.getDestination()).addr;
+        BitVector bv = path.getSignal();
+        if (bv.length() > 1) throw new RuntimeException();
+        if (bv.length() > 0 && bv.get(0)) ret |= 1;
+        return ret;
     }
 
+
+    // ShipDescription //////////////////////////////////////////////////////////////////////////////
+
     public void expand(ShipDescription sd) {
         try {
-            String filename = (sd.name.charAt(0)+"").toUpperCase() + sd.name.substring(1).toLowerCase();
-            File outf = new File("build/java/edu/berkeley/fleet/interpreter/ships/"+filename+".java");
+            String filename = sd.getName();
+            //String filename = (sd.getName().charAt(0)+"").toUpperCase() + sd.getName().substring(1).toLowerCase();
+            File outf = new File("build/java/edu/berkeley/fleet/interpreter/"+filename+".java");
             new File(outf.getParent()).mkdirs();
             System.err.println("writing to " + outf);
             FileOutputStream out = new FileOutputStream(outf);
             PrintWriter pw = new PrintWriter(out);
 
-            pw.println("package edu.berkeley.fleet.interpreter.ships;");
-            pw.println("import edu.berkeley.fleet.interpreter.*;");
+            pw.println("package edu.berkeley.fleet.interpreter;");
+            pw.println("import edu.berkeley.sbp.util.ANSI;");
             pw.println("import edu.berkeley.fleet.api.*;");
+            pw.println("import edu.berkeley.fleet.two.*;");
             pw.println("import edu.berkeley.fleet.*;");
             pw.println("import java.util.*;");
             pw.println("import java.io.*;");
             pw.println("");
             pw.println("public class "+filename+" extends InterpreterShip {");
             pw.println("");
-            for(ShipDescription.BenkoBox b : sd.benkoBoxes) {
-                if (b.ports.length != 1)
-                    throw new RuntimeException("multiple ports not supported");
-                String name = b.ports[0];
-                pw.print("    ");
-                if (!b.tokenOnly &&  b.inbox) pw.print("DataInbox");
-                if ( b.tokenOnly &&  b.inbox) pw.print("TokenInbox");
-                if (!b.tokenOnly && !b.inbox) pw.print("DataOutbox");
-                if ( b.tokenOnly && !b.inbox) pw.print("TokenOutbox");
-                pw.print(" box_");
+            for(DockDescription b : sd) {
+                String name = b.getName();
+                pw.print("    InterpreterDock box_");
                 pw.print(name);
-                pw.print(" = new ");
-                if (!b.tokenOnly &&  b.inbox) pw.print("DataInbox");
-                if ( b.tokenOnly &&  b.inbox) pw.print("TokenInbox");
-                if (!b.tokenOnly && !b.inbox) pw.print("DataOutbox");
-                if ( b.tokenOnly && !b.inbox) pw.print("TokenOutbox");
-                pw.println("(this, \""+name+"\");");
+                pw.print(" = new InterpreterDock(this, shipDescription.getDockDescription(\""+name+"\"));");
             }
             pw.println("");
-            pw.println("    public "+filename+"(Interpreter fleet, String name) { super(fleet, name); }");
+            pw.println("    public "+filename+"(Interpreter fleet, String name, ShipDescription sd) {");
+            pw.println("       super(fleet, sd);");
+            for(DockDescription b : sd)
+                pw.println("       addDock(\""+b.getName()+"\", box_"+b.getName()+");");
+            pw.println("    }");
             pw.println("");
-            //pw.println("    public void service() {");
-            pw.println(sd.sections.get("fleeterpreter"));
-            //pw.println("}");
+            pw.println(sd.getSection("fleeterpreter"));
             pw.println("}");
             pw.flush();
             pw.close();
         } catch (Exception e) { throw new RuntimeException(e); }
     }
 
-    public FleetProcess run(final byte[] instructions) {
-        try {
-            final FleetProcess fp = new FleetProcess() {
-                    public void invokeInstruction(Instruction i) { throw new RuntimeException("not supported"); }
-                    public long readWord() {
-                        try {
-                            return debugStream.take();
-                        } catch (Exception e) {
-                            throw new RuntimeException(e);
-                        } }
-                    protected void _terminate() {
-                        shiplist   = new ArrayList<InterpreterShip>();
-                        ships = new HashMap<String,InterpreterShip>();
-                        debugStream = new LinkedBlockingQueue<Long>();
-                        mem = new int[0];
-                    }
-                };
-            new Thread() {
-                public void run() {
-                    try {
-                        go(fp, instructions);
-                    } catch (Exception e) {
-                        if (fp.isTerminated()) return;
-                        throw new RuntimeException(e);
-                    }
-                }
-            }.start();
-            return fp;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void go(FleetProcess fp, byte[] instructions) {
-        try {
-            // find the first icache
-            InterpreterShip iscratch = null;
-            for(Ship ship : this)
-                if (ship.getClass().getSimpleName().equals("Iscratch")) {
-                    iscratch = (InterpreterShip)ship;
-                    break;
-                }
-            if (iscratch==null)
-                iscratch = (InterpreterShip)Class.forName("edu.berkeley.fleet.interpreter.ships.Iscratch")
-                    .getConstructor(new Class[] { Interpreter.class, String.class })
-                    .newInstance(new Object[] { this, "iscratch" });
-            iscratch
-                .getClass()
-                .getMethod("boot", new Class[] { byte[].class })
-                .invoke(iscratch, new Object[] { instructions });
-
-            while(!halt && !fp.isTerminated())
-                for(InterpreterShip ship : ships.values())
-                    for(int j=0; j<10; j++)
-                        ship._service();
-
-            // run the ships a bit longer for good measure
-            for(int i=0; i<100; i++)
-                for(InterpreterShip ship : ships.values())
-                    for(int j=0; j<10; j++)
-                        ship._service();
-
-            // check the state of the ships
-            for(InterpreterShip ship : ships.values())
-                ship.shutdown();
-
-            Log.println(Log.yellow("    DONE: ====== FLEET is halted.  Have a nice day.  ======"));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void dispatch(Instruction i, long address) {
-        Log.dispatch(i);
-        if (i instanceof Instruction.Executable) {
-            InterpreterBenkoBox sourceBenkoBox = (InterpreterBenkoBox)(((Instruction.Executable)i).benkoBox);
-            ((InstructionPort)sourceBenkoBox).addInstruction(((Instruction.Executable)i));
-
-        } else if (i instanceof Instruction.Literal.CodeBagDescriptor) {
-            Instruction.Literal.CodeBagDescriptor cbd = (Instruction.Literal.CodeBagDescriptor)i;
-            InterpreterBenkoBox destBenkoBox = (InterpreterBenkoBox)(cbd.dest);
-            long absolute_cbd = ((cbd.offset+address) << 6) | cbd.size;
-            destBenkoBox.addDataFromFabric((int)absolute_cbd);
-            
-        } else if (i instanceof Instruction.Literal.Absolute) {
-            InterpreterBenkoBox destBenkoBox = (InterpreterBenkoBox)(((Instruction.Literal.Absolute)i).dest);
-            Log.data(((Instruction.Literal.Absolute)i).value+"", null, destBenkoBox);
-            destBenkoBox.addDataFromFabric((int)((Instruction.Literal.Absolute)i).value);
-
-        } else if (i instanceof Instruction.Kill) {
-            InterpreterBenkoBox benkoBox = (InterpreterBenkoBox)(((Instruction.Kill)i).benkoBox);
-            ((InstructionPort)benkoBox).kill(((Instruction.Kill)i).count,
-                                             ((Instruction.Kill)i).killOnlyStandingInstructions);
-
-        } else {
-            throw new Error("unsupported: " + i.getClass().getName());
-        }
-    }
-
-    public void sendToken(InterpreterBenkoBox source, InterpreterBenkoBox dest) {
-        Log.token(source, dest);
-        dest.addTokenFromFabric();
-    }
-
-    public void sendData(InterpreterBenkoBox source, int data, InterpreterBenkoBox dest) {
-        Log.data(data+"", source, dest);
-        dest.addDataFromFabric(data);
-    }
-
-
-    // Implementation of the Fleet class abstract methods /////////////////////////////////////////////////////////
-
-    public Iterator<Ship> iterator() { return (Iterator<Ship>)(Object)shiplist.iterator(); }
-
-    public int computeOffset(int origin, int target) { return (target - origin)/6; }
-    public int computeTarget(int origin, int offset) { return origin + (offset*6); }
-
-    private InterpreterInstructionEncoder iie = new InterpreterInstructionEncoder();
-    public Instruction readInstruction(DataInputStream is) throws IOException { return iie.readInstruction(is); }
-    public Instruction readInstruction(long instr) { return iie.readInstruction(instr); }
-    public long writeInstruction(Instruction d) { return writeInstruction(d); }
-    public void writeInstruction(DataOutputStream os, Instruction d) throws IOException { iie.writeInstruction(os, d); }
+    // Run //////////////////////////////////////////////////////////////////////////////
 
-    private class InterpreterInstructionEncoder extends InstructionEncoder {
-        public long getBoxAddr(BenkoBox box) { return ((InterpreterBenkoBox)box).addr; }
-        public long getBoxInstAddr(BenkoBox box) { return ((InterpreterBenkoBox)box).instr_addr; }
-        public BenkoBox getBoxByAddr(long dest) {
-            for(Ship ship : Interpreter.this)
-                for(BenkoBox bb : ship.getBenkoBoxes())
-                    if (((InterpreterBenkoBox)bb).addr == dest)
-                        return bb;
-            return null;
-        }
-        public BenkoBox getBoxByInstAddr(long dest) {
-            for(Ship ship : Interpreter.this)
-                for(BenkoBox bb : ship.getBenkoBoxes())
-                    if (((InterpreterBenkoBox)bb).instr_addr == dest)
-                        return bb;
-            return null;
-        }
+    public FleetProcess run(final Instruction[] instructions) {
+        InterpreterProcess ip = new InterpreterProcess(instructions);
+        new Thread(ip).start();
+        return ip;
     }
 
-    public Ship createShip(String shipType, String shipname) {
-        try {
-            Class c = Class.forName("edu.berkeley.fleet.interpreter.ships."+shipType);
-            Constructor con = c.getConstructor(new Class[] { Interpreter.class, String.class });
-            InterpreterShip ret = (InterpreterShip)con.newInstance(new Object[] { this, shipname });
-            ships.put(shipname, ret);
-            shiplist.add(ret);
-            return ret;
-        } catch (Exception e) {
-            return null;
+    private class InterpreterProcess extends FleetProcess implements Runnable {
+        private Instruction[] instructions;
+        public InterpreterProcess(Instruction[] instructions) {
+            this.instructions = instructions;
         }
-    }
-
-
-    // Memory //////////////////////////////////////////////////////////////////////////////
-
-    public void dumpMem() {
-        Log.print(Log.cyan("  MEMORY: "));
-        for(int i=0; i<mem.length; i++) {
-            if ((i%10)==0 && i!=0) Log.print(Log.cyan("          "));
-            Log.print(Log.cyan(mem[i] + " "));
-            if ((i%10)==9 && i!=mem.length-1) Log.println("");
+        public void dispatchInstruction(Instruction i) { dispatch(i); }
+        public Dock getDebugInputDock() { return debugShip.getDock("in"); }
+        public BitVector readWord() {
+            try {
+                return debugStream.take();
+            } catch (Exception e) { throw new RuntimeException(e); }
         }
-        Log.println();
-    }
-
-    public int readMem(int addr) {
-        return addr >= mem.length ? 0 : mem[addr];
-    }
-    public void writeMem(int addr, int data) {
-        if (addr >= mem.length) {
-            int[] mem2 = new int[addr*2+1];
-            System.arraycopy(mem, 0, mem2, 0, mem2.length);
-            mem = mem2;
+        protected void _terminate() { }
+        public void run() {
+            try {
+                while(!isTerminated())
+                    for(InterpreterShip ship : ships.values())
+                        for(int j=0; j<10; j++)
+                            ship._service();
+                for(InterpreterShip ship : ships.values())
+                    ship.reset();
+                debugStream.clear();
+            } catch (Exception e) {
+                if (isTerminated()) return;
+                throw new RuntimeException(e);
+            }
         }
-        mem[addr] = data;
     }
-
-
-}
-
+}
\ No newline at end of file