fix strange update to c-flag based on flushing bit; I am not sure why this was the...

diff --git a/src/edu/berkeley/fleet/fpga/FpgaDock.java b/src/edu/berkeley/fleet/fpga/FpgaDock.java
index 693db09..a61692b 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FpgaDock.java
+++ b/src/edu/berkeley/fleet/fpga/FpgaDock.java
@@ -355,8 +355,9 @@ public class FpgaDock extends FleetTwoDock implements FabricElement {
                           new ConditionalAction(ondeck.testMask(fpga.DO),    data_out),
                           new ConditionalAction(ondeck.testMask(fpga.FLUSH), data_out),
                           inbox
-                          ? new AssignAction(new SimpleAssignable(data_out.getName()+"["+fpga.getWordWidth()+"]"), new SimpleValue(fpga.FLUSH.verilog(ondeck.getName())+"?1:0"))
-                          : new ConditionalAction(ondeck.testMask(fpga.DI),   new AssignAction(flag_c, new SimpleValue(data_latch_input.getVerilog()+"["+fpga.getWordWidth()+"]"))),
+                          ? new AssignAction(new SimpleAssignable(data_out.getName()+"["+fpga.getWordWidth()+"]"),
+                                             new SimpleValue(fpga.FLUSH.verilog(ondeck.getName())+"?1:0"))
+                          : null,
                           new ConditionalAction(ondeck.testMask(fpga.TI),    token_in),
                           new ConditionalAction(ondeck.testMask(fpga.TO),    token_out),
                           new ConditionalAction(ondeck.testMask(fpga.DC),   new AssignAction(data_latch, data_latch_input)),