From: megacz <adam@megacz.com>
Date: Mon, 19 Jan 2009 06:37:44 +0000 (-0800)
Subject: remove extraneous flag_z stuff from FpgaDock.java
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=89c5d706144e68b504b6ec85140e4a2cf32511eb;p=fleet.git

remove extraneous flag_z stuff from FpgaDock.java
---

diff --git a/src/edu/berkeley/fleet/fpga/FpgaDock.java b/src/edu/berkeley/fleet/fpga/FpgaDock.java
index a61692b..ce99a83 100644
--- a/src/edu/berkeley/fleet/fpga/FpgaDock.java
+++ b/src/edu/berkeley/fleet/fpga/FpgaDock.java
@@ -187,7 +187,6 @@ public class FpgaDock extends FleetTwoDock implements FabricElement {
             Module.Latch     flag_b         = new Latch("flag_b", 1);
             Module.Latch     flag_c         = new Latch("flag_c", 1);
             Module.Latch     flag_d         = new Latch("flag_d", 1);
-            Module.Latch     flag_z         = new Latch("flag_z", 1);
 
             Module.SinkPort   token_out     = fabric_out;
             Module.SourcePort token_in      = dfifo_out;
@@ -274,7 +273,6 @@ public class FpgaDock extends FleetTwoDock implements FabricElement {
                     ondeck,
                     torpedo_branch_torpedo,
                     new AssignAction(olc,    new ConstantValue(new BitVector(olc.width).set(0))),
-                    new AssignAction(flag_z, new ConstantValue(new BitVector(1).set(1))),
                     new AssignAction(flag_d, new ConstantValue(new BitVector(1).set(1))),
                     new AssignAction(ilc,    new ConstantValue(new BitVector(ilc.width).set(1)))
                 });
@@ -310,13 +308,6 @@ public class FpgaDock extends FleetTwoDock implements FabricElement {
                                                 new AssignAction(olc, new SimpleValue("olc==0 ? 0 : decremented"))),
 
                           new ConditionalAction(ondeck.testMask(fpga.SET_OLC_FROM_DATA_LATCH),
-                                                new AssignAction(flag_z, new ConstantValue(new BitVector(1).set(0)))),
-                          new ConditionalAction(ondeck.testMask(fpga.SET_OLC_FROM_IMMEDIATE),
-                                                new AssignAction(flag_z, new ConstantValue(new BitVector(1).set(0)))),
-                          new ConditionalAction(ondeck.testMask(fpga.SET_OLC_FROM_OLC_MINUS_ONE),
-                                                new AssignAction(flag_z, new SimpleValue("(olc==0 || olc==1)"))),
-
-                          new ConditionalAction(ondeck.testMask(fpga.SET_OLC_FROM_DATA_LATCH),
                                                 new AssignAction(flag_d, new SimpleValue("data_latch_output==0"))),
                           new ConditionalAction(ondeck.testMask(fpga.SET_OLC_FROM_IMMEDIATE),
                                                 new AssignAction(flag_d, new SimpleValue(ondeck.getBits(fpga.SET_OLC_FROM_IMMEDIATE).getVerilog()+"==0"))),