added am10 inbox/outbox support

[fleet.git] / problem0.fleet

diff --git a/test.fleet b/problem0.fleet
similarity index 50%
rename from test.fleet
rename to problem0.fleet
index c95fdbd..69586d6 100644 (file)
--- a/test.fleet
+++ b/problem0.fleet
@@ -1,6 +1,4 @@
-#import edu.berkeley.fleet
-
-// skeleton solution to problem #1 (fill in the XXX blanks)
+#import edu.berkeley.fleet.ships
 
 #memory { 1, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
           1, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
@@ -14,25 +12,14 @@
           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
  }
 
-#ship memread   : MemReadShip
-#ship memwrite  : MemWriteShip
-#ship bitbucket : BitBucketShip
-#ship halt      : HaltShip
-#ship fetch     : FetchShip
+#ship fifo        : FifoShip
 
-top: { 100                 -> memread.count
-       0             -(100)-> memread.token
-       // XXX              -> memread.addr
-       // XXX              -> memread.stride
+#ship halt        : HaltShip
+#ship fetch       : FetchShip
+#ship tokensource : TokenSourceShip
 
-       memread.data   -(*)-> memwrite.data
 
-       // XXX               -> memwrite.count
-       // XXX               -> memwrite.addr
-       // XXX               -> memwrite.stride
-       memwrite.token  -(99)-> bitbucket.in
-       memwrite.token       -> halt.in
-}
 
-top -> fetch.in
+{ tokensource.out -> halt.in } -> fetch.codebag
+tokensource.out                -> fetch.release