add CR out vector detection to PowerDecoder2 no_out_vec
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Sun, 21 Feb 2021 19:20:17 +0000 (19:20 +0000)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Sun, 21 Feb 2021 19:20:17 +0000 (19:20 +0000)
src/soc/decoder/power_decoder2.py

index 2372888fcfefb8b960024b0ce735673c1cf2ee5b..8a6ef221e5b17c7983b5f4a307a0a8f40dd94562 100644 (file)
@@ -1180,7 +1180,8 @@ class PowerDecode2(PowerDecodeSubset):
         comb += self.o_isvec.eq(o_svdec.isvec)
         comb += self.o2_isvec.eq(o2_svdec.isvec)
         # TODO: include SPRs and CRs here!  must be True when *all* are scalar
-        comb += self.no_out_vec.eq((~o2_svdec.isvec) & (~o_svdec.isvec))
+        comb += self.no_out_vec.eq((~o2_svdec.isvec) & (~o_svdec.isvec) &
+                                   (crout_svdec.isvec))
 
         # SPRs out
         comb += e.read_spr1.eq(dec_a.spr_out)