add in cancelmask

diff --git a/src/nmutil/singlepipe.py b/src/nmutil/singlepipe.py
index bcef43462611721e9aa4df0f2c7a4b8f95027808..42cd158cc42afa2b8ae1d4e284a6ce05a2ee05da 100644 (file)
--- a/src/nmutil/singlepipe.py
+++ b/src/nmutil/singlepipe.py
@@ -431,10 +431,8 @@ class MaskCancellable(ControlBase):
         # XXX EXCEPTIONAL CIRCUMSTANCES: inspection of the data payload
         # is NOT "normal" for the Stage API.
         p_valid_i = Signal(reset_less=True)
-        print ("self.p.data_i", self.p.data_i)
-        m.d.comb += p_valid_i.eq((self.p.mask_i.bool()))
-        #m.d.comb += p_valid_i.eq((self.p.data_i.ctx.idmask & \
-        #                         ~self.cancelmask)) # nonzero
+        #print ("self.p.data_i", self.p.data_i)
+        m.d.comb += p_valid_i.eq(((self.p.mask_i & ~self.cancelmask).bool()))
 
         # if idmask nonzero, mask gets passed on (and register set).
         # register is left as-is if idmask is zero, but out-mask is set to zero