X-Git-Url: https://git.libre-soc.org/?p=soc.git;a=blobdiff_plain;f=src%2Fsoc%2Fdecoder%2Fpower_svp64.py;h=26e782b390b2bfd0c507089e66de541ea00c0bad;hp=32498f954566d25cde49a688ad0bcac248067ba7;hb=b6fdac253479a66f25fbb33f34f07c18ce7d222b;hpb=5fe6c7100c747517dc6f5d2a81fe7b649df108ef

diff --git a/src/soc/decoder/power_svp64.py b/src/soc/decoder/power_svp64.py
index 32498f95..26e782b3 100644
--- a/src/soc/decoder/power_svp64.py
+++ b/src/soc/decoder/power_svp64.py
@@ -61,12 +61,23 @@ def decode_extra(rm, prefix=''):
 
 # gets SVP64 ReMap information
 class SVP64RM:
-    def __init__(self):
+    def __init__(self, microwatt_format=False):
+        """SVP64RM: gets micro-opcode information
+
+        microwatt_format: moves RS to in1 (to match decode1.vhdl)
+        """
         self.instrs = {}
+        self.svp64_instrs = {}
         pth = find_wiki_dir()
         for fname in os.listdir(pth):
             if fname.startswith("RM") or fname.startswith("LDSTRM"):
                 for entry in get_csv(fname):
+                    if microwatt_format:
+                        # move RS from position 1 to position 3, to match
+                        # microwatt decode1.vhdl format
+                        if entry['in1'] == 'RS' and entry['in3'] == 'NONE':
+                            entry['in1'] = 'NONE'
+                            entry['in3'] = 'RS'
                     self.instrs[entry['insn']] = entry
 
 
@@ -76,10 +87,17 @@ class SVP64RM:
 
         # now add the RM fields (for each instruction)
         for entry in v30b:
+            # *sigh* create extra field "out2" based on LD/ST update
+            entry['out2'] = 'NONE'
+            if entry['upd'] == '1':
+                entry['out2'] = 'RA'
             # dummy (blank) fields, first
             entry.update({'EXTRA0': '0', 'EXTRA1': '0', 'EXTRA2': '0',
                           'EXTRA3': '0',
-                          'SV_Ptype': 'NONE', 'SV_Etype': 'NONE'})
+                          'SV_Ptype': 'NONE', 'SV_Etype': 'NONE',
+                          'sv_cr_in': 'NONE', 'sv_cr_out': 'NONE'})
+            for fname in ['in1', 'in2', 'in3', 'out', 'out2']:
+                entry['sv_%s' % fname] = 'NONE'
 
             # is this SVP64-augmented?
             asmcode = entry['comment']
@@ -99,43 +117,58 @@ class SVP64RM:
             dest_reg_cr, src_reg_cr, svp64_src, svp64_dest = decode
 
             # now examine in1/2/3/out, create sv_in1/2/3/out
-            for fname in ['in1', 'in2', 'in3', 'out']:
+            for fname in ['in1', 'in2', 'in3', 'out', 'out2']:
                 regfield = entry[fname]
                 extra_index = None
                 if regfield == 'RA_OR_ZERO':
                     regfield = 'RA'
                 print (asmcode, regfield, fname, svp64_dest, svp64_src)
                 # find the reg in the SVP64 extra map
-                if (fname == 'out' and regfield in svp64_dest):
+                if (fname in ['out', 'out2'] and regfield in svp64_dest):
                     extra_index = svp64_dest[regfield]
-                if (fname != 'out' and regfield in svp64_src):
+                if (fname not in ['out', 'out2'] and regfield in svp64_src):
                     extra_index = svp64_src[regfield]
                 # ta-daa, we know in1/2/3/out's bit-offset
-                entry['sv_%s' % fname] = extra_index
+                if extra_index is not None:
+                    entry['sv_%s' % fname] = "Idx"+str(extra_index)
 
             # TODO: CRs a little tricky, the power_enums.CRInSel is a bit odd.
             # ignore WHOLE_REG for now
             cr_in = entry['CR in']
-            extra_index = None
+            extra_index = 'NONE'
             if cr_in in svp64_src:
-                entry['sv_cr_in'] = svp64_src[cr_in]
+                entry['sv_cr_in'] = "Idx"+str(svp64_src[cr_in])
             elif cr_in == 'BA_BB':
                 index1 = svp64_src.get('BA', None)
                 index2 = svp64_src.get('BB', None)
-                entry['sv_cr_in'] = (index1, index2)
+                entry['sv_cr_in'] = "Idx_%d_%d" % (index1, index2)
 
             # CRout a lot easier.  ignore WHOLE_REG for now
             cr_out = entry['CR out']
-            entry['sv_cr_out'] = svp64_dest.get(cr_out, None)
+            extra_index = svp64_dest.get(cr_out, None)
+            if extra_index is not None:
+                entry['sv_cr_out'] = 'Idx%d' % extra_index
+
+            # more enum-friendly Ptype names.  should have done this in
+            # sv_analysis.py, oh well
+            if entry['SV_Ptype'] == '1P':
+                entry['SV_Ptype'] = 'P1'
+            if entry['SV_Ptype'] == '2P':
+                entry['SV_Ptype'] = 'P2'
+            self.svp64_instrs[asmcode] = entry
 
         return v30b
 
 if __name__ == '__main__':
     isa = SVP64RM()
-    minor_30 = isa.get_svp64_csv("minor_30.csv")
-    for entry in minor_30:
-        print (entry)
+    minor_31 = isa.get_svp64_csv("minor_31.csv")
+    for entry in minor_31:
+        if entry['comment'].startswith('ldu'):
+            print ("entry", entry)
     minor_19 = isa.get_svp64_csv("minor_19.csv")
     for entry in minor_19:
         if entry['comment'].startswith('cr'):
             print (entry)
+    minor_31 = isa.get_svp64_csv("minor_31.csv")
+    for entry in minor_31:
+        print (entry)