added ands on synapse x mon decoder, on DEV_DEBUG

dataflow_neuro/chips.act

@@ -133,34 +133,58 @@ defproc chip_texel (bd<N_IN> in, out;
     pint NC_SYN_MON_X = std::ceil_log2(N_SYN_MON_X);
     pint NC_SYN_MON_Y = std::ceil_log2(N_SYN_MON_Y);
 
-    decoder_dualrail_en<NC_NRN_MON_X, N_NRN_MON_X, N_NRN_Y> nrn_mon_dec_x(.out = nrn_mon_x,
+    decoder_dualrail_en<NC_NRN_MON_X, N_NRN_MON_X> nrn_mon_dec_x(.out = nrn_mon_x,
         .supply = supply);
     nrn_mon_dec_x.en = register.data[1].d[0].t;
     (i:NC_NRN_MON_X:
         nrn_mon_dec_x.in.d[i] = register.data[2].d[i];
     )
 
-    decoder_dualrail_en<NC_NRN_MON_Y, N_NRN_MON_Y, N_NRN_X> nrn_mon_dec_y(.out = nrn_mon_y,
+    decoder_dualrail_en<NC_NRN_MON_Y, N_NRN_MON_Y> nrn_mon_dec_y(.out = nrn_mon_y,
         .supply = supply);
     nrn_mon_dec_y.en = register.data[1].d[0].t;
     (i:NC_NRN_MON_Y:
         nrn_mon_dec_y.in.d[i] = register.data[2].d[i+NC_NRN_MON_X];
     )
 
-    decoder_dualrail_en<NC_SYN_MON_X, N_SYN_MON_X, N_SYN_Y> syn_mon_dec_x(.out = syn_mon_x,
+    decoder_dualrail_en<NC_SYN_MON_X, N_SYN_MON_X> syn_mon_dec_x(
         .supply = supply);
     syn_mon_dec_x.en = register.data[1].d[1].t;
     (i:NC_SYN_MON_X:
         syn_mon_dec_x.in.d[i] = register.data[3].d[i];
     )
 
-    decoder_dualrail_en<NC_SYN_MON_Y, N_SYN_MON_Y, N_SYN_X> syn_mon_dec_y(.out = syn_mon_y,
+    decoder_dualrail_en<NC_SYN_MON_Y, N_SYN_MON_Y> syn_mon_dec_y(.out = syn_mon_y,
         .supply = supply);
     syn_mon_dec_y.en = register.data[1].d[1].t;
     (i:NC_SYN_MON_Y:
         syn_mon_dec_y.in.d[i] = register.data[3].d[i+NC_SYN_MON_X];
     )
 
+    // Device debug hard-wired safety (reg0, b05 = DEV_DEBUG)
+    // Stops the possibility of dev_mon being high while some other sig is high.
+    // Otherwise boom.
+    bool DEV_DEBUG;
+    pint NSMX4 = N_SYN_MON_X/4; // Self explanatory
+    sigbuf<NSMX4> sb_DEV_DEBUG(.in = register.data[0].d[5].t,
+        .supply = supply);
+    DEV_DEBUG = sb_DEV_DEBUG.out[0];
+    AND2_X1 ands_devmon[NSMX4];
+    (i:NSMX4:
+        ands_devmon[i].a = syn_mon_dec_x.out[1+i*4];
+        ands_devmon[i].b = DEV_DEBUG;
+        ands_devmon[i].y = syn_mon_x[1+i*4];
+        ands_devmon[i].vdd = supply.vdd;
+        ands_devmon[i].vss = supply.vss;
+    )
+    // Wire up the non-ANDed lines.
+    (i:N_SYN_MON_X:
+        [~(i%4 = 1) ->
+            syn_mon_x[i] = syn_mon_dec_x.out[i];
+        ]
+    )
+
+
 }
 }
 }

dataflow_neuro/coders.act

@@ -105,14 +105,13 @@ defproc decoder_dualrail_x(Mx1of2<Nc> in; bool? out[N*OUT_STRENGTH]; power suppl
 
 /**
  * Dualrail decoder with on/off switch.
- * Outputs are buffered.
+ * Outputs are NOT buffered.
  */
-export template<pint Nc, N, OUT_STRENGTH>
-defproc decoder_dualrail_en(Mx1of2<Nc> in; bool? en, out[N*OUT_STRENGTH]; power supply) {
+export template<pint Nc, N>
+defproc decoder_dualrail_en(Mx1of2<Nc> in; bool? en, out[N]; power supply) {
 	decoder_dualrail<Nc, N> decoder(.in = in, .supply = supply);
 
 	sigbuf<N> sb_en(.in = en, .supply = supply);
-	sigbuf<OUT_STRENGTH> sb[N];
 	AND2_X1 en_ands[N];
 	(i:N:
 		en_ands[i].a = decoder.out[i];
@@ -121,16 +120,46 @@ defproc decoder_dualrail_en(Mx1of2<Nc> in; bool? en, out[N*OUT_STRENGTH]; power
 		en_ands[i].vdd = supply.vdd;
 		en_ands[i].vss = supply.vss;
 
-		sb[i].in = en_ands[i].y;
-		sb[i].supply = supply;
-		(j:OUT_STRENGTH:
-			sb[i].out[j] = out[j + i*OUT_STRENGTH];
-		)
+		en_ands[i].y = out[i];
 
 	)
 
 }
 
+/**
+ * Dualrail decoder with on/off switch.
+ * Outputs are buffered.
+ */
+// export template<pint Nc, N, OUT_STRENGTH>
+// defproc decoder_dualrail_en_x(Mx1of2<Nc> in; bool? en, out[N]; power supply) {
+// 	decoder_dualrail<Nc, N> decoder(.in = in, .supply = supply);
+
+// 	sigbuf<N> sb_en(.in = en, .supply = supply);
+// 	sigbuf<OUT_STRENGTH> sb[N];
+// 	AND2_X1 en_ands[N];
+// 	(i:N:
+// 		en_ands[i].a = decoder.out[i];
+// 		en_ands[i].b = sb_en.out[i];
+
+// 		en_ands[i].vdd = supply.vdd;
+// 		en_ands[i].vss = supply.vss;
+
+// 		sb[i].in = en_ands[i].y;
+// 		sb[i].supply = supply;
+
+// 		// (j:OUT_STRENGTH:
+// 		// 	sb[i].out[j] = out[j + i*OUT_STRENGTH];
+// 		// )
+
+// 		sb[i].out[0] = out[i];
+
+// 	)
+
+// }
+
+
+
+
 
 
 /**