fix awful c-flag bug in Memory.ship

[fleet.git] / ships / Alu.ship

diff --git a/ships/Alu.ship b/ships/Alu.ship
index 2089b8a..3b2117f 100644 (file)
--- a/ships/Alu.ship
+++ b/ships/Alu.ship
@@ -121,45 +121,48 @@ public void service() {
 
 == FPGA ==============================================================
 
-  wire [`DATAWIDTH:0]     sum;
+  wire [`WORDWIDTH:0]     sum;
   wire                    cin;
-  wire [(`DATAWIDTH-1):0] in2_inverted;
+  wire [(`WORDWIDTH-1):0] in2_inverted;
 
-  wire [(`DATAWIDTH-1):0] res;
+  wire [(`WORDWIDTH-1):0] res;
   wire                    isplus;
   wire                    eq;
   wire                    cout;
 
-  assign isplus        = inOp_d[2:0]==2;
+  wire [3:0]              inOp_d_trunc;
+  assign                  inOp_d_trunc = inOp_d[3:0];
+
+  assign isplus        = inOp_d_trunc[2:0]==2;
   assign cin           = isplus ? 0 : 1;
   assign in2_inverted  = isplus ? in2_d : ~in2_d;
   assign sum           = {in1_d,cin} + {in2_inverted,cin};
-  assign res           = sum[`DATAWIDTH:1];
-  assign greater       = !res[`DATAWIDTH-1];
-  assign both_negative = in1_d[`DATAWIDTH-1] && in2_d[`DATAWIDTH-1];
+  assign res           = sum[`WORDWIDTH:1];
+  assign greater       = !res[`WORDWIDTH-1];
+  assign both_negative = in1_d[`WORDWIDTH-1] && in2_d[`WORDWIDTH-1];
   assign eq            = in1_d == in2_d;
-  assign cout          = sum[`DATAWIDTH];
-
-  assign out_d_[`DATAWIDTH] =
-          (inOp_d==0) ? 1'b0 :
-          (inOp_d==1) ? 1'b0 :
-          (inOp_d==2) ? cout :
-          (inOp_d==3) ? cout :
-          (inOp_d==4) ? ~greater :
-          (inOp_d==5) ?  greater :
-          (inOp_d==6) ?  eq :
-          (inOp_d==9) ? ~greater :
+  assign cout          = sum[`WORDWIDTH];
+
+  assign out_d_[`WORDWIDTH] =
+          (inOp_d_trunc==0) ? 1'b0 :
+          (inOp_d_trunc==1) ? 1'b0 :
+          (inOp_d_trunc==2) ? cout :
+          (inOp_d_trunc==3) ? cout :
+          (inOp_d_trunc==4) ? ~greater :
+          (inOp_d_trunc==5) ?  greater :
+          (inOp_d_trunc==6) ?  eq :
+          (inOp_d_trunc==9) ? ~greater :
           0;
 
-  assign out_d_[(`DATAWIDTH-1):0] =
-          (inOp_d==0) ? (in1_d)  :
-          (inOp_d==1) ? (in2_d)  :
-          (inOp_d==2) ? (res)  :
-          (inOp_d==3) ? (res)  :
-          (inOp_d==4) ? (greater ? in1_d : in2_d)  :
-          (inOp_d==5) ? (greater ? in2_d : in1_d)  :
-          (inOp_d==6) ? {{ (`DATAWIDTH-1) {1'b0 }}, eq  } :
-          (inOp_d==9) ? (both_negative ? in1_d : (greater ? in1_d : in2_d)) :
+  assign out_d_[(`WORDWIDTH-1):0] =
+          (inOp_d_trunc==0) ? (in1_d)  :
+          (inOp_d_trunc==1) ? (in2_d)  :
+          (inOp_d_trunc==2) ? (res)  :
+          (inOp_d_trunc==3) ? (res)  :
+          (inOp_d_trunc==4) ? (greater ? in1_d : in2_d)  :
+          (inOp_d_trunc==5) ? (greater ? in2_d : in1_d)  :
+          (inOp_d_trunc==6) ? {{ (`WORDWIDTH-1) {1'b0 }}, eq  } :
+          (inOp_d_trunc==9) ? (both_negative ? in1_d : (greater ? in1_d : in2_d)) :
           0;
 
   always @(posedge clk) begin
@@ -167,29 +170,25 @@ public void service() {
       `reset
     end else begin
       `flush
-      if (!in1_r_  && in1_a)    in1_a    <= 0;
-      if (!in2_r_  && in2_a)    in2_a    <= 0;
-      if (!inOp_r_ && inOp_a)   inOp_a   <= 0;
-      if (out_r    && out_a) begin
-        out_r  <= 0;
-        inOp_a <= 1;
-
-        if      (inOp_d==0) in1_a <= 1;
-        else if (inOp_d==1) in2_a <= 1;
-        else if (inOp_d==9 &&  both_negative) begin in1_a <= 1; in2_a <= 1; end
-        else if (inOp_d==4 &&  greater) in1_a <= 1;
-        else if (inOp_d==5 &&  greater) in2_a <= 1;
-        else if (inOp_d==9 &&  greater) in1_a <= 1;
-        else if (inOp_d==4 && !greater) in2_a <= 1;
-        else if (inOp_d==5 && !greater) in1_a <= 1;
-        else if (inOp_d==9 && !greater) in2_a <= 1;
+      `cleanup
+      if (`out_draining) begin
+        `drain_inOp
+        if      (inOp_d_trunc==0) `drain_in1
+        else if (inOp_d_trunc==1) `drain_in2
+        else if (inOp_d_trunc==9 &&  both_negative) begin `drain_in1 `drain_in2 end
+        else if (inOp_d_trunc==4 &&  greater) `drain_in1
+        else if (inOp_d_trunc==5 &&  greater) `drain_in2
+        else if (inOp_d_trunc==9 &&  greater) `drain_in1
+        else if (inOp_d_trunc==4 && !greater) `drain_in2
+        else if (inOp_d_trunc==5 && !greater) `drain_in1
+        else if (inOp_d_trunc==9 && !greater) `drain_in2
         else begin
-          in1_a <= 1;
-          in2_a <= 1;
+          `drain_in1
+          `drain_in2
         end
       end
-      if (!out_r && !out_a && in1_r && !in1_a && in2_r && !in2_a && inOp_r && !inOp_a) begin
-        out_r <= 1;
+      if (`out_empty && `in1_full && `in2_full && `inOp_full) begin
+        `fill_out
       end
     end
   end