(no commit message)

[libreriscv.git] / openpower / sv_analysis.py

diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py
index fb56ff424074bd4a92d79fc14db39db8a5b08d76..487602312b0680fd6820017bb1a15d2f147345e1 100644 (file)
--- a/openpower/sv_analysis.py
+++ b/openpower/sv_analysis.py
@@ -183,6 +183,8 @@ def process_csvs():
 
     # Ignore those containing: valid test sprs
     for fname in glob(pth):
+        if '-' in fname:
+            continue
         if 'valid' in fname:
             continue
         if 'test' in fname:
@@ -447,6 +449,18 @@ def process_csvs():
                 elif regs == ['RS','','','RA','','']:
                     res['0'] = 'd:RA' # RA: Rdest1_EXTRA3
                     res['1'] = 's:RS' # RS: Rsrc1_EXTRA3
+                elif regs == ['','FRB','','FRT','0','CR1']:
+                    res['0'] = 'd:FRT,d:CR1' # FRT,CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                elif regs == ['','FRB','','','','CR1']:
+                    res['0'] = 'd:CR1' # CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRB' # FRA: Rsrc1_EXTRA3
+                elif regs == ['','FRB','','','','BF']:
+                    res['0'] = 'd:BF' # BF: Rdest1_EXTRA3
+                    res['1'] = 's:FRB' # FRA: Rsrc1_EXTRA3
+                elif regs == ['','FRB','','FRT','','CR1']:
+                    res['0'] = 'd:FRT,d:CR1' # FRT,CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRB' # FRB: Rsrc1_EXTRA3
                 else:
                     res['0'] = 'TODO'
 
@@ -456,6 +470,23 @@ def process_csvs():
                     res['0'] = 'd:BT' # BT: Rdest1_EXTRA3
                     res['1'] = 's:BA' # BA: Rsrc1_EXTRA3
                     res['2'] = 's:BB' # BB: Rsrc2_EXTRA3
+                elif regs == ['FRA','','FRC','FRT','','CR1']:
+                    res['0'] = 'd:FRT,d:CR1' # FRT,CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                    res['2'] = 's:FRC' # FRC: Rsrc1_EXTRA3
+                # should be for fcmp
+                elif regs == ['FRA','FRB','','','','BF']:
+                    res['0'] = 'd:BF' # BF: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                    res['2'] = 's:FRB' # FRB: Rsrc1_EXTRA3
+                elif regs == ['FRA','FRB','','FRT','','']:
+                    res['0'] = 'd:FRT' # FRT: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                    res['2'] = 's:FRB' # FRB: Rsrc1_EXTRA3
+                elif regs == ['FRA','FRB','','FRT','','CR1']:
+                    res['0'] = 'd:FRT,d:CR1' # FRT,CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                    res['2'] = 's:FRB' # FRB: Rsrc1_EXTRA3
                 elif name == '2R-1W' or insn_name == 'cmpb': # cmpb
                     if insn_name in ['bpermd', 'cmpb']:
                         res['0'] = 'd:RA' # RA: Rdest1_EXTRA3
@@ -511,7 +542,7 @@ def process_csvs():
             #    del res[k]
             #if res['0'] != 'TODO':
             for k in res:
-                if res[k] == 'NONE':
+                if res[k] == 'NONE' or res[k] == '':
                     res[k] = '0'
             svp64[value].append(res)