convert from public static functions/properties for regspecs

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

diff --git a/src/soc/fu/ldst/pipe_data.py b/src/soc/fu/ldst/pipe_data.py
index fc0546a9b6c620fa6fb31deaec1aadb2320a20eb..caf8bf5a15fca0dc01692225738ca70b00ae60bf 100644 (file)
--- a/src/soc/fu/ldst/pipe_data.py
+++ b/src/soc/fu/ldst/pipe_data.py
@@ -10,7 +10,6 @@ class LDSTInputData(FUBaseData):
                ('INT', 'rb', '0:63'), # RB/immediate
                ('INT', 'rc', '0:63'), # RC
                # XXX TODO, later ('XER', 'xer_so', '32') # XER bit 32: SO
-               ('STATE', 'msr', '0:63'),  # MSR
                ]
     def __init__(self, pspec):
         super().__init__(pspec, False)
@@ -23,7 +22,7 @@ class LDSTOutputData(FUBaseData):
     # LDSTCompUnit is unusual in that it's non-standard to RegSpecAPI
     regspec = [('INT', 'o', '0:63'),   # RT
                ('INT', 'o1', '0:63'),  # RA (effective address, update mode)
-               # TODO, later ('CR', 'cr_a', '0:3'),
+               ('CR', 'cr_a', '0:3'),
                # TODO, later ('XER', 'xer_so', '32')
                 ]
     def __init__(self, pspec):
@@ -33,5 +32,5 @@ class LDSTOutputData(FUBaseData):
 
 
 class LDSTPipeSpec(CommonPipeSpec):
-    regspec = (LDSTInputData.regspec, LDSTOutputData.regspec)
+    regspecklses = (LDSTInputData, LDSTOutputData)
     opsubsetkls = CompLDSTOpSubset