use new CompOpSubsetBase in trap

diff --git a/src/soc/fu/trap/trap_input_record.py b/src/soc/fu/trap/trap_input_record.py
index 84715f82b519ab4fc835bd01ac86666422a2eb71..111368caf205b5489b0b4ca01341ee725707c540 100644 (file)
--- a/src/soc/fu/trap/trap_input_record.py
+++ b/src/soc/fu/trap/trap_input_record.py
@@ -1,9 +1,8 @@
-from nmigen.hdl.rec import Record, Layout
-
+from soc.fu.base_input_record import CompOpSubsetBase
 from soc.decoder.power_enums import (MicrOp, Function)
 
 
-class CompTrapOpSubset(Record):
+class CompTrapOpSubset(CompOpSubsetBase):
     """CompTrapOpSubset
 
     a copy of the relevant subset information from Decode2Execute1Type
@@ -19,30 +18,5 @@ class CompTrapOpSubset(Record):
                   ('trapaddr', 13),
                   )
 
-        Record.__init__(self, Layout(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.is_32bit.reset_less = True
-        self.traptype.reset_less = True
-        self.trapaddr.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
+        super().__init__(layout, name=name)
 
-    def ports(self):
-        return [self.insn_type,
-                self.insn,
-                self.fn_unit,
-                self.is_32bit,
-                self.traptype,
-                self.trapaddr,
-        ]