sigh

diff --git a/openpower/opcode_regs_deduped.mdwn b/openpower/opcode_regs_deduped.mdwn
index db32e8aed8b2efb1abecea2feae576ff6a5adcfe..7234a0f44eb7c110587219c2a2a666b71b187cb3 100644 (file)
--- a/openpower/opcode_regs_deduped.mdwn
+++ b/openpower/opcode_regs_deduped.mdwn
@@ -24,6 +24,7 @@ created by http://libre-soc.org/openpower/sv_analysis.py
 | CRio | RM-2P-1S1D  |
 | CR=2R1W | RM-1P-2S1D  |
 | 1W | non-SV  |
+| 1W-imm | RM-1P-1D  |
 | 1W-CRo | RM-1P-1D  |
 | 1W-CRi | RM-2P-1S1D  |
 | 1W-CRi | RM-2P-1S1D  |
@@ -66,11 +67,12 @@ created by http://libre-soc.org/openpower/sv_analysis.py
 | OTHER | 0 | 0 | 1 | 1 |  |  |  CRio |
 | OTHER | 0 | 0 | 1 | 1 | 1 |  |  |  CR=2R1W |
 | OTHER | 0 | 1 | 0 | 0 |  |  |  1W |
+| OTHER | 0 | 1 | 0 | 0 | 1 | UI |  1W-imm |
 | OTHER | 0 | 1 | 0 | 1 |  |  |  1W-CRo |
 | OTHER | 0 | 1 | 1 | 0 |  |  |  1W-CRi |
 | OTHER | 0 | 1 | 1 | 0 | 1 | BD |  1W-CRi |
 | OTHER | 1 | 0 | 0 | 0 |  |  |  1R |
-| OTHER | 1 | 0 | 0 | 0 | 1 | SI/UI |  1R-imm |
+| OTHER | 1 | 0 | 0 | 0 | 1 | SI |  1R-imm |
 | OTHER | 1 | 0 | 0 | 1 |  |  |  1R-CRo |
 | OTHER | 1 | 0 | 0 | 1 | 1 | SI/UI |  1R-CRo |
 | OTHER | 1 | 0 | 1 | 1 |  |  |  1R-CRio |
@@ -317,6 +319,13 @@ created by http://libre-soc.org/openpower/sv_analysis.py
 | minor_31.csv | 0b0001010011 | mfmsr |  | X-Form |
 
 
+## 1W-imm (RM-1P-1D)
+
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_22.csv | -----00011- | fmvis |  | DX-Form |
+
+
 ## 1W-CRo (RM-1P-1D)
 
 | CSV | opcode | asm | flags | form |
@@ -356,7 +365,6 @@ created by http://libre-soc.org/openpower/sv_analysis.py
 | --- | ------ | --- | ----- | ---- |
 | major.csv | 2 | tdi |  | D-Form |
 | major.csv | 3 | twi |  | D-Form |
-| minor_22.csv | -----00011- | fmvis |  | DX-Form |
 
 
 ## 1R-CRo (RM-2P-1S1D)
@@ -694,6 +702,7 @@ created by http://libre-soc.org/openpower/sv_analysis.py
 * **CRo**: -
 * **CRio**: RM-2P-1S1D
 * **CR=2R1W**: RM-1P-2S1D
+* **1W-imm**: RM-1P-1D
 * **1W-CRo**: RM-1P-1D
 * **1W-CRi**: RM-2P-1S1D
 * **1W-CRi**: RM-2P-1S1D
@@ -1034,15 +1043,15 @@ created by http://libre-soc.org/openpower/sv_analysis.py
 
 | insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
 |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| fmvis | NORMAL |  | 1P | EXTRA3 | d:FRS | 0 | 0 | 0 | 0 | 0 | 0 | FRS | 0 | 0 | 0 |
 | svstep | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | 0 | 0 | 0 | 0 | 0 | 0 | RT | 0 | CR0 | 0 |
 
 ## RM-1P-1S
 
 | insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
 |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
-| tdi | NORMAL |  | 1P | EXTRA3 | 0 | 0 | 0 | 0 | RA | 0 | 0 | 0 | 0 | 0 | 0 |
-| twi | NORMAL |  | 1P | EXTRA3 | 0 | 0 | 0 | 0 | RA | 0 | 0 | 0 | 0 | 0 | 0 |
-| fmvis | NORMAL |  | 1P | EXTRA3 | s:FRS0 | 0 | 0 | 0 | FRS | 0 | 0 | 0 | 0 | 0 | 0 |
+| tdi | NORMAL |  | 1P | EXTRA2 | 0 | 0 | 0 | 0 | RA | 0 | 0 | 0 | 0 | 0 | 0 |
+| twi | NORMAL |  | 1P | EXTRA2 | 0 | 0 | 0 | 0 | RA | 0 | 0 | 0 | 0 | 0 | 0 |
 
 ## RM-2P-2S1D