convert from public static functions/properties for regspecs

[soc.git] / src / soc / fu / cr / pipe_data.py

diff --git a/src/soc/fu/cr/pipe_data.py b/src/soc/fu/cr/pipe_data.py
index b16e56881bcc501982cb53faac459ab5e5cdefa5..f1c6d349201915764682ae5079cc1753f9c94b10 100644 (file)
--- a/src/soc/fu/cr/pipe_data.py
+++ b/src/soc/fu/cr/pipe_data.py
@@ -2,79 +2,33 @@
 Links:
 * https://libre-soc.org/3d_gpu/architecture/regfile/ section on regspecs
 """
-from nmigen import Signal, Const, Cat
-from ieee754.fpcommon.getop import FPPipeContext
-from soc.fu.pipe_data import IntegerData, CommonPipeSpec
+from soc.fu.pipe_data import FUBaseData, CommonPipeSpec
 from soc.fu.cr.cr_input_record import CompCROpSubset
-from soc.decoder.power_decoder2 import Data
 
 
-class CRInputData(IntegerData):
-    regspec = [('INT', 'a', '0:63'),      # 64 bit range
-               ('INT', 'b', '0:63'),      # 6B bit range
+class CRInputData(FUBaseData):
+    regspec = [('INT', 'ra', '0:63'),      # 64 bit range
+               ('INT', 'rb', '0:63'),      # 64 bit range
                ('CR', 'full_cr', '0:31'), # 32 bit range
                ('CR', 'cr_a', '0:3'),     # 4 bit range
                ('CR', 'cr_b', '0:3'),     # 4 bit range
-               ('CR', 'cr_c', '0:3')]     # 4 bit range
+               ('CR', 'cr_c', '0:3')]     # 4 bit: for CR_OP partial update
     def __init__(self, pspec):
-        super().__init__(pspec)
-        self.a = Signal(64, reset_less=True) # RA
-        self.b = Signal(64, reset_less=True) # RB
-        self.full_cr = Signal(32, reset_less=True) # full CR in
-        self.cr_a = Signal(4, reset_less=True)
-        self.cr_b = Signal(4, reset_less=True)
-        self.cr_c = Signal(4, reset_less=True) # needed for CR_OP partial update
+        super().__init__(pspec, False)
+        # convenience
+        self.a, self.b = self.ra, self.rb
 
-    def __iter__(self):
-        yield from super().__iter__()
-        yield self.a
-        yield self.b
-        yield self.full_cr
-        yield self.cr_a
-        yield self.cr_b
-        yield self.cr_c
 
-    def eq(self, i):
-        lst = super().eq(i)
-        return lst + [self.a.eq(i.a),
-                      self.b.eq(i.b),
-                      self.full_cr.eq(i.full_cr),
-                      self.cr_a.eq(i.cr_a),
-                      self.cr_b.eq(i.cr_b),
-                      self.cr_c.eq(i.cr_c)]
-                      
-
-class CROutputData(IntegerData):
-    regspec = [('INT', 'o', '0:63'),      # 64 bit range
+class CROutputData(FUBaseData):
+    regspec = [('INT', 'o', '0:63'),      # RA - 64 bit range
                ('CR', 'full_cr', '0:31'), # 32 bit range
-               ('CR', 'cr', '0:3')]     # 4 bit range
+               ('CR', 'cr_a', '0:3')]     # 4 bit range
     def __init__(self, pspec):
-        super().__init__(pspec)
-        self.o = Data(64, name="o") # RA
-        self.full_cr = Data(32, name="full_cr")
-        self.cr = Data(4, name="cr")
-
-    def __iter__(self):
-        yield from super().__iter__()
-        yield self.o
-        yield self.full_cr
-        yield self.cr
-
-    def eq(self, i):
-        lst = super().eq(i)
-        return lst + [self.o.eq(i.o),
-                      self.full_cr.eq(i.full_cr),
-                      self.cr.eq(i.cr)]
+        super().__init__(pspec, True)
+        # convenience
+        self.cr = self.cr_a
 
 
 class CRPipeSpec(CommonPipeSpec):
-    regspec = (CRInputData.regspec, CROutputData.regspec)
+    regspecklses = (CRInputData, CROutputData)
     opsubsetkls = CompCROpSubset
-    def rdflags(self, e): # in order of regspec
-        reg1_ok = e.read_reg1.ok # RA/RC
-        reg2_ok = e.read_reg2.ok # RB
-        full_reg = e.read_cr_whole # full CR
-        cr1_en = e.read_cr1.ok # CR A
-        cr2_en = e.read_cr2.ok # CR B
-        cr3_en = e.read_cr3.ok # CR C
-        return Cat(reg1_ok, reg2_ok, full_reg, cr1_en, cr2_en, cr3_en)