add link to rotator, sign-extend mode OP_EXTSWSLI

[soc.git] / src / soc / fu / regspec.py

diff --git a/src/soc/fu/regspec.py b/src/soc/fu/regspec.py
index 4e6fc5d1ce3cd9b2ad94cf26f4dae29db57c658a..1524e8aa3dbf05340d45168fca9182e9d0cae087 100644 (file)
--- a/src/soc/fu/regspec.py
+++ b/src/soc/fu/regspec.py
@@ -16,9 +16,12 @@ again, the regspecs will say which Regfile (which type) is connected to
 which MultiCompUnit port, how wide the connection is, and so on.
 
 """
+from nmigen import Const
+from soc.regfile.regfiles import XERRegs, FastRegs
 
 
 def get_regspec_bitwidth(regspec, srcdest, idx):
+    print ("get_regspec_bitwidth", regspec, srcdest, idx)
     bitspec = regspec[srcdest][idx]
     wid = 0
     print (bitspec)
@@ -54,27 +57,48 @@ class RegSpec:
         return get_regspec_bitwidth(self._rwid, 0, i)
 
 
-class RegSpecALUAPI:
+class RegSpecAPI:
+    def __init__(self, rwid):
+        """RegSpecAPI
+
+        * :rwid:       regspec
+        """
+        self.rwid = rwid
+
+    def get_in_spec(self, i):
+        return self.rwid[0][i]
+
+    def get_out_spec(self, i):
+        return self.rwid[1][i]
+
+    def get_in_name(self, i):
+        return self.get_in_spec(i)[1]
+
+    def get_out_name(self, i):
+        return self.get_out_spec(i)[1]
+
+
+class RegSpecALUAPI(RegSpecAPI):
     def __init__(self, rwid, alu):
         """RegSpecAPI
 
         * :rwid:       regspec
         * :alu:        ALU covered by this regspec
         """
-        self.rwid = rwid
-        self.alu = alu # actual ALU - set as a "submodule" of the CU
+        super().__init__(rwid)
+        self.alu = alu
 
     def get_out(self, i):
         if isinstance(self.rwid, int): # old - testing - API (rwid is int)
             return self.alu.out[i]
-        # regspec-based API: look up variable through regspec according to row number
-        return getattr(self.alu.n.data_o, self.rwid[1][i][1])
+        # regspec-based API: look up variable through regspec thru row number
+        return getattr(self.alu.n.data_o, self.get_out_name(i))
 
     def get_in(self, i):
         if isinstance(self.rwid, int): # old - testing - API (rwid is int)
             return self.alu.i[i]
-        # regspec-based API: look up variable through regspec according to row number
-        return getattr(self.alu.p.data_i, self.rwid[0][i][1])
+        # regspec-based API: look up variable through regspec thru row number
+        return getattr(self.alu.p.data_i, self.get_in_name(i))
 
     def get_op(self):
         if isinstance(self.rwid, int): # old - testing - API (rwid is int)