fixing tests, started cleaning

test/unit_tests/decoder_2d_hybrid/test.act

@@ -48,25 +48,38 @@ defproc decoder_2d_hybrid_2x4 (avMx1of2<3> in; a1of1 out[8]; bool? dly_cfg[4], h
     supply.vdd = Vdd;
     supply.vss = GND;
 
-    decoder_2d_hybrid<1,2,2,4,4> decoder(.in = in, .out = out, .dly_cfg = dly_cfg, .hs_en = hs_en,
+    decoder_2d_hybrid<1,2,2,4,4> decoder(.in = in, .dly_cfg = dly_cfg, .hs_en = hs_en,
         .reset_B = _reset_B, .supply = supply);
 
     // model the synapse as having automatic pulldown of ack.
     INV_X1 synapses[8];
-    
+    AND2_X1 req_and2s[8];
+
+    pint index;
+
     PULLDOWN_X4 synapses2[8];
-    (i:8:
-        synapses[i].a = decoder.out[i].r;
-        synapses2[i].a = synapses[i].y; 
-        synapses2[i].y = decoder.out[i].a;
+    (i:4:
+        (j:2:
+            index = i + 4*j;
 
-        synapses[i].vss = supply.vss;
-        synapses[i].vdd = supply.vdd;
-        synapses2[i].vss = supply.vss;
-        synapses2[i].vdd = supply.vdd;
+            req_and2s[index].a = decoder.out_req_x[index];
+            req_and2s[index].b = decoder.out_req_y[index];
 
+            // synapses[index].a = decoder.out[index].r;
+            synapses[index].a = req_and2s[index].y;
+            synapses2[index].a = synapses[index].y; 
+            synapses2[index].y = decoder.out[index].a;
+
+            synapses[index].vss = supply.vss;
+            synapses[index].vdd = supply.vdd;
+            synapses2[index].vss = supply.vss;
+            synapses2[index].vdd = supply.vdd;            
+            req_and2s[index].vss = supply.vss;
+            req_and2s[index].vdd = supply.vdd;
+
+        )
+        
     )
-
 }