update cr input record to use new CompOpSubsetBase

diff --git a/src/soc/fu/cr/cr_input_record.py b/src/soc/fu/cr/cr_input_record.py
index bfe4ab82e2ce3e970a53a6324bb07ca3e4ab40b0..c2b87cd044cc2097e07dece830f58ac69048337b 100644 (file)
--- a/src/soc/fu/cr/cr_input_record.py
+++ b/src/soc/fu/cr/cr_input_record.py
@@ -1,9 +1,10 @@
-from nmigen.hdl.rec import Record, Layout
+from soc.fu.base_input_record import CompOpSubsetBase
+from nmigen.hdl.rec import Layout
 
 from soc.decoder.power_enums import (MicrOp, Function)
 
 
-class CompCROpSubset(Record):
+class CompCROpSubset(CompOpSubsetBase):
     """CompCROpSubset
 
     a copy of the relevant subset information from Decode2Execute1Type
@@ -18,28 +19,5 @@ class CompCROpSubset(Record):
                   ('write_cr_whole', 1),
                   )
 
-        Record.__init__(self, Layout(layout), name=name)
+        super().__init__(layout, name=name)
 
-        # grrr.  Record does not have kwargs
-        self.insn_type.reset_less = True
-        self.insn.reset_less = True
-        self.fn_unit.reset_less = True
-        self.read_cr_whole.reset_less = True
-        self.write_cr_whole.reset_less = True
-
-    def eq_from_execute1(self, other):
-        """ use this to copy in from Decode2Execute1Type
-        """
-        res = []
-        for fname, sig in self.fields.items():
-            eqfrom = other.do.fields[fname]
-            res.append(sig.eq(eqfrom))
-        return res
-
-    def ports(self):
-        return [self.insn_type,
-                self.insn,
-                self.fn_unit,
-                self.read_cr_whole,
-                self.write_cr_whole,
-        ]