add imm/CRio forms

diff --git a/openpower/opcode_regs_deduped.mdwn b/openpower/opcode_regs_deduped.mdwn
index 85e192c55f145f6164633ec43a08bc42a172a319..9939aa1f9d210b405a133b4adcc949483c2f3e57 100644 (file)
--- a/openpower/opcode_regs_deduped.mdwn
+++ b/openpower/opcode_regs_deduped.mdwn
@@ -14,7 +14,7 @@ LDST-3R-1W | - |
 imm | - |
 CRi | - |
 CRi | - |
-CRio | - |
+CRio | R |
 1W | - |
 1W-CRi | - |
 1R | - |
@@ -22,7 +22,7 @@ CRio | - |
 1R-CRo | - |
 1R-CRio | - |
 1R-1W | R |
-1R-1W-imm | - |
+1R-1W-imm | I |
 1R-1W-CRo | R |
 1R-1W-CRo | R |
 1R-1W-CRio | R |

diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py
index 783af9b416e419aa085cd8574ebbbd894e02e482..fe4744250735940cdecbd6c72193ed4e617534ac 100644 (file)
--- a/openpower/sv_analysis.py
+++ b/openpower/sv_analysis.py
@@ -133,6 +133,9 @@ def keyname(row):
     if row['outcnt'] != '0':
         res.append('%sW' % row['outcnt'])
     if row['CR in'] == '1' and row['CR out'] == '1':
+        #if row['comment'].startswith('cr'):
+        #    res.append("CR-2io")
+        #else:
         res.append("CRio")
     elif row['CR in'] == '1':
         res.append("CRi")
@@ -193,8 +196,9 @@ def process_csvs():
               '1R-1W-CRio': 'R',
               '1R-1W-CRo': 'R',
               '1R-1W': 'R',
-              '1R-1W': 'R',
+              '1R-1W-imm': 'I',
               '1R-Imm': 'U',
+              'CRio': 'R',
               'LDST-2R-imm': 'S',
               'LDST-2R-1W-imm': 'S',
               'LDST-1R-1W-imm': 'I',