rename regspecs to give a consistent naming scheme

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

diff --git a/src/soc/fu/trap/pipe_data.py b/src/soc/fu/trap/pipe_data.py
index de930da318b94ab6be0686fffac360e134a60839..8b4e343a525cbfd041155dfcdc69843e25f9201a 100644 (file)
--- a/src/soc/fu/trap/pipe_data.py
+++ b/src/soc/fu/trap/pipe_data.py
@@ -7,53 +7,63 @@ from soc.fu.alu.alu_input_record import CompALUOpSubset # TODO: replace
 
 
 class TrapInputData(IntegerData):
-    regspec = [('INT', 'a', '0:63'),
-               ('INT', 'b', '0:63'),
-               ('PC', 'cia', '0:63'),
-               ('MSR', 'msr', '0:63')]
+    regspec = [('INT', 'ra', '0:63'),
+               ('INT', 'rb', '0:63'),
+               ('FAST', 'spr1', '0:63'),
+               ('FAST', 'cia', '0:63'),
+               ('FAST', 'msr', '0:63')]
     def __init__(self, pspec):
         super().__init__(pspec)
-        self.a = Signal(64, reset_less=True)  # RA
-        self.b = Signal(64, reset_less=True)  # RB/immediate
+        self.ra = Signal(64, reset_less=True)  # RA
+        self.rb = Signal(64, reset_less=True)  # RB/immediate
+        self.spr1 = Data(64, name="spr1") # SRR0
         self.cia = Signal(64, reset_less=True)  # Program counter
         self.msr = Signal(64, reset_less=True)  # MSR
+        # convenience
+        self.srr0, self.a, self.b = self.spr1, self.ra, self.rb
 
     def __iter__(self):
         yield from super().__iter__()
-        yield self.a
-        yield self.b
+        yield self.ra
+        yield self.rb
+        yield self.spr1
         yield self.cia
         yield self.msr
 
     def eq(self, i):
         lst = super().eq(i)
-        return lst + [self.a.eq(i.a), self.b.eq(i.b),
-                      self.cia.eq(i.nia), self.msr.eq(i.msr)]
+        return lst + [self.ra.eq(i.ra), self.rb.eq(i.rb), self.spr1.eq(i.spr1),
+                      self.cia.eq(i.cia), self.msr.eq(i.msr)]
 
 
 class TrapOutputData(IntegerData):
-    regspec = [('SPR', 'srr0', '0:63'),
-               ('SPR', 'srr1', '0:63'),
-               ('PC', 'nia', '0:63'),
-               ('MSR', 'msr', '0:63')]
+    regspec = [('INT', 'o', '0:63'),
+               ('FAST', 'spr1', '0:63'),
+               ('FAST', 'spr2', '0:63'),
+               ('FAST', 'nia', '0:63'),
+               ('FAST', 'msr', '0:63')]
     def __init__(self, pspec):
         super().__init__(pspec)
-        self.srr0 = Data(64, name="srr0") # SRR0 SPR
-        self.srr1 = Data(64, name="srr1") # SRR1 SPR
+        self.o = Data(64, name="o")       # RA
+        self.spr1 = Data(64, name="spr1") # SRR0 SPR
+        self.spr2 = Data(64, name="spr2") # SRR1 SPR
         self.nia = Data(64, name="nia") # NIA (Next PC)
-        self.msr = Signal(64, reset_less=True) # MSR
+        self.msr = Data(64, name="msr") # MSR
+        # convenience
+        self.srr0, self.srr1 = self.spr1, self.spr2
 
     def __iter__(self):
         yield from super().__iter__()
+        yield self.o
         yield self.nia
         yield self.msr
-        yield self.srr0
-        yield self.srr1
+        yield self.spr1
+        yield self.spr2
 
     def eq(self, i):
         lst = super().eq(i)
-        return lst + [ self.nia.eq(i.nia), self.msr.eq(i.msr),
-                      self.srr0.eq(i.srr0), self.srr1.eq(i.srr1)]
+        return lst + [ self.o.eq(i.o), self.nia.eq(i.nia), self.msr.eq(i.msr),
+                      self.spr1.eq(i.spr1), self.spr2.eq(i.spr2)]
 
 
 # TODO: replace CompALUOpSubset with CompTrapOpSubset