use nmoperator instead of direct eq

diff --git a/src/add/fpcommon/getop.py b/src/add/fpcommon/getop.py
index 3b93f4d142e7780001b6dad82ac99826977ea2b5..1988997a8948abc7bad5b0c1276736c0e2fd3dc8 100644 (file)
--- a/src/add/fpcommon/getop.py
+++ b/src/add/fpcommon/getop.py
@@ -15,6 +15,7 @@ from multipipe import CombMuxOutPipe
 from multipipe import PriorityCombMuxInPipe
 
 from fpbase import FPState
+import nmoperator
 
 
 class FPGetOpMod(Elaboratable):
@@ -53,7 +54,7 @@ class FPGetOp(FPState):
         """ links module to inputs and outputs
         """
         setattr(m.submodules, self.state_from, self.mod)
-        m.d.comb += self.mod.in_op.eq(in_op)
+        m.d.comb += nmoperator.eq(self.mod.in_op, in_op)
         m.d.comb += self.out_decode.eq(self.mod.out_decode)
 
     def action(self, m):

diff --git a/src/add/iocontrol.py b/src/add/iocontrol.py
index f9d15bd2b9d82c8c6804e632a41216cb9f3e24da..3d823c9ba2d9bcd7b8795e4bfd7dbd115cdacb2b 100644 (file)
--- a/src/add/iocontrol.py
+++ b/src/add/iocontrol.py
@@ -224,7 +224,7 @@ class PrevControl(Elaboratable):
         return m
 
     def eq(self, i):
-        return [self.data_i.eq(i.data_i),
+        return [nmoperator.eq(self.data_i, i.data_i),
                 self.ready_o.eq(i.ready_o),
                 self.valid_i.eq(i.valid_i)]