X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ships%2FAlu.ship;h=ddd3a4e336d9d83be0ddeccfb4137d16e039092f;hb=6db6a33919f27f3c5bdfdb407138196c33d78c3e;hp=fa9dfd8ee1db408daf3102224bde2d0b57cb02ab;hpb=d880743076f26614db870469e0c66c5eb520d7dd;p=fleet.git

diff --git a/ships/Alu.ship b/ships/Alu.ship
index fa9dfd8..ddd3a4e 100644
--- a/ships/Alu.ship
+++ b/ships/Alu.ship
@@ -14,6 +14,9 @@ data  in:   inOp
   constant DROP1: 7
   constant DROP2: 8
   constant MAXMERGE: 9
+  constant AND: 10
+  constant OR: 11
+  constant XOR: 12
 
 data  out:  out
 
@@ -88,31 +91,58 @@ public void service() {
               b = box_in2.removeDataForShip();
               box_out.addDataFromShip(a-b); // SUB
               break;
+
+          case 9: // MAXMERGE
+              if (box_in1.peekDataForShip()<0 && box_in2.peekDataForShip()<0) {
+                a = box_in1.removeDataForShip();
+                b = box_in2.removeDataForShip();
+                box_out.addDataFromShip(a, false);
+                break;
+              }
+              // fall through to MAX
           case 4:
               a = box_in1.peekDataForShip();
               b = box_in2.peekDataForShip();
-              box_out.addDataFromShip(Math.max(a,b)); // MAX
-              box_out.flag_c = !(a>b);
-              if (a<b) box_in1.removeDataForShip(); else box_in2.removeDataForShip();
+              box_out.addDataFromShip(Math.max(a,b), !(a>b)); // MAX
+              if (a>b) box_in1.removeDataForShip(); else box_in2.removeDataForShip();
               break;
+
           case 5:
               a = box_in1.peekDataForShip();
               b = box_in2.peekDataForShip();
-              box_out.addDataFromShip(Math.min(a,b)); // MIN
-              box_out.flag_c = a>b;
-              if (a>b) box_in1.removeDataForShip(); else box_in2.removeDataForShip();
+              box_out.addDataFromShip(Math.min(a,b), a>b); // MIN
+              if (a<b) box_in1.removeDataForShip(); else box_in2.removeDataForShip();
               break;
           case 6:
               a = box_in1.removeDataForShip();
               b = box_in2.removeDataForShip();
-              box_out.addDataFromShip(0); // CMP
-              box_out.flag_c = a==b;
+              box_out.addDataFromShip(0, a==b); // CMP
               break;
-          default:
+/*
+          case 7:
+              box_in1.removeDataForShip();      // DROP1
+              break;
+          case 8:
+              box_in2.removeDataForShip();      // DROP2
+              break;
+*/
+          case 10:
+              a = box_in1.removeDataForShip();
+              b = box_in2.removeDataForShip();
+              box_out.addDataFromShip(a & b); // CMP
+              break;
+          case 11:
               a = box_in1.removeDataForShip();
               b = box_in2.removeDataForShip();
-              box_out.addDataFromShip(0);
+              box_out.addDataFromShip(a | b); // CMP
               break;
+          case 12:
+              a = box_in1.removeDataForShip();
+              b = box_in2.removeDataForShip();
+              box_out.addDataFromShip(a ^ b); // CMP
+              break;
+          default:
+              throw new RuntimeException("invalid opcode: " + op);
       }
   }
 }
@@ -130,10 +160,10 @@ public void service() {
   wire                    eq;
   wire                    cout;
 
-  wire [3:0]              inOp_d_trunc;
-  assign                  inOp_d_trunc = inOp_d[3:0];
+  wire [4:0]              inOp_d_trunc;
+  assign                  inOp_d_trunc = inOp_d[4:0];
 
-  assign isplus        = inOp_d_trunc[2:0]==2;
+  assign isplus        = inOp_d_trunc[4:0]==2;
   assign cin           = isplus ? 0 : 1;
   assign in2_inverted  = isplus ? in2_d : ~in2_d;
   assign sum           = {in1_d,cin} + {in2_inverted,cin};
@@ -165,14 +195,16 @@ public void service() {
           (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)) :
+          (inOp_d_trunc==10) ? (in1_d & in2_d) :
+          (inOp_d_trunc==11) ? (in1_d | in2_d) :
+          (inOp_d_trunc==12) ? (in1_d ^ in2_d) :
           0;
 
   always @(posedge clk) begin
-    if (!rst) begin
+    if (rst) begin
       `reset
       out_draining <= 0;
     end else begin
-      `flush
       `cleanup
       if (out_draining && `out_empty) begin
         `drain_inOp