From: adam Date: Sun, 7 Sep 2008 03:28:44 +0000 (+0100) Subject: rename Alu2->Alu X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=19888c123ae1dfd675ef02c5c62f7c3f28a490a8;p=fleet.git rename Alu2->Alu --- diff --git a/ships/Alu2.ship b/ships/Alu.ship similarity index 93% rename from ships/Alu2.ship rename to ships/Alu.ship index 2394534..9cc5e77 100644 --- a/ships/Alu2.ship +++ b/ships/Alu.ship @@ -1,4 +1,4 @@ -ship: Alu2 +ship: Alu == Ports =========================================================== data in: in1 @@ -17,7 +17,7 @@ data out: out == TeX ============================================================== -{\tt Alu2} is a ``two-input'' arithmetic logic unit. It includes +{\tt Alu} is a ``two-input'' arithmetic logic unit. It includes logic for performing arithmetic operations on a pair of arguments. Currently this includes addition ({\sc add}), @@ -150,7 +150,7 @@ public void service() { // FIXME: need test for ADD carry-out c-flag #ship debug : Debug -#ship alu : Alu2 +#ship alu : Alu #expect 17 #expect 1 @@ -184,16 +184,16 @@ alu.out: set ilc=4; collect, send to debug.in; alu.inOp: - set word= Alu2.inOp[ADD]; deliver; - set word= Alu2.inOp[SUB]; deliver; - set word= Alu2.inOp[IN1]; deliver; - set word= Alu2.inOp[IN2]; deliver; + set word= Alu.inOp[ADD]; deliver; + set word= Alu.inOp[SUB]; deliver; + set word= Alu.inOp[IN1]; deliver; + set word= Alu.inOp[IN2]; deliver; alu.inOp: - set word= Alu2.inOp[MIN]; deliver; - set word= Alu2.inOp[MAX]; deliver; - set word= Alu2.inOp[CMP]; deliver; - set word= Alu2.inOp[CMP]; deliver; + set word= Alu.inOp[MIN]; deliver; + set word= Alu.inOp[MAX]; deliver; + set word= Alu.inOp[CMP]; deliver; + set word= Alu.inOp[CMP]; deliver; alu.out: collect, send to debug.in; // MIN diff --git a/ships/CarrySaveAdder.ship b/ships/CarrySaveAdder.ship index d8b1a11..7bbb9e7 100644 --- a/ships/CarrySaveAdder.ship +++ b/ships/CarrySaveAdder.ship @@ -76,7 +76,7 @@ public void service() { // ships required in order to run this code #ship debug : Debug #ship csa : CarrySaveAdder -#ship alu : Alu2 +#ship alu : Alu #ship fifo : Fifo fifo.in: @@ -91,7 +91,7 @@ fifo.out: alu.in1: set ilc=4; recv, deliver; alu.in2: set ilc=4; recv, deliver; alu.inOp: - set word=Alu2.inOp[ADD]; + set word=Alu.inOp[ADD]; set ilc=4; deliver; alu.out: collect, send to alu.in1; diff --git a/ships/Lut3.ship b/ships/Lut3.ship index 5a0460b..3820874 100644 --- a/ships/Lut3.ship +++ b/ships/Lut3.ship @@ -355,7 +355,7 @@ is considered ``bit zero''). #ship debug : Debug #ship lut : Lut3 -#ship alu : Alu2 +#ship alu : Alu lut.in1: set word= 85; set ilc=*; deliver; lut.in2: set word= 51; set ilc=*; deliver; @@ -367,7 +367,7 @@ alu.in2: set word= 1; set ilc=*; deliver; alu.inOp: - set word= Alu2.inOp[ADD]; + set word= Alu.inOp[ADD]; set ilc=*; deliver; alu.in1: set word= 0; diff --git a/src/edu/berkeley/fleet/demo/Test.java b/src/edu/berkeley/fleet/demo/Test.java index 04be4bc..7722131 100644 --- a/src/edu/berkeley/fleet/demo/Test.java +++ b/src/edu/berkeley/fleet/demo/Test.java @@ -8,12 +8,12 @@ public class Test { public static void main(String[] s) { Fleet fleet = new Interpreter(new String[] { - "Alu2", + "alu2", "Debug" }, /* logging */ true); - Ship alu = fleet.getShip("Alu2", 0); + Ship alu = fleet.getShip("alu2", 0); Ship debug = fleet.getShip("Debug", 0); Dock debugIn = debug.getDock("in"); diff --git a/src/edu/berkeley/fleet/demo/Test2.java b/src/edu/berkeley/fleet/demo/Test2.java index 5a5037d..0bf28e6 100644 --- a/src/edu/berkeley/fleet/demo/Test2.java +++ b/src/edu/berkeley/fleet/demo/Test2.java @@ -25,12 +25,12 @@ public class Test2 { public static void main(String[] s) { Fleet fleet = new Interpreter(new String[] { - "Alu2", + "alu2", "Debug" }, /* logging */ true); - Ship alu = fleet.getShip("Alu2", 0); + Ship alu = fleet.getShip("alu2", 0); Ship debug = fleet.getShip("Debug", 0); Dock debugIn = debug.getDock("in"); diff --git a/src/edu/berkeley/fleet/demo/Test3.java b/src/edu/berkeley/fleet/demo/Test3.java index 22c212a..242e3eb 100644 --- a/src/edu/berkeley/fleet/demo/Test3.java +++ b/src/edu/berkeley/fleet/demo/Test3.java @@ -46,13 +46,13 @@ public class Test3 { public static void main(String[] s) { Fleet fleet = new Interpreter(new String[] { - "Alu2", + "alu2", "Fifo", "Debug" }, /* logging */ true); - Ship alu = fleet.getShip("Alu2", 0); + Ship alu = fleet.getShip("alu2", 0); Ship debug = fleet.getShip("Debug", 0); Ship fifo = fleet.getShip("Fifo", 0); Dock debugIn = debug.getDock("in"); diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java index cd54016..fb527dd 100644 --- a/src/edu/berkeley/fleet/fpga/Fpga.java +++ b/src/edu/berkeley/fleet/fpga/Fpga.java @@ -76,7 +76,7 @@ public class Fpga extends FleetTwoFleet { for(int i=0; i il) { @@ -168,7 +168,7 @@ public class New { this.incr = incr; } public Dock[] _setInputs() { - if (alu == null) alu = allocate("Alu2"); + if (alu == null) alu = allocate("alu2"); return new Dock[] { alu.getDock("out") }; } public void emitPrologue(ArrayList il) { @@ -203,7 +203,7 @@ public class New { this.max = max; } public Dock[] _setInputs() { - if (alu == null) alu = allocate("Alu2"); + if (alu == null) alu = allocate("alu2"); return new Dock[] { alu.getDock("out") }; } public void emitPrologue(ArrayList il) { @@ -343,12 +343,12 @@ public class New { "Fifo", "Fifo", "Fifo", "Fifo", "Fifo", "Fifo", - "Alu2", "Alu2", - "Alu2", "Alu2", - "Alu2", "Alu2", - "Alu2", "Alu2", - "Alu2", "Alu2", - "Alu2", "Alu2", + "alu2", "alu2", + "alu2", "alu2", + "alu2", "alu2", + "alu2", "alu2", + "alu2", "alu2", + "alu2", "alu2", "Video" }, false)); diff --git a/tests/colliding-tokens.test b/tests/colliding-tokens.test index 31a976e..78be2ac 100644 --- a/tests/colliding-tokens.test +++ b/tests/colliding-tokens.test @@ -4,7 +4,7 @@ #expect 2 #ship debug : Debug -#ship alu : Alu2 +#ship alu : Alu // attempts to get tokens to "collide" in the switch fabric diff --git a/tests/requeue/test-for-common-requeue-timing-error.fleet b/tests/requeue/test-for-common-requeue-timing-error.fleet index ba97167..c32e9f1 100644 --- a/tests/requeue/test-for-common-requeue-timing-error.fleet +++ b/tests/requeue/test-for-common-requeue-timing-error.fleet @@ -8,8 +8,8 @@ #ship debug0 : Debug #ship fifo0 : Fifo #ship fifo1 : Fifo -#ship alu20 : Alu2 -#ship alu21 : Alu2 +#ship alu20 : Alu +#ship alu21 : Alu fifo0.out: set olc=1; diff --git a/tests/requeue/test-requeue.fleet b/tests/requeue/test-requeue.fleet index 0752a24..b3e2d10 100644 --- a/tests/requeue/test-requeue.fleet +++ b/tests/requeue/test-requeue.fleet @@ -40,10 +40,10 @@ #expect 42 #expect 46 -#ship alu : Alu2 +#ship alu : Alu #ship debug : Debug -alu.inOp: set word= Alu2.inOp[ADD]; +alu.inOp: set word=Alu.inOp[ADD]; set ilc=*; deliver; debug.in: set ilc=*; recv, deliver, send token to alu.out;