From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 3 Aug 2019 04:37:40 +0000 (+0100)
Subject: add in cancelmask
X-Git-Tag: ls180-24jan2020~558
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67cfe48cadc5c6542ee3546f5e420e8189abe582;p=ieee754fpu.git

add in cancelmask
---

diff --git a/src/nmutil/singlepipe.py b/src/nmutil/singlepipe.py
index bcef4346..42cd158c 100644
--- 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