X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fopenpower%2Fdecoder%2Fpower_regspec_map.py;h=71fbb2823961976574dd9c596eac761b4278086b;hb=9c5a0f34f35a3f8f803a425b28160365d42dfcbb;hp=0266e3f8bda51263b71e66a23bb7c000575ea40c;hpb=8291fd939f60681b32607cc3d41ca46834e6926f;p=openpower-isa.git

diff --git a/src/openpower/decoder/power_regspec_map.py b/src/openpower/decoder/power_regspec_map.py
index 0266e3f8..71fbb282 100644
--- a/src/openpower/decoder/power_regspec_map.py
+++ b/src/openpower/decoder/power_regspec_map.py
@@ -104,18 +104,20 @@ def regspec_decode_read(m, e, regfile, name):
         SVSTATE = 1<<StateRegsEnum.SVSTATE
         if name in ['cia', 'nia']:
             # TODO: detect read-conditions
-            rd = RegDecodeInfo(Const(1), PC, 3)
+            rd = RegDecodeInfo(Const(1), PC, 5)
         if name == 'msr':
             # TODO: detect read-conditions
-            rd = RegDecodeInfo(Const(1), MSR, 3)
+            rd = RegDecodeInfo(Const(1), MSR, 5)
         if name == 'svstate':
             # TODO: detect read-conditions
-            rd = RegDecodeInfo(Const(1), SVSTATE, 3)
+            rd = RegDecodeInfo(Const(1), SVSTATE, 5)
+        if name == 'state1':
+            rd = RegDecodeInfo(e.read_state1.ok, 1<<e.read_state1.data, 5)
 
     # FAST regfile
 
     if regfile == 'FAST':
-        # FAST register numbering is *unary* encoded
+        # FAST register numbering is *binary* encoded
         if name == 'fast1':
             rd = RegDecodeInfo(e.read_fast1.ok, e.read_fast1.data, 4)
         if name == 'fast2':
@@ -146,15 +148,16 @@ def regspec_decode_write(m, e, regfile, name):
     """
 
     #log("regspec_decode_write", regfile, name, e.__class__.__name__)
+    wr = None
 
     # INT regfile
 
     if regfile == 'INT':
         # Int register numbering is *unary* encoded
         if name == 'o': # RT
-            rd = RegDecodeInfo(e.write_reg.ok, e.write_reg.data, 5)
+            wr = RegDecodeInfo(e.write_reg.ok, e.write_reg.data, 5)
         if name == 'o1': # RA (update mode: LD/ST EA)
-            rd = RegDecodeInfo(e.write_ea.ok, e.write_ea.data, 5)
+            wr = RegDecodeInfo(e.write_ea.ok, e.write_ea.data, 5)
 
     # CR regfile
 
@@ -162,10 +165,10 @@ def regspec_decode_write(m, e, regfile, name):
         # CRRegs register numbering is *unary* encoded
         # *sigh*.  numbering inverted on part-CRs.  because POWER.
         if name == 'full_cr': # full CR (from FXM field)
-            rd = RegDecodeInfo(e.do.write_cr_whole.ok,
+            wr = RegDecodeInfo(e.do.write_cr_whole.ok,
                                  e.do.write_cr_whole.data, 8)
         if name == 'cr_a': # CR A
-            rd = RegDecodeInfo(e.write_cr.ok,
+            wr = RegDecodeInfo(e.write_cr.ok,
                                1<<(7-e.write_cr.data), 8)
 
     # XER regfile
@@ -176,13 +179,13 @@ def regspec_decode_write(m, e, regfile, name):
         CA = 1<<XERRegsEnum.CA
         OV = 1<<XERRegsEnum.OV
         if name == 'xer_so':
-            rd = RegDecodeInfo(e.xer_out | (e.do.oe.oe[0] & e.do.oe.ok),
+            wr = RegDecodeInfo(e.xer_out | (e.do.oe.oe[0] & e.do.oe.ok),
                                     SO, 3) # hmmm
         if name == 'xer_ov':
-            rd = RegDecodeInfo(e.xer_out | (e.do.oe.oe[0] & e.do.oe.ok),
+            wr = RegDecodeInfo(e.xer_out | (e.do.oe.oe[0] & e.do.oe.ok),
                                     OV, 3) # hmmm
         if name == 'xer_ca':
-            rd = RegDecodeInfo(e.xer_out | (e.do.output_carry),
+            wr = RegDecodeInfo(e.xer_out | (e.do.output_carry),
                                     CA, 3) # hmmm
 
     # STATE regfile
@@ -193,33 +196,45 @@ def regspec_decode_write(m, e, regfile, name):
         MSR = 1<<StateRegsEnum.MSR
         SVSTATE = 1<<StateRegsEnum.SVSTATE
         if name in ['cia', 'nia']:
-            rd = RegDecodeInfo(None, PC, 3) # hmmm
+            wr = RegDecodeInfo(None, PC, 5) # hmmm
         if name == 'msr':
-            rd = RegDecodeInfo(None, MSR, 3) # hmmm
+            wr = RegDecodeInfo(None, MSR, 5) # hmmm
         if name == 'svstate':
-            rd = RegDecodeInfo(None, SVSTATE, 3) # hmmm
+            wr = RegDecodeInfo(None, SVSTATE, 5) # hmmm
+        if name == 'state1':
+            wr = RegDecodeInfo(e.write_state1.ok, 1<<e.write_state1.data, 5)
 
     # FAST regfile
 
     if regfile == 'FAST':
-        # FAST register numbering is *unary* encoded
+        # FAST register numbering is *binary* encoded
         if name == 'fast1':
-            rd = RegDecodeInfo(e.write_fast1.ok, e.write_fast1.data, 4)
+            wr = RegDecodeInfo(e.write_fast1.ok, e.write_fast1.data, 4)
         if name == 'fast2':
-            rd = RegDecodeInfo(e.write_fast2.ok, e.write_fast2.data, 4)
+            wr = RegDecodeInfo(e.write_fast2.ok, e.write_fast2.data, 4)
         if name == 'fast3':
-            rd = RegDecodeInfo(e.write_fast3.ok, e.write_fast3.data, 4)
+            wr = RegDecodeInfo(e.write_fast3.ok, e.write_fast3.data, 4)
 
     # SPR regfile
 
     if regfile == 'SPR':
         # SPR register numbering is *binary* encoded
         if name == 'spr1': # SPR1
-            rd = RegDecodeInfo(e.write_spr.ok, e.write_spr.data, 10)
+            wr = RegDecodeInfo(e.write_spr.ok, e.write_spr.data, 10)
 
-    assert rd is not None, "regspec not found %s %s" % (regfile, name)
+    assert wr is not None, "regspec not found %s %s" % (regfile, name)
+
+    rname="wr_decode_%s_%s" % (regfile, name)
+    if wr.okflag is not None:
+        ok = Signal(name=rname+"_ok", reset_less=True)
+        m.d.comb += ok.eq(wr.okflag)
+    else:
+        # XXX urrrr, really do have to deal with this some time
+        ok = None
+    data = Signal(wr.portlen, name=rname+"_port", reset_less=True)
+    m.d.comb += data.eq(wr.regport)
 
-    return rd
+    return RegDecodeInfo(ok, data, wr.portlen)
 
 
 def regspec_decode(m, readmode, e, regfile, name):