updates to make fpga-code instruction generation work again

[fleet.git] / contrib / demo.fleet

diff --git a/contrib/demo.fleet b/contrib/demo.fleet
index 4d8eed3..f17bbe0 100644 (file)
--- a/contrib/demo.fleet
+++ b/contrib/demo.fleet
@@ -1,20 +1,14 @@
-#import edu.berkeley.fleet.ships
-#ship alu          : Alu2
-#ship debug        : Debug
-#ship command      : Command
+#include "contrib/demo.ships"
+
+
+0:  sendto alu2.op;
+10: sendto alu2.a;
+2:  sendto alu2.b;
+
+alu2.a:   take, deliver;
+alu2.b:   take, deliver;
+alu2.op:  take, deliver;
+alu2.out: take, sendto debug.data;
+
 
-0: sendto alu.a;
-0: sendto alu.op;
-42: sendto alu.b;
-1:  sendto alu.b;
-5:  sendto alu.b;
-alu.a:  [*] take, deliver;
-alu.b:  [*] take, deliver;
-alu.op: take; [*] deliver;
-debug.data: [*] take, deliver;
-alu.out:
-  [*]  nop;
-  [*r] take, sendto alu.a;
-  [*r]       sendto debug.data;
-  kill;