From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 16 Jul 2020 10:14:48 +0000 (+0100)
Subject: use CompOpSubsetBase in ldst record
X-Git-Tag: div_pipeline~3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=30e1aa22f6af6d8b87f2147b5eafa985535d6324;p=soc.git

use CompOpSubsetBase in ldst record
---

diff --git a/src/soc/fu/ldst/ldst_input_record.py b/src/soc/fu/ldst/ldst_input_record.py
index 03851d43..f5b44d06 100644
--- a/src/soc/fu/ldst/ldst_input_record.py
+++ b/src/soc/fu/ldst/ldst_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, LDSTMode
 
 
-class CompLDSTOpSubset(Record):
+class CompLDSTOpSubset(CompOpSubsetBase):
     """CompLDSTOpSubset
 
     a copy of the relevant subset information from Decode2Execute1Type
@@ -25,35 +26,5 @@ class CompLDSTOpSubset(Record):
                   ('sign_extend', 1),
                   ('ldst_mode', LDSTMode))
 
-        Record.__init__(self, Layout(layout), name=name)
-
-        # grrr.  Record does not have kwargs
-        self.insn_type.reset_less = True
-        self.is_32bit.reset_less = True
-        self.zero_a.reset_less = True
-        self.is_signed.reset_less = True
-        self.data_len.reset_less = True
-        self.byte_reverse.reset_less = True
-        self.sign_extend.reset_less = True
-        self.ldst_mode.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.is_32bit,
-                self.zero_a,
-                self.is_signed,
-                self.data_len,
-                self.byte_reverse,
-                self.sign_extend,
-                self.ldst_mode,
-        ]
+        super().__init__(layout, name=name)