add option to move RS in CSV file reading, for compatibility with microwatt

decode1.vhdl;

diff --git a/src/soc/decoder/power_svp64.py b/src/soc/decoder/power_svp64.py
index 43794ed7b186be8fbc20943798fe10f9b762ff13..bc712af20928f8284221f634a0a9d7a987b0f438 100644 (file)
--- a/src/soc/decoder/power_svp64.py
+++ b/src/soc/decoder/power_svp64.py
@@ -61,13 +61,23 @@ def decode_extra(rm, prefix=''):
 
 # gets SVP64 ReMap information
 class SVP64RM:
 
 # 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):
         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
 
 
                     self.instrs[entry['insn']] = entry