redo opcodes_reg_deduped.mdwn to explicit table contents

diff --git a/openpower/opcode_regs_deduped.mdwn b/openpower/opcode_regs_deduped.mdwn
index dcb3bcdebcd154860b2c34d7d161d65becb4da3f..90333d92588570e4b18895dd4a7c906abb501115 100644 (file)
--- a/openpower/opcode_regs_deduped.mdwn
+++ b/openpower/opcode_regs_deduped.mdwn
@@ -1,602 +1,698 @@
-# OpenPOWER ISA register 'profile's
+# Draft SVP64 Power ISA register 'profile's
 
 this page is auto-generated, do not edit
 created by http://libre-soc.org/openpower/sv_analysis.py
 
 # map to old SV Prefix
 
-[[!table  data="""
-LDST-1R-1W-imm | LDSTRM-2P-1S1D  |
-LDST-1R-2W-imm | LDSTRM-2P-1S2D  |
-LDST-2R-imm | LDSTRM-2P-2S  |
-LDST-2R-1W | LDSTRM-2P-2S1D  |
-LDST-2R-1W-imm | LDSTRM-2P-2S1D  |
-LDST-2R-2W | LDSTRM-2P-2S1D  |
-LDST-3R | LDSTRM-2P-3S  |
-LDST-3R-CRo | LDSTRM-2P-3S  |
-LDST-3R-1W | LDSTRM-2P-2S1D  |
- | non-SV  |
-imm | non-SV  |
-CRo | -  |
-CRio | RM-2P-1S1D  |
-CR=2R1W | RM-1P-2S1D  |
-1W | non-SV  |
-1W-CRi | RM-2P-1S1D  |
-1R | non-SV  |
-1R-imm | non-SV  |
-1R-CRo | RM-2P-1S1D  |
-1R-CRo | RM-2P-1S1D  |
-1R-CRio | RM-2P-2S1D  |
-1R-1W | RM-2P-1S1D  |
-1R-1W-imm | RM-2P-1S1D  |
-1R-1W-CRo | RM-2P-1S1D  |
-1R-1W-CRo | RM-2P-1S1D  |
-2R | non-SV  |
-2R-CRo | RM-1P-2S1D  |
-2R-1W | RM-1P-2S1D  |
-2R-1W-CRo | RM-1P-2S1D  |
-2R-1W-CRo | RM-1P-2S1D  |
-2R-1W-CRi | RM-1P-3S1D  |
-3R-1W-CRo | -  |
-3R-1W-CRio | RM-1P-3S1D  |
-"""]]
+|internal key | public name |
+|-----        | ----------  |
+| LDST-1R-1W-imm | LDSTRM-2P-1S1D  |
+| LDST-1R-2W-imm | LDSTRM-2P-1S2D  |
+| LDST-2R | -  |
+| LDST-2R-imm | LDSTRM-2P-2S  |
+| LDST-2R-1W | LDSTRM-2P-2S1D  |
+| LDST-2R-1W-imm | LDSTRM-2P-2S1D  |
+| LDST-2R-2W | LDSTRM-2P-2S1D  |
+| LDST-2R-2W-imm | -  |
+| LDST-3R | LDSTRM-2P-3S  |
+| LDST-3R-CRo | LDSTRM-2P-3S  |
+| LDST-3R-1W | LDSTRM-2P-2S1D  |
+|  | non-SV  |
+| imm | non-SV  |
+| CRo | -  |
+| CRio | RM-2P-1S1D  |
+| CR=2R1W | RM-1P-2S1D  |
+| 1W | non-SV  |
+| 1W-CRo | RM-1P-1D  |
+| 1W-CRi | RM-2P-1S1D  |
+| 1W-CRi | RM-2P-1S1D  |
+| 1R | non-SV  |
+| 1R-imm | non-SV  |
+| 1R-CRo | RM-2P-1S1D  |
+| 1R-CRo | RM-2P-1S1D  |
+| 1R-CRio | RM-2P-2S1D  |
+| 1R-1W | RM-2P-1S1D  |
+| 1R-1W-imm | RM-2P-1S1D  |
+| 1R-1W-CRo | RM-2P-1S1D  |
+| 1R-1W-CRo | RM-2P-1S1D  |
+| 2R | non-SV  |
+| 2R-CRo | RM-1P-2S1D  |
+| 2R-1W | RM-1P-2S1D  |
+| 2R-1W-CRo | RM-1P-2S1D  |
+| 2R-1W-CRo | RM-1P-2S1D  |
+| 2R-1W-CRi | RM-1P-3S1D  |
+| 3R-1W-CRo | RM-1P-3S1D  |
+
 
 # keys
 
-[[!table  data="""
-unit | in | outcnt | CR in | CR out | imm | imms | name |
-LDST | 1 | 1 | 0 | 0 | 1 | DS/SI |  LDST-1R-1W-imm |
-LDST | 1 | 2 | 0 | 0 | 1 | DS/SI |  LDST-1R-2W-imm |
-LDST | 2 | 0 | 0 | 0 | 1 | DS/SI |  LDST-2R-imm |
-LDST | 2 | 1 | 0 | 0 |  |  |  LDST-2R-1W |
-LDST | 2 | 1 | 0 | 0 | 1 | DS/SI |  LDST-2R-1W-imm |
-LDST | 2 | 2 | 0 | 0 |  |  |  LDST-2R-2W |
-LDST | 3 | 0 | 0 | 0 |  |  |  LDST-3R |
-LDST | 3 | 0 | 0 | 1 |  |  |  LDST-3R-CRo |
-LDST | 3 | 1 | 0 | 0 |  |  |  LDST-3R-1W |
-OTHER | 0 | 0 | 0 | 0 |  |  |   |
-OTHER | 0 | 0 | 0 | 0 | 1 | LI |  imm |
-OTHER | 0 | 0 | 0 | 1 |  |  |  CRo |
-OTHER | 0 | 0 | 1 | 1 |  |  |  CRio |
-OTHER | 0 | 0 | 1 | 1 | 1 |  |  |  CR=2R1W |
-OTHER | 0 | 1 | 0 | 0 |  |  |  1W |
-OTHER | 0 | 1 | 1 | 0 |  |  |  1W-CRi |
-OTHER | 1 | 0 | 0 | 0 |  |  |  1R |
-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 |
-OTHER | 1 | 1 | 0 | 0 |  |  |  1R-1W |
-OTHER | 1 | 1 | 0 | 0 | 1 | SI/UI |  1R-1W-imm |
-OTHER | 1 | 1 | 0 | 1 |  |  |  1R-1W-CRo |
-OTHER | 1 | 1 | 0 | 1 | 1 | M1/SH/SH32/SI/UI |  1R-1W-CRo |
-OTHER | 2 | 0 | 0 | 0 |  |  |  2R |
-OTHER | 2 | 0 | 0 | 1 |  |  |  2R-CRo |
-OTHER | 2 | 1 | 0 | 0 |  |  |  2R-1W |
-OTHER | 2 | 1 | 0 | 1 |  |  |  2R-1W-CRo |
-OTHER | 2 | 1 | 0 | 1 | 1 | SH/SH32 |  2R-1W-CRo |
-OTHER | 2 | 1 | 1 | 0 |  |  |  2R-1W-CRi |
-OTHER | 3 | 1 | 0 | 1 |  |  |  3R-1W-CRo |
-OTHER | 3 | 1 | 1 | 1 |  |  |  3R-1W-CRio |
-"""]]
+| unit | in | outcnt | CR in | CR out | imm | imms | name |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| LDST | 1 | 1 | 0 | 0 | 1 | DS/SI |  LDST-1R-1W-imm |
+| LDST | 1 | 2 | 0 | 0 | 1 | DS/SI |  LDST-1R-2W-imm |
+| LDST | 2 | 0 | 0 | 0 |  |  |  LDST-2R |
+| LDST | 2 | 0 | 0 | 0 | 1 | DS/SI |  LDST-2R-imm |
+| LDST | 2 | 1 | 0 | 0 |  |  |  LDST-2R-1W |
+| LDST | 2 | 1 | 0 | 0 | 1 | DS/SI/SVD |  LDST-2R-1W-imm |
+| LDST | 2 | 2 | 0 | 0 |  |  |  LDST-2R-2W |
+| LDST | 2 | 2 | 0 | 0 | 1 | SVD |  LDST-2R-2W-imm |
+| LDST | 3 | 0 | 0 | 0 |  |  |  LDST-3R |
+| LDST | 3 | 0 | 0 | 1 |  |  |  LDST-3R-CRo |
+| LDST | 3 | 1 | 0 | 0 |  |  |  LDST-3R-1W |
+| OTHER | 0 | 0 | 0 | 0 |  |  |   |
+| OTHER | 0 | 0 | 0 | 0 | 1 | LI |  imm |
+| OTHER | 0 | 0 | 0 | 1 |  |  |  CRo |
+| OTHER | 0 | 0 | 1 | 1 |  |  |  CRio |
+| OTHER | 0 | 0 | 1 | 1 | 1 |  |  |  CR=2R1W |
+| OTHER | 0 | 1 | 0 | 0 |  |  |  1W |
+| 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 |  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 |
+| OTHER | 1 | 1 | 0 | 0 |  |  |  1R-1W |
+| OTHER | 1 | 1 | 0 | 0 | 1 | SI/UI |  1R-1W-imm |
+| OTHER | 1 | 1 | 0 | 1 |  |  |  1R-1W-CRo |
+| OTHER | 1 | 1 | 0 | 1 | 1 | M1/SH/SH32/SI/UI/XBI |  1R-1W-CRo |
+| OTHER | 2 | 0 | 0 | 0 |  |  |  2R |
+| OTHER | 2 | 0 | 0 | 1 |  |  |  2R-CRo |
+| OTHER | 2 | 1 | 0 | 0 |  |  |  2R-1W |
+| OTHER | 2 | 1 | 0 | 1 |  |  |  2R-1W-CRo |
+| OTHER | 2 | 1 | 0 | 1 | 1 | SH/SH32 |  2R-1W-CRo |
+| OTHER | 2 | 1 | 1 | 0 |  |  |  2R-1W-CRi |
+| OTHER | 3 | 1 | 0 | 1 |  |  |  3R-1W-CRo |
+
 
 ## LDST-1R-1W-imm (LDSTRM-2P-1S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 32 | lwz | D-Form |
-major.csv | 34 | lbz | D-Form |
-major.csv | 40 | lhz | D-Form |
-major.csv | 42 | lha | D-Form |
-minor_58.csv | 0 | ld | DS-Form |
-minor_58.csv | 2 | lwa | DS-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 32 | lwz | ~SVP64BREV | D-Form |
+| major.csv | 34 | lbz | ~SVP64BREV | D-Form |
+| major.csv | 40 | lhz | ~SVP64BREV | D-Form |
+| major.csv | 42 | lha | ~SVP64BREV | D-Form |
+| major.csv | 48 | lfs | ~SVP64BREV | D-Form |
+| major.csv | 50 | lfd | ~SVP64BREV | D-Form |
+| minor_58.csv | 0 | ld |  | DS-Form |
+| minor_58.csv | 2 | lwa |  | DS-Form |
+
 
 ## LDST-1R-2W-imm (LDSTRM-2P-1S2D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 33 | lwzu | D-Form |
-major.csv | 35 | lbzu | D-Form |
-major.csv | 41 | lhzu | D-Form |
-major.csv | 43 | lhau | D-Form |
-minor_58.csv | 1 | ldu | DS-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 33 | lwzu | ~SVP64BREV | D-Form |
+| major.csv | 35 | lbzu | ~SVP64BREV | D-Form |
+| major.csv | 41 | lhzu | ~SVP64BREV | D-Form |
+| major.csv | 43 | lhau | ~SVP64BREV | D-Form |
+| major.csv | 49 | lfsu | ~SVP64BREV | D-Form |
+| major.csv | 51 | lfdu | ~SVP64BREV | D-Form |
+| minor_58.csv | 1 | ldu |  | DS-Form |
+
+
+## LDST-2R (-)
+
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b1111110110 | dcbz |  | X-Form |
+
 
 ## LDST-2R-imm (LDSTRM-2P-2S)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 36 | stw | D-Form |
-major.csv | 38 | stb | D-Form |
-major.csv | 44 | sth | D-Form |
-minor_62.csv | 0 | std | DS-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 36 | stw |  | D-Form |
+| major.csv | 38 | stb |  | D-Form |
+| major.csv | 44 | sth |  | D-Form |
+| major.csv | 52 | stfs |  | D-Form |
+| major.csv | 54 | stfd |  | D-Form |
+| minor_62.csv | 0 | std |  | DS-Form |
+
 
 ## LDST-2R-1W (LDSTRM-2P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0000010100 | lwarx | X-Form |
-minor_31.csv | 0b0000010101 | ldx | X-Form |
-minor_31.csv | 0b0000010111 | lwzx | X-Form |
-minor_31.csv | 0b0000110100 | lbarx | X-Form |
-minor_31.csv | 0b0001010100 | ldarx | X-Form |
-minor_31.csv | 0b0001010111 | lbzx | X-Form |
-minor_31.csv | 0b0001110100 | lharx | X-Form |
-minor_31.csv | 0b0100010111 | lhzx | X-Form |
-minor_31.csv | 0b0101010101 | lwax | X-Form |
-minor_31.csv | 0b0101010111 | lhax | X-Form |
-minor_31.csv | 0b1000010100 | ldbrx | X-Form |
-minor_31.csv | 0b1000010110 | lwbrx | X-Form |
-minor_31.csv | 0b1100010101 | lwzcix | X-Form |
-minor_31.csv | 0b1100010110 | lhbrx | X-Form |
-minor_31.csv | 0b1100110101 | lhzcix | X-Form |
-minor_31.csv | 0b1101010101 | lbzcix | X-Form |
-minor_31.csv | 0b1101110101 | ldcix | X-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0000010100 | lwarx |  | X-Form |
+| minor_31.csv | 0b0000010101 | ldx |  | X-Form |
+| minor_31.csv | 0b0000010111 | lwzx |  | X-Form |
+| minor_31.csv | 0b0000110100 | lbarx |  | X-Form |
+| minor_31.csv | 0b0001010100 | ldarx |  | X-Form |
+| minor_31.csv | 0b0001010111 | lbzx |  | X-Form |
+| minor_31.csv | 0b0001110100 | lharx |  | X-Form |
+| minor_31.csv | 0b0100010111 | lhzx |  | X-Form |
+| minor_31.csv | 0b0101010101 | lwax |  | X-Form |
+| minor_31.csv | 0b0101010111 | lhax |  | X-Form |
+| minor_31.csv | 0b1000010100 | ldbrx |  | X-Form |
+| minor_31.csv | 0b1000010110 | lwbrx |  | X-Form |
+| minor_31.csv | 0b1000010111 | lfsx |  | X-Form |
+| minor_31.csv | 0b1001010111 | lfdx |  | X-Form |
+| minor_31.csv | 0b1100010101 | lwzcix |  | X-Form |
+| minor_31.csv | 0b1100010110 | lhbrx |  | X-Form |
+| minor_31.csv | 0b1100110101 | lhzcix |  | X-Form |
+| minor_31.csv | 0b1101010101 | lbzcix |  | X-Form |
+| minor_31.csv | 0b1101010111 | lfiwax |  | X-Form |
+| minor_31.csv | 0b1101110101 | ldcix |  | X-Form |
+| minor_31.csv | 0b1101110111 | lfiwzx |  | X-Form |
+
 
 ## LDST-2R-1W-imm (LDSTRM-2P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 37 | stwu | D-Form |
-major.csv | 39 | stbu | D-Form |
-major.csv | 45 | sthu | D-Form |
-minor_62.csv | 1 | stdu | DS-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 32 | lwz | SVP64BREV | SVD-Form |
+| major.csv | 34 | lbz | SVP64BREV | SVD-Form |
+| major.csv | 37 | stwu |  | D-Form |
+| major.csv | 39 | stbu |  | D-Form |
+| major.csv | 40 | lhz | SVP64BREV | SVD-Form |
+| major.csv | 42 | lha | SVP64BREV | SVD-Form |
+| major.csv | 45 | sthu |  | D-Form |
+| major.csv | 48 | lfs | SVP64BREV | SVD-Form |
+| major.csv | 50 | lfd | SVP64BREV | SVD-Form |
+| major.csv | 53 | stfsu |  | D-Form |
+| major.csv | 55 | stfdu |  | D-Form |
+| minor_62.csv | 1 | stdu |  | DS-Form |
+
 
 ## LDST-2R-2W (LDSTRM-2P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0000110101 | ldux | X-Form |
-minor_31.csv | 0b0000110111 | lwzux | X-Form |
-minor_31.csv | 0b0001110111 | lbzux | X-Form |
-minor_31.csv | 0b0100110111 | lhzux | X-Form |
-minor_31.csv | 0b0101110101 | lwaux | X-Form |
-minor_31.csv | 0b0101110111 | lhaux | X-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0000110101 | ldux |  | X-Form |
+| minor_31.csv | 0b0000110111 | lwzux |  | X-Form |
+| minor_31.csv | 0b0001110111 | lbzux |  | X-Form |
+| minor_31.csv | 0b0100110111 | lhzux |  | X-Form |
+| minor_31.csv | 0b0101110101 | lwaux |  | X-Form |
+| minor_31.csv | 0b0101110111 | lhaux |  | X-Form |
+| minor_31.csv | 0b1000110111 | lfsux |  | X-Form |
+| minor_31.csv | 0b1001110111 | lfdux |  | X-Form |
+
+
+## LDST-2R-2W-imm (-)
+
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 33 | lwzu | SVP64BREV | SVD-Form |
+| major.csv | 35 | lbzu | SVP64BREV | SVD-Form |
+| major.csv | 41 | lhzu | SVP64BREV | SVD-Form |
+| major.csv | 43 | lhau | SVP64BREV | SVD-Form |
+| major.csv | 49 | lfsu | SVP64BREV | SVD-Form |
+| major.csv | 51 | lfdu | SVP64BREV | SVD-Form |
+
 
 ## LDST-3R (LDSTRM-2P-3S)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0010010101 | stdx | X-Form |
-minor_31.csv | 0b0010010111 | stwx | X-Form |
-minor_31.csv | 0b0011010111 | stbx | X-Form |
-minor_31.csv | 0b0110010111 | sthx | X-Form |
-minor_31.csv | 0b1010010100 | stdbrx | X-Form |
-minor_31.csv | 0b1010010110 | stwbrx | X-Form |
-minor_31.csv | 0b1110010101 | stwcix | X-Form |
-minor_31.csv | 0b1110010110 | sthbrx | X-Form |
-minor_31.csv | 0b1110110101 | sthcix | X-Form |
-minor_31.csv | 0b1111010101 | stbcix | X-Form |
-minor_31.csv | 0b1111110101 | stdcix | X-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0010010101 | stdx |  | X-Form |
+| minor_31.csv | 0b0010010111 | stwx |  | X-Form |
+| minor_31.csv | 0b0011010111 | stbx |  | X-Form |
+| minor_31.csv | 0b0110010111 | sthx |  | X-Form |
+| minor_31.csv | 0b1010010100 | stdbrx |  | X-Form |
+| minor_31.csv | 0b1010010110 | stwbrx |  | X-Form |
+| minor_31.csv | 0b1010010111 | stfsx |  | X-Form |
+| minor_31.csv | 0b1011010111 | stfdx |  | X-Form |
+| minor_31.csv | 0b1110010101 | stwcix |  | X-Form |
+| minor_31.csv | 0b1110010110 | sthbrx |  | X-Form |
+| minor_31.csv | 0b1110110101 | sthcix |  | X-Form |
+| minor_31.csv | 0b1111010101 | stbcix |  | X-Form |
+| minor_31.csv | 0b1111010111 | stfiwx |  | X-Form |
+| minor_31.csv | 0b1111110101 | stdcix |  | X-Form |
+
 
 ## LDST-3R-CRo (LDSTRM-2P-3S)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0010010110 | stwcx | X-Form |
-minor_31.csv | 0b0011010110 | stdcx | X-Form |
-minor_31.csv | 0b1010110110 | stbcx | X-Form |
-minor_31.csv | 0b1011010110 | sthcx | X-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0010010110 | stwcx |  | X-Form |
+| minor_31.csv | 0b0011010110 | stdcx |  | X-Form |
+| minor_31.csv | 0b1010110110 | stbcx |  | X-Form |
+| minor_31.csv | 0b1011010110 | sthcx |  | X-Form |
+
 
 ## LDST-3R-1W (LDSTRM-2P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0010110101 | stdux | X-Form |
-minor_31.csv | 0b0010110111 | stwux | X-Form |
-minor_31.csv | 0b0011110111 | stbux | X-Form |
-minor_31.csv | 0b0110110111 | sthux | X-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0010110101 | stdux |  | X-Form |
+| minor_31.csv | 0b0010110111 | stwux |  | X-Form |
+| minor_31.csv | 0b0011110111 | stbux |  | X-Form |
+| minor_31.csv | 0b0110110111 | sthux |  | X-Form |
+| minor_31.csv | 0b1010110111 | stfsux |  | X-Form |
+| minor_31.csv | 0b1011110111 | stfdux |  | X-Form |
+
 
 ##  (non-SV)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-extra.csv | 000000---------------0100000000- | attn | NONE-Form |
-extra.csv | 01100000000000000000000000000000 | nop | D-Form |
-major.csv | 17 | sc | SC-Form |
-minor_19.csv | 0b0010010110 | isync | XL-Form |
-minor_19_00000.csv | 0b00010 | add pcis not implemented yet | DX-Form |
-minor_31.csv | 0b0000010110 | icbt | X-Form |
-minor_31.csv | 0b0000110110 | dcbst | X-Form |
-minor_31.csv | 0b0001010110 | dcbf | X-Form |
-minor_31.csv | 0b0011110110 | dcbtst | X-Form |
-minor_31.csv | 0b0100010110 | dcbt | X-Form |
-minor_31.csv | 0b0111110010 | slbia | X-Form |
-minor_31.csv | 0b1001010110 | sync | X-Form |
-minor_31.csv | 0b1111010110 | icbi | X-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| extra.csv | 000000---------------0100000000- | attn |  | NONE-Form |
+| extra.csv | 01100000000000000000000000000000 | nop |  | D-Form |
+| major.csv | 17 | sc |  | SC-Form |
+| minor_19.csv | 0b0010010110 | isync |  | XL-Form |
+| minor_19_00000.csv | 0b00010 | add pcis not implemented yet |  | DX-Form |
+| minor_22.csv | -----011001 | svshape |  | SVM-Form |
+| minor_22.csv | -----111001 | svremap |  | SVRM-Form |
+| minor_31.csv | 0b0000010110 | icbt |  | X-Form |
+| minor_31.csv | 0b0000011110 | wait |  | X-Form |
+| minor_31.csv | 0b0000110110 | dcbst |  | X-Form |
+| minor_31.csv | 0b0001010110 | dcbf |  | X-Form |
+| minor_31.csv | 0b0011110110 | dcbtst |  | X-Form |
+| minor_31.csv | 0b0100010110 | dcbt |  | X-Form |
+| minor_31.csv | 0b0111110010 | slbia |  | X-Form |
+| minor_31.csv | 0b1000110110 | tlbsync |  | X-Form |
+| minor_31.csv | 0b1001010110 | sync |  | X-Form |
+| minor_31.csv | 0b1101010110 | eieio |  | X-Form |
+| minor_31.csv | 0b1111010110 | icbi |  | X-Form |
+
 
 ## imm (non-SV)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 18 | b | I-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 18 | b |  | I-Form |
+
 
 ## CRo (-)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_63l.csv | 0b000000010 | 2/0=mcrfs | -Form |
-minor_63l.csv | 0b011000001 | 1/6=mtfsb1 | -Form |
-minor_63l.csv | 0b011000010 | 2/6=mtfsb0 | -Form |
-minor_63l.csv | 0b011000100 | 4/6=mtfsfi | -Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_63.csv | 0000100110 | 1/6=mtfsb1 |  | X-Form |
+| minor_63.csv | 0001000000 | 2/0=mcrfs |  | X-Form |
+| minor_63.csv | 0001000110 | 2/6=mtfsb0 |  | X-Form |
+| minor_63.csv | 0010000110 | 4/6=mtfsfi |  | X-Form |
+
 
 ## CRio (RM-2P-1S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_19.csv | 0b0000000000 | mcrf | XL-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_19.csv | 0b0000000000 | mcrf |  | XL-Form |
+
 
 ## CR=2R1W (RM-1P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_19.csv | 0b0000100001 | crnor | XL-Form |
-minor_19.csv | 0b0010000001 | crandc | XL-Form |
-minor_19.csv | 0b0011000001 | crxor | XL-Form |
-minor_19.csv | 0b0011100001 | crnand | XL-Form |
-minor_19.csv | 0b0100000001 | crand | XL-Form |
-minor_19.csv | 0b0100100001 | creqv | XL-Form |
-minor_19.csv | 0b0110100001 | crorc | XL-Form |
-minor_19.csv | 0b0111000001 | cror | XL-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_19.csv | 0b0000100001 | crnor |  | XL-Form |
+| minor_19.csv | 0b0010000001 | crandc |  | XL-Form |
+| minor_19.csv | 0b0011000001 | crxor |  | XL-Form |
+| minor_19.csv | 0b0011100001 | crnand |  | XL-Form |
+| minor_19.csv | 0b0100000001 | crand |  | XL-Form |
+| minor_19.csv | 0b0100100001 | creqv |  | XL-Form |
+| minor_19.csv | 0b0110100001 | crorc |  | XL-Form |
+| minor_19.csv | 0b0111000001 | cror |  | XL-Form |
+
 
 ## 1W (non-SV)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-extra.csv | 000001---------------0000000011- | sim_cfg | NONE-Form |
-minor_31.csv | 0b0001010011 | mfmsr | X-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| extra.csv | 000001---------------0000000011- | sim_cfg |  | NONE-Form |
+| minor_31.csv | 0b0001010011 | mfmsr |  | X-Form |
+
+
+## 1W-CRo (RM-1P-1D)
+
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_22.csv | -----10011- | svstep |  | SVL-Form |
+
+
+## 1W-CRi (RM-2P-1S1D)
+
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_19.csv | 0b0000010000 | bclr |  | XL-Form |
+| minor_31.csv | 0b0000010011 | mfcr/mfocrf |  | XFX-Form |
+| minor_31.csv | 0b0010000000 | setb |  | VX-Form |
+
 
 ## 1W-CRi (RM-2P-1S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0000010011 | mfcr/mfocrf | XFX-Form |
-minor_31.csv | 0b0010000000 | setb | VX-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 16 | bc |  | B-Form |
+
 
 ## 1R (non-SV)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0010010010 | mtmsr | X-Form |
-minor_31.csv | 0b0010110010 | mtmsrd | X-Form |
-minor_31.csv | 0b0100010010 | tlbiel | X-Form |
-minor_31.csv | 0b0100110010 | tlbie | X-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0010010010 | mtmsr |  | X-Form |
+| minor_31.csv | 0b0010110010 | mtmsrd |  | X-Form |
+| minor_31.csv | 0b0100010010 | tlbiel |  | X-Form |
+| minor_31.csv | 0b0100110010 | tlbie |  | X-Form |
+
 
 ## 1R-imm (non-SV)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 2 | tdi | D-Form |
-major.csv | 3 | twi | D-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 2 | tdi |  | D-Form |
+| major.csv | 3 | twi |  | D-Form |
+
 
 ## 1R-CRo (RM-2P-1S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_63l.csv | 0b000000101 | 5/0=ftsqrt | -Form |
-minor_63l.csv | 0b011110110 | 22/7=mtfsf | -Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_63.csv | 0010100000 | 5/0=ftsqrt |  | X-Form |
+| minor_63.csv | 1011000111 | 22/7=mtfsf |  | X-Form |
+
 
 ## 1R-CRo (RM-2P-1S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 10 | cmpli | D-Form |
-major.csv | 11 | cmpi | D-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 10 | cmpli |  | D-Form |
+| major.csv | 11 | cmpi |  | D-Form |
+
 
 ## 1R-CRio (RM-2P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0010010000 | mtcrf/mtocrf | XFX-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0010010000 | mtcrf/mtocrf |  | XFX-Form |
+
 
 ## 1R-1W (RM-2P-1S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0001101000 | neg | XO-Form |
-minor_31.csv | 0b0001111010 | popcntb | X-Form |
-minor_31.csv | 0b0010011010 | prtyw | X-Form |
-minor_31.csv | 0b0010111010 | prtyd | X-Form |
-minor_31.csv | 0b0101010011 | mfspr | XFX-Form |
-minor_31.csv | 0b0101111010 | popcntw | X-Form |
-minor_31.csv | 0b0111010011 | mtspr | XFX-Form |
-minor_31.csv | 0b0111111010 | popcntd | X-Form |
-minor_31.csv | 0b1001101000 | nego | XO-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0001101000 | neg |  | XO-Form |
+| minor_31.csv | 0b0001111010 | popcntb |  | X-Form |
+| minor_31.csv | 0b0010011010 | prtyw |  | X-Form |
+| minor_31.csv | 0b0010111010 | prtyd |  | X-Form |
+| minor_31.csv | 0b0100011010 | cdtbcd |  | X-Form |
+| minor_31.csv | 0b0100111010 | cbcdtd |  | X-Form |
+| minor_31.csv | 0b0101010011 | mfspr |  | XFX-Form |
+| minor_31.csv | 0b0101111010 | popcntw |  | X-Form |
+| minor_31.csv | 0b0111010011 | mtspr |  | XFX-Form |
+| minor_31.csv | 0b0111111010 | popcntd |  | X-Form |
+| minor_31.csv | 0b1001101000 | nego |  | XO-Form |
+
 
 ## 1R-1W-imm (RM-2P-1S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 12 | addic | D-Form |
-major.csv | 14 | addi | D-Form |
-major.csv | 15 | addis | D-Form |
-major.csv | 24 | ori | D-Form |
-major.csv | 25 | oris | D-Form |
-major.csv | 26 | xori | D-Form |
-major.csv | 27 | xoris | D-Form |
-major.csv | 8 | subfic | D-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 12 | addic |  | D-Form |
+| major.csv | 14 | addi |  | D-Form |
+| major.csv | 15 | addis |  | D-Form |
+| major.csv | 24 | ori |  | D-Form |
+| major.csv | 25 | oris |  | D-Form |
+| major.csv | 26 | xori |  | D-Form |
+| major.csv | 27 | xoris |  | D-Form |
+| major.csv | 8 | subfic |  | D-Form |
+
 
 ## 1R-1W-CRo (RM-2P-1S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0000011010 | cntlzw | X-Form |
-minor_31.csv | 0b0000111010 | cntlzd | X-Form |
-minor_31.csv | 0b0011001000 | subfze | XO-Form |
-minor_31.csv | 0b0011001010 | addze | XO-Form |
-minor_31.csv | 0b1000011010 | cnttzw | X-Form |
-minor_31.csv | 0b1000111010 | cnttzd | X-Form |
-minor_31.csv | 0b1011001000 | subfzeo | XO-Form |
-minor_31.csv | 0b1011001010 | addzeo | XO-Form |
-minor_31.csv | 0b1110011010 | extsh | X-Form |
-minor_31.csv | 0b1110111010 | extsb | X-Form |
-minor_31.csv | 0b1111011010 | extsw | X-Form |
-minor_59.csv | 0b01110 | fcfid[u]s | -Form |
-minor_59.csv | 0b10110 | fsqrts | -Form |
-minor_59.csv | 0b11000 | fres | -Form |
-minor_59.csv | 0b11010 | frsqrtes | -Form |
-minor_63h.csv | 0b0110 | fsqrt | -Form |
-minor_63h.csv | 0b1000 | fre | -Form |
-minor_63h.csv | 0b1010 | frsqrte | -Form |
-minor_63l.csv | 0b011110010 | 18/7=mffsfamily | -Form |
-minor_63l.csv | 0b100000001 | 1/8=fneg | -Form |
-minor_63l.csv | 0b100000010 | 2/8=fmr | -Form |
-minor_63l.csv | 0b100000100 | 4/8=fnabs | -Form |
-minor_63l.csv | 0b100001000 | 8/8=fabs | -Form |
-minor_63l.csv | 0b100001100 | 12/8=frin | -Form |
-minor_63l.csv | 0b100001101 | 13/8=friz | -Form |
-minor_63l.csv | 0b100001110 | 14/8=frip | -Form |
-minor_63l.csv | 0b100001111 | 15/8=frim | -Form |
-minor_63l.csv | 0b110000000 | 0/12=frsp | -Form |
-minor_63l.csv | 0b111000000 | 0/14=fctiw | -Form |
-minor_63l.csv | 0b111000100 | 4/14=fctiwu | -Form |
-minor_63l.csv | 0b111011001 | 25/14=fctid | -Form |
-minor_63l.csv | 0b111011010 | 26/14=fcfid | -Form |
-minor_63l.csv | 0b111011101 | 29/14=fctidu | -Form |
-minor_63l.csv | 0b111011110 | 30/14=fcfidu | -Form |
-minor_63l.csv | 0b111100000 | 0/15=fctiwz | -Form |
-minor_63l.csv | 0b111100100 | 4/15=fctiwuz | -Form |
-minor_63l.csv | 0b111111001 | 25/15=fctidz | -Form |
-minor_63l.csv | 0b111111101 | 29/15=fctiduz | -Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0000011010 | cntlzw |  | X-Form |
+| minor_31.csv | 0b0000111010 | cntlzd |  | X-Form |
+| minor_31.csv | 0b0011001000 | subfze |  | XO-Form |
+| minor_31.csv | 0b0011001010 | addze |  | XO-Form |
+| minor_31.csv | 0b1000011010 | cnttzw |  | X-Form |
+| minor_31.csv | 0b1000111010 | cnttzd |  | X-Form |
+| minor_31.csv | 0b1011001000 | subfzeo |  | XO-Form |
+| minor_31.csv | 0b1011001010 | addzeo |  | XO-Form |
+| minor_31.csv | 0b1110011010 | extsh |  | X-Form |
+| minor_31.csv | 0b1110111010 | extsb |  | X-Form |
+| minor_31.csv | 0b1111011010 | extsw |  | X-Form |
+| minor_59.csv | -----10110 | fsqrts |  | A-Form |
+| minor_59.csv | -----11000 | fres |  | A-Form |
+| minor_59.csv | -----11010 | frsqrtes |  | A-Form |
+| minor_59.csv | 1000001110 | fsins |  | X-Form |
+| minor_59.csv | 1000101110 | fcoss |  | X-Form |
+| minor_59.csv | 1101001110 | fcfids |  | X-Form |
+| minor_59.csv | 1111001110 | fcfidus |  | X-Form |
+| minor_63.csv | -----10110 | fsqrt |  | A-Form |
+| minor_63.csv | -----11000 | fre |  | A-Form |
+| minor_63.csv | -----11010 | frsqrte |  | A-Form |
+| minor_63.csv | 0000001100 | 0/12=frsp |  | X-Form |
+| minor_63.csv | 0000001110 | 0/14=fctiw |  | X-Form |
+| minor_63.csv | 0000001111 | 0/15=fctiwz |  | X-Form |
+| minor_63.csv | 0000101000 | 1/8=fneg |  | X-Form |
+| minor_63.csv | 0001001000 | 2/8=fmr |  | X-Form |
+| minor_63.csv | 0010001000 | 4/8=fnabs |  | X-Form |
+| minor_63.csv | 0010001110 | 4/14=fctiwu |  | X-Form |
+| minor_63.csv | 0010001111 | 4/15=fctiwuz |  | X-Form |
+| minor_63.csv | 0100001000 | 8/8=fabs |  | X-Form |
+| minor_63.csv | 0110001000 | 12/8=frin |  | X-Form |
+| minor_63.csv | 0110101000 | 13/8=friz |  | X-Form |
+| minor_63.csv | 0111001000 | 14/8=frip |  | X-Form |
+| minor_63.csv | 0111101000 | 15/8=frim |  | X-Form |
+| minor_63.csv | 1001000111 | 18/7=mffs |  | X-Form |
+| minor_63.csv | 1100101110 | 25/14=fctid |  | X-Form |
+| minor_63.csv | 1100101111 | 25/15=fctidz |  | X-Form |
+| minor_63.csv | 1101001110 | 26/14=fcfid |  | X-Form |
+| minor_63.csv | 1110101110 | 29/14=fctidu |  | X-Form |
+| minor_63.csv | 1110101111 | 29/15=fctiduz |  | X-Form |
+| minor_63.csv | 1111001110 | 30/14=fcfidu |  | X-Form |
+
 
 ## 1R-1W-CRo (RM-2P-1S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 13 | addic. | D-Form |
-major.csv | 21 | rlwinm | M-Form |
-major.csv | 28 | andi. | B-Form |
-major.csv | 29 | andis. | B-Form |
-major.csv | 7 | mulli | D-Form |
-minor_30.csv | 0b0000 | rldicl | MDS-Form |
-minor_30.csv | 0b0001 | rldicl | MDS-Form |
-minor_30.csv | 0b0010 | rldicr | MD-Form |
-minor_30.csv | 0b0011 | rldicr | MD-Form |
-minor_30.csv | 0b0100 | rldic | MD-Form |
-minor_30.csv | 0b0101 | rldic | MD-Form |
-minor_31.csv | 0b0011101000 | subfme | XO-Form |
-minor_31.csv | 0b0011101010 | addme | XO-Form |
-minor_31.csv | 0b1011101000 | subfmeo | XO-Form |
-minor_31.csv | 0b1011101010 | addmeo | XO-Form |
-minor_31.csv | 0b1100111000 | srawi | X-Form |
-minor_31.csv | 0b1100111010 | sradi | XS-Form |
-minor_31.csv | 0b1100111011 | sradi | XS-Form |
-minor_31.csv | 0b1101111010 | extswsli | XS-Form |
-minor_31.csv | 0b1101111011 | extswsli | XS-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 13 | addic. |  | D-Form |
+| major.csv | 21 | rlwinm |  | M-Form |
+| major.csv | 28 | andi. |  | B-Form |
+| major.csv | 29 | andis. |  | B-Form |
+| major.csv | 7 | mulli |  | D-Form |
+| minor_30.csv | 0b0000 | rldicl |  | MDS-Form |
+| minor_30.csv | 0b0001 | rldicl |  | MDS-Form |
+| minor_30.csv | 0b0010 | rldicr |  | MD-Form |
+| minor_30.csv | 0b0011 | rldicr |  | MD-Form |
+| minor_30.csv | 0b0100 | rldic |  | MD-Form |
+| minor_30.csv | 0b0101 | rldic |  | MD-Form |
+| minor_31.csv | 0b0011101000 | subfme |  | XO-Form |
+| minor_31.csv | 0b0011101010 | addme |  | XO-Form |
+| minor_31.csv | 0b1011101000 | subfmeo |  | XO-Form |
+| minor_31.csv | 0b1011101010 | addmeo |  | XO-Form |
+| minor_31.csv | 0b1100111000 | srawi |  | X-Form |
+| minor_31.csv | 0b1100111010 | sradi |  | XS-Form |
+| minor_31.csv | 0b1100111011 | sradi |  | XS-Form |
+| minor_31.csv | 0b1101111010 | extswsli |  | XS-Form |
+| minor_31.csv | 0b1101111011 | extswsli |  | XS-Form |
+| minor_5.csv | -011010110- | grevi |  | XB-Form |
+| minor_5.csv | 0011110110- | grevwi |  | X-Form |
+
 
 ## 2R (non-SV)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0000000100 | tw | X-Form |
-minor_31.csv | 0b0001000100 | td | X-Form |
-minor_31.csv | 0b1111110110 | dcbz | X-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0000000100 | tw |  | X-Form |
+| minor_31.csv | 0b0001000100 | td |  | X-Form |
+
 
 ## 2R-CRo (RM-1P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0000000000 | cmp | X-Form |
-minor_31.csv | 0b0000100000 | cmpl | X-Form |
-minor_31.csv | 0b0011000000 | cmprb | X-Form |
-minor_31.csv | 0b0011100000 | cmpeqb | X-Form |
-minor_63l.csv | 0b000000000 | 0/0=fcmpu | -Form |
-minor_63l.csv | 0b000000001 | 1/0=fcmpo | -Form |
-minor_63l.csv | 0b000000100 | 4/0=ftdiv | -Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0000000000 | cmp |  | X-Form |
+| minor_31.csv | 0b0000100000 | cmpl |  | X-Form |
+| minor_31.csv | 0b0011000000 | cmprb |  | X-Form |
+| minor_31.csv | 0b0011100000 | cmpeqb |  | X-Form |
+| minor_63.csv | 0000000000 | 0/0=fcmpu |  | X-Form |
+| minor_63.csv | 0000100000 | 1/0=fcmpo |  | X-Form |
+| minor_63.csv | 0010000000 | 4/0=ftdiv |  | X-Form |
+
 
 ## 2R-1W (RM-1P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0011111100 | bpermd | X-Form |
-minor_31.csv | 0b0100001001 | modud | X-Form |
-minor_31.csv | 0b0100001011 | moduw | X-Form |
-minor_31.csv | 0b0111111100 | cmpb | X-Form |
-minor_31.csv | 0b1100001001 | modsd | X-Form |
-minor_31.csv | 0b1100001011 | modsw | X-Form |
-minor_63l.csv | 0b011011010 | 26/6=fmrgow | -Form |
-minor_63l.csv | 0b011011110 | 30/6=fmrgew | -Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_22.csv | ------10001 | bmask |  | BM2-Form |
+| minor_31.csv | 0b0011111100 | bpermd |  | X-Form |
+| minor_31.csv | 0b0100001001 | modud |  | X-Form |
+| minor_31.csv | 0b0100001011 | moduw |  | X-Form |
+| minor_31.csv | 0b0111111100 | cmpb |  | X-Form |
+| minor_31.csv | 0b1100001001 | modsd |  | X-Form |
+| minor_31.csv | 0b1100001011 | modsw |  | X-Form |
+| minor_63.csv | 1101000110 | 26/6=fmrgow |  | X-Form |
+| minor_63.csv | 1111000110 | 30/6=fmrgew |  | X-Form |
+
 
 ## 2R-1W-CRo (RM-1P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 23 | rlwnm | M-Form |
-minor_30.csv | 0b1000 | rldcl | MD-Form |
-minor_30.csv | 0b1001 | rldcr | MD-Form |
-minor_31.csv | 0b0000001000 | subfc | XO-Form |
-minor_31.csv | 0b0000001001 | mulhdu | XO-Form |
-minor_31.csv | 0b0000001010 | addc | XO-Form |
-minor_31.csv | 0b0000001011 | mulhwu | XO-Form |
-minor_31.csv | 0b0000011000 | slw | X-Form |
-minor_31.csv | 0b0000011011 | sld | X-Form |
-minor_31.csv | 0b0000011100 | and | X-Form |
-minor_31.csv | 0b0000101000 | subf | XO-Form |
-minor_31.csv | 0b0000111100 | andc | X-Form |
-minor_31.csv | 0b0001001001 | mulhd | XO-Form |
-minor_31.csv | 0b0001001011 | mulhw | XO-Form |
-minor_31.csv | 0b0001111100 | nor | X-Form |
-minor_31.csv | 0b0010001000 | subfe | XO-Form |
-minor_31.csv | 0b0010001010 | adde | XO-Form |
-minor_31.csv | 0b0011101001 | mulld | XO-Form |
-minor_31.csv | 0b0011101011 | mullw | XO-Form |
-minor_31.csv | 0b0100001010 | add | XO-Form |
-minor_31.csv | 0b0100011100 | eqv | X-Form |
-minor_31.csv | 0b0100111100 | xor | X-Form |
-minor_31.csv | 0b0110001001 | divdeu | XO-Form |
-minor_31.csv | 0b0110001011 | divweu | XO-Form |
-minor_31.csv | 0b0110011100 | orc | X-Form |
-minor_31.csv | 0b0110101001 | divde | XO-Form |
-minor_31.csv | 0b0110101011 | divwe | XO-Form |
-minor_31.csv | 0b0110111100 | or | X-Form |
-minor_31.csv | 0b0111001001 | divdu | XO-Form |
-minor_31.csv | 0b0111001011 | divwu | XO-Form |
-minor_31.csv | 0b0111011100 | nand | X-Form |
-minor_31.csv | 0b0111101001 | divd | XO-Form |
-minor_31.csv | 0b0111101011 | divw | XO-Form |
-minor_31.csv | 0b1000001000 | subfco | XO-Form |
-minor_31.csv | 0b1000001001 | mulhdu | XO-Form |
-minor_31.csv | 0b1000001010 | addco | XO-Form |
-minor_31.csv | 0b1000001011 | mulhwu | XO-Form |
-minor_31.csv | 0b1000011000 | srw | X-Form |
-minor_31.csv | 0b1000011011 | srd | X-Form |
-minor_31.csv | 0b1000101000 | subfo | XO-Form |
-minor_31.csv | 0b1001001001 | mulhd | XO-Form |
-minor_31.csv | 0b1001001011 | mulhw | XO-Form |
-minor_31.csv | 0b1010001000 | subfeo | XO-Form |
-minor_31.csv | 0b1010001010 | addeo | XO-Form |
-minor_31.csv | 0b1011101001 | mulldo | XO-Form |
-minor_31.csv | 0b1011101011 | mullwo | XO-Form |
-minor_31.csv | 0b1100001010 | addo | XO-Form |
-minor_31.csv | 0b1100011000 | sraw | X-Form |
-minor_31.csv | 0b1100011010 | srad | X-Form |
-minor_31.csv | 0b1110001001 | divdeuo | XO-Form |
-minor_31.csv | 0b1110001011 | divweuo | XO-Form |
-minor_31.csv | 0b1110101001 | divdeo | XO-Form |
-minor_31.csv | 0b1110101011 | divweo | XO-Form |
-minor_31.csv | 0b1111001001 | divduo | XO-Form |
-minor_31.csv | 0b1111001011 | divwuo | XO-Form |
-minor_31.csv | 0b1111101001 | divdo | XO-Form |
-minor_31.csv | 0b1111101011 | divwo | XO-Form |
-minor_59.csv | 0b10010 | fdivs | -Form |
-minor_59.csv | 0b10100 | fsubs | -Form |
-minor_59.csv | 0b10101 | fadds | -Form |
-minor_59.csv | 0b11001 | fmuls | -Form |
-minor_63h.csv | 0b0010 | fdiv | -Form |
-minor_63h.csv | 0b0100 | fsub | -Form |
-minor_63h.csv | 0b0101 | fadd | -Form |
-minor_63h.csv | 0b1001 | fmul | -Form |
-minor_63l.csv | 0b100000000 | 0/8=fcpsgn | -Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 23 | rlwnm |  | M-Form |
+| minor_22.csv | 0001001110- | minu |  | X-Form |
+| minor_22.csv | 0011001110- | maxu |  | X-Form |
+| minor_22.csv | 0101001110- | mins |  | X-Form |
+| minor_22.csv | 0110001110- | cprop |  | X-Form |
+| minor_22.csv | 0111001110- | maxs |  | X-Form |
+| minor_22.csv | 1001110110- | absds |  | X-Form |
+| minor_22.csv | 1011110110- | absdu |  | X-Form |
+| minor_22.csv | 1101001110- | avgadd |  | X-Form |
+| minor_30.csv | 0b1000 | rldcl |  | MD-Form |
+| minor_30.csv | 0b1001 | rldcr |  | MD-Form |
+| minor_31.csv | 0b0000001000 | subfc |  | XO-Form |
+| minor_31.csv | 0b0000001001 | mulhdu |  | XO-Form |
+| minor_31.csv | 0b0000001010 | addc |  | XO-Form |
+| minor_31.csv | 0b0000001011 | mulhwu |  | XO-Form |
+| minor_31.csv | 0b0000011000 | slw |  | X-Form |
+| minor_31.csv | 0b0000011011 | sld |  | X-Form |
+| minor_31.csv | 0b0000011100 | and |  | X-Form |
+| minor_31.csv | 0b0000101000 | subf |  | XO-Form |
+| minor_31.csv | 0b0000111100 | andc |  | X-Form |
+| minor_31.csv | 0b0001001001 | mulhd |  | XO-Form |
+| minor_31.csv | 0b0001001010 | addg6s |  | XO-Form |
+| minor_31.csv | 0b0001001011 | mulhw |  | XO-Form |
+| minor_31.csv | 0b0001111100 | nor |  | X-Form |
+| minor_31.csv | 0b0010001000 | subfe |  | XO-Form |
+| minor_31.csv | 0b0010001010 | adde |  | XO-Form |
+| minor_31.csv | 0b0011101001 | mulld |  | XO-Form |
+| minor_31.csv | 0b0011101011 | mullw |  | XO-Form |
+| minor_31.csv | 0b0100001010 | add |  | XO-Form |
+| minor_31.csv | 0b0100011100 | eqv |  | X-Form |
+| minor_31.csv | 0b0100111100 | xor |  | X-Form |
+| minor_31.csv | 0b0110001001 | divdeu |  | XO-Form |
+| minor_31.csv | 0b0110001011 | divweu |  | XO-Form |
+| minor_31.csv | 0b0110011100 | orc |  | X-Form |
+| minor_31.csv | 0b0110101001 | divde |  | XO-Form |
+| minor_31.csv | 0b0110101011 | divwe |  | XO-Form |
+| minor_31.csv | 0b0110111100 | or |  | X-Form |
+| minor_31.csv | 0b0111001001 | divdu |  | XO-Form |
+| minor_31.csv | 0b0111001011 | divwu |  | XO-Form |
+| minor_31.csv | 0b0111011100 | nand |  | X-Form |
+| minor_31.csv | 0b0111101001 | divd |  | XO-Form |
+| minor_31.csv | 0b0111101011 | divw |  | XO-Form |
+| minor_31.csv | 0b1000001000 | subfco |  | XO-Form |
+| minor_31.csv | 0b1000001001 | mulhdu |  | XO-Form |
+| minor_31.csv | 0b1000001010 | addco |  | XO-Form |
+| minor_31.csv | 0b1000001011 | mulhwu |  | XO-Form |
+| minor_31.csv | 0b1000011000 | srw |  | X-Form |
+| minor_31.csv | 0b1000011011 | srd |  | X-Form |
+| minor_31.csv | 0b1000101000 | subfo |  | XO-Form |
+| minor_31.csv | 0b1001001001 | mulhd |  | XO-Form |
+| minor_31.csv | 0b1001001011 | mulhw |  | XO-Form |
+| minor_31.csv | 0b1010001000 | subfeo |  | XO-Form |
+| minor_31.csv | 0b1010001010 | addeo |  | XO-Form |
+| minor_31.csv | 0b1011101001 | mulldo |  | XO-Form |
+| minor_31.csv | 0b1011101011 | mullwo |  | XO-Form |
+| minor_31.csv | 0b1100001010 | addo |  | XO-Form |
+| minor_31.csv | 0b1100011000 | sraw |  | X-Form |
+| minor_31.csv | 0b1100011010 | srad |  | X-Form |
+| minor_31.csv | 0b1110001001 | divdeuo |  | XO-Form |
+| minor_31.csv | 0b1110001011 | divweuo |  | XO-Form |
+| minor_31.csv | 0b1110101001 | divdeo |  | XO-Form |
+| minor_31.csv | 0b1110101011 | divweo |  | XO-Form |
+| minor_31.csv | 0b1111001001 | divduo |  | XO-Form |
+| minor_31.csv | 0b1111001011 | divwuo |  | XO-Form |
+| minor_31.csv | 0b1111101001 | divdo |  | XO-Form |
+| minor_31.csv | 0b1111101011 | divwo |  | XO-Form |
+| minor_5.csv | 0010010110- | grev |  | X-Form |
+| minor_5.csv | 0010110110- | grevw |  | X-Form |
+| minor_59.csv | -----01101 | ffadds |  | A-Form |
+| minor_59.csv | -----10010 | fdivs |  | A-Form |
+| minor_59.csv | -----10100 | fsubs |  | A-Form |
+| minor_59.csv | -----10101 | fadds |  | A-Form |
+| minor_59.csv | -----11001 | fmuls |  | A-Form |
+| minor_63.csv | -----10010 | fdiv |  | A-Form |
+| minor_63.csv | -----10100 | fsub |  | A-Form |
+| minor_63.csv | -----10101 | fadd |  | A-Form |
+| minor_63.csv | -----11001 | fmul |  | A-Form |
+| minor_63.csv | 0000001000 | 0/8=fcpsgn |  | X-Form |
+
 
 ## 2R-1W-CRo (RM-1P-2S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-major.csv | 20 | rlwimi | M-Form |
-minor_30.csv | 0b0110 | rldimi | MD-Form |
-minor_30.csv | 0b0111 | rldimi | MD-Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| major.csv | 20 | rlwimi |  | M-Form |
+| minor_30.csv | 0b0110 | rldimi |  | MD-Form |
+| minor_30.csv | 0b0111 | rldimi |  | MD-Form |
+
 
 ## 2R-1W-CRi (RM-1P-3S1D)
 
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_31.csv | 0b0000001111 | isel | A-Form |
-minor_31.csv | 0b0000101111 | isel | A-Form |
-minor_31.csv | 0b0001001111 | isel | A-Form |
-minor_31.csv | 0b0001101111 | isel | A-Form |
-minor_31.csv | 0b0010001111 | isel | A-Form |
-minor_31.csv | 0b0010101111 | isel | A-Form |
-minor_31.csv | 0b0011001111 | isel | A-Form |
-minor_31.csv | 0b0011101111 | isel | A-Form |
-minor_31.csv | 0b0100001111 | isel | A-Form |
-minor_31.csv | 0b0100101111 | isel | A-Form |
-minor_31.csv | 0b0101001111 | isel | A-Form |
-minor_31.csv | 0b0101101111 | isel | A-Form |
-minor_31.csv | 0b0110001111 | isel | A-Form |
-minor_31.csv | 0b0110101111 | isel | A-Form |
-minor_31.csv | 0b0111001111 | isel | A-Form |
-minor_31.csv | 0b0111101111 | isel | A-Form |
-minor_31.csv | 0b1000001111 | isel | A-Form |
-minor_31.csv | 0b1000101111 | isel | A-Form |
-minor_31.csv | 0b1001001111 | isel | A-Form |
-minor_31.csv | 0b1001101111 | isel | A-Form |
-minor_31.csv | 0b1010001111 | isel | A-Form |
-minor_31.csv | 0b1010101111 | isel | A-Form |
-minor_31.csv | 0b1011001111 | isel | A-Form |
-minor_31.csv | 0b1011101111 | isel | A-Form |
-minor_31.csv | 0b1100001111 | isel | A-Form |
-minor_31.csv | 0b1100101111 | isel | A-Form |
-minor_31.csv | 0b1101001111 | isel | A-Form |
-minor_31.csv | 0b1101101111 | isel | A-Form |
-minor_31.csv | 0b1110001111 | isel | A-Form |
-minor_31.csv | 0b1110101111 | isel | A-Form |
-minor_31.csv | 0b1111001111 | isel | A-Form |
-minor_31.csv | 0b1111101111 | isel | A-Form |
-"""]]
-
-## 3R-1W-CRo (-)
-
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_63h.csv | 0b0111 | fsel | -Form |
-minor_63h.csv | 0b1100 | fmsub | -Form |
-minor_63h.csv | 0b1101 | fmadd | -Form |
-minor_63h.csv | 0b1110 | fnmsub | -Form |
-minor_63h.csv | 0b1111 | fnmadd | -Form |
-"""]]
-
-## 3R-1W-CRio (RM-1P-3S1D)
-
-[[!table  data="""
-CSV | opcode | asm | form |
-minor_59.csv | 0b11100 | fmsubs | -Form |
-minor_59.csv | 0b11101 | fmadds | -Form |
-minor_59.csv | 0b11110 | fnmsubs | -Form |
-minor_59.csv | 0b11111 | fnmadds | -Form |
-"""]]
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_31.csv | 0b0000001111 | isel |  | A-Form |
+| minor_31.csv | 0b0000101111 | isel |  | A-Form |
+| minor_31.csv | 0b0001001111 | isel |  | A-Form |
+| minor_31.csv | 0b0001101111 | isel |  | A-Form |
+| minor_31.csv | 0b0010001111 | isel |  | A-Form |
+| minor_31.csv | 0b0010101111 | isel |  | A-Form |
+| minor_31.csv | 0b0011001111 | isel |  | A-Form |
+| minor_31.csv | 0b0011101111 | isel |  | A-Form |
+| minor_31.csv | 0b0100001111 | isel |  | A-Form |
+| minor_31.csv | 0b0100101111 | isel |  | A-Form |
+| minor_31.csv | 0b0101001111 | isel |  | A-Form |
+| minor_31.csv | 0b0101101111 | isel |  | A-Form |
+| minor_31.csv | 0b0110001111 | isel |  | A-Form |
+| minor_31.csv | 0b0110101111 | isel |  | A-Form |
+| minor_31.csv | 0b0111001111 | isel |  | A-Form |
+| minor_31.csv | 0b0111101111 | isel |  | A-Form |
+| minor_31.csv | 0b1000001111 | isel |  | A-Form |
+| minor_31.csv | 0b1000101111 | isel |  | A-Form |
+| minor_31.csv | 0b1001001111 | isel |  | A-Form |
+| minor_31.csv | 0b1001101111 | isel |  | A-Form |
+| minor_31.csv | 0b1010001111 | isel |  | A-Form |
+| minor_31.csv | 0b1010101111 | isel |  | A-Form |
+| minor_31.csv | 0b1011001111 | isel |  | A-Form |
+| minor_31.csv | 0b1011101111 | isel |  | A-Form |
+| minor_31.csv | 0b1100001111 | isel |  | A-Form |
+| minor_31.csv | 0b1100101111 | isel |  | A-Form |
+| minor_31.csv | 0b1101001111 | isel |  | A-Form |
+| minor_31.csv | 0b1101101111 | isel |  | A-Form |
+| minor_31.csv | 0b1110001111 | isel |  | A-Form |
+| minor_31.csv | 0b1110101111 | isel |  | A-Form |
+| minor_31.csv | 0b1111001111 | isel |  | A-Form |
+| minor_31.csv | 0b1111101111 | isel |  | A-Form |
+
+
+## 3R-1W-CRo (RM-1P-3S1D)
+
+| CSV | opcode | asm | flags | form |
+| --- | ------ | --- | ----- | ---- |
+| minor_22.csv | 0111110110- | absdacs |  | X-Form |
+| minor_22.csv | 1111110110- | absdacu |  | X-Form |
+| minor_5.csv | --------00- | ternlogi |  | TLI-Form |
+| minor_59.csv | -----00100 | ffmsubs |  | A-Form |
+| minor_59.csv | -----00101 | ffmadds |  | A-Form |
+| minor_59.csv | -----00110 | ffnmsubs |  | A-Form |
+| minor_59.csv | -----00111 | ffnmadds |  | A-Form |
+| minor_59.csv | -----01111 | fdmadds |  | A-Form |
+| minor_59.csv | -----11100 | fmsubs |  | A-Form |
+| minor_59.csv | -----11101 | fmadds |  | A-Form |
+| minor_59.csv | -----11110 | fnmsubs |  | A-Form |
+| minor_59.csv | -----11111 | fnmadds |  | A-Form |
+| minor_63.csv | -----10111 | fsel |  | A-Form |
+| minor_63.csv | -----11100 | fmsub |  | A-Form |
+| minor_63.csv | -----11101 | fmadd |  | A-Form |
+| minor_63.csv | -----11110 | fnmsub |  | A-Form |
+| minor_63.csv | -----11111 | fnmadd |  | A-Form |
+
 
 # svp64 remaps
 * **LDST-1R-1W-imm**: LDSTRM-2P-1S1D
 * **LDST-1R-2W-imm**: LDSTRM-2P-1S2D
+* **LDST-2R**: -
 * **LDST-2R-imm**: LDSTRM-2P-2S
 * **LDST-2R-1W**: LDSTRM-2P-2S1D
 * **LDST-2R-1W-imm**: LDSTRM-2P-2S1D
 * **LDST-2R-2W**: LDSTRM-2P-2S1D
+* **LDST-2R-2W-imm**: -
 * **LDST-3R**: LDSTRM-2P-3S
 * **LDST-3R-CRo**: LDSTRM-2P-3S
 * **LDST-3R-1W**: LDSTRM-2P-2S1D
 * **CRo**: -
 * **CRio**: RM-2P-1S1D
 * **CR=2R1W**: RM-1P-2S1D
+* **1W-CRo**: RM-1P-1D
+* **1W-CRi**: RM-2P-1S1D
 * **1W-CRi**: RM-2P-1S1D
 * **1R-CRo**: RM-2P-1S1D
 * **1R-CRo**: RM-2P-1S1D
@@ -610,46 +706,388 @@ minor_59.csv | 0b11111 | fnmadds | -Form |
 * **2R-1W-CRo**: RM-1P-2S1D
 * **2R-1W-CRo**: RM-1P-2S1D
 * **2R-1W-CRi**: RM-1P-3S1D
-* **3R-1W-CRo**: -
-* **3R-1W-CRio**: RM-1P-3S1D
+* **3R-1W-CRo**: RM-1P-3S1D
 
 ## LDSTRM-2P-1S1D
 
-[[!table format=csv file="openpower/isatables/LDSTRM-2P-1S1D.csv"]]
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| lwz | LDST | ~SVP64BREV | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | 0 |
+| lbz | LDST | ~SVP64BREV | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | 0 |
+| lhz | LDST | ~SVP64BREV | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | 0 |
+| lha | LDST | ~SVP64BREV | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | 0 |
+| lfs | LDST | ~SVP64BREV | 2P | EXTRA3 | d:FRT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | FRT | 0 | 0 | 0 |
+| lfd | LDST | ~SVP64BREV | 2P | EXTRA3 | d:FRT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | FRT | 0 | 0 | 0 |
+| ld | LDST |  | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | 0 |
+| lwa | LDST |  | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | 0 |
 
 ## LDSTRM-2P-1S2D
 
-[[!table format=csv file="openpower/isatables/LDSTRM-2P-1S2D.csv"]]
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| lwzu | LDST | ~SVP64BREV | 2P | EXTRA2 | d:RT | d:RA | s:RA | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | RA |
+| lbzu | LDST | ~SVP64BREV | 2P | EXTRA2 | d:RT | d:RA | s:RA | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | RA |
+| lhzu | LDST | ~SVP64BREV | 2P | EXTRA2 | d:RT | d:RA | s:RA | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | RA |
+| lhau | LDST | ~SVP64BREV | 2P | EXTRA2 | d:RT | d:RA | s:RA | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | RA |
+| lfsu | LDST | ~SVP64BREV | 2P | EXTRA2 | d:FRT | d:RA | s:RA | 0 | RA | 0 | 0 | FRT | 0 | 0 | RA |
+| lfdu | LDST | ~SVP64BREV | 2P | EXTRA2 | d:FRT | d:RA | s:RA | 0 | RA | 0 | 0 | FRT | 0 | 0 | RA |
+| ldu | LDST |  | 2P | EXTRA2 | d:RT | d:RA | s:RA | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | RA |
 
 ## LDSTRM-2P-2S
 
-[[!table format=csv file="openpower/isatables/LDSTRM-2P-2S.csv"]]
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| stw | LDST |  | 2P | EXTRA3 | s:RS | s:RA | 0 | 0 | RA_OR_ZERO | 0 | RS | 0 | 0 | 0 | 0 |
+| stb | LDST |  | 2P | EXTRA3 | s:RS | s:RA | 0 | 0 | RA_OR_ZERO | 0 | RS | 0 | 0 | 0 | 0 |
+| sth | LDST |  | 2P | EXTRA3 | s:RS | s:RA | 0 | 0 | RA_OR_ZERO | 0 | RS | 0 | 0 | 0 | 0 |
+| stfs | LDST |  | 2P | EXTRA3 | s:FRS | s:RA | 0 | 0 | RA_OR_ZERO | 0 | FRS | 0 | 0 | 0 | 0 |
+| stfd | LDST |  | 2P | EXTRA3 | s:FRS | s:RA | 0 | 0 | RA_OR_ZERO | 0 | FRS | 0 | 0 | 0 | 0 |
+| std | LDST |  | 2P | EXTRA3 | s:RS | s:RA | 0 | 0 | RA_OR_ZERO | 0 | RS | 0 | 0 | 0 | 0 |
 
 ## LDSTRM-2P-2S1D
 
-[[!table format=csv file="openpower/isatables/LDSTRM-2P-2S1D.csv"]]
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| lwarx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| ldx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lwzx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lbarx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| ldarx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lbzx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lharx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lhzx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lwax | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lhax | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| ldbrx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lwbrx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lfsx | LDST |  | 2P | EXTRA2 | d:FRT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | FRT | 0 | 0 | 0 |
+| lfdx | LDST |  | 2P | EXTRA2 | d:FRT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | FRT | 0 | 0 | 0 |
+| lwzcix | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lhbrx | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lhzcix | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lbzcix | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lfiwax | LDST |  | 2P | EXTRA2 | d:FRT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | FRT | 0 | 0 | 0 |
+| ldcix | LDST |  | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | 0 |
+| lfiwzx | LDST |  | 2P | EXTRA2 | d:FRT | s:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | FRT | 0 | 0 | 0 |
+| lwz | LDST | SVP64BREV | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | 0 | RC | RT | 0 | 0 | 0 |
+| lbz | LDST | SVP64BREV | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | 0 | RC | RT | 0 | 0 | 0 |
+| stwu | LDST |  | 2P | EXTRA2 | d:RA | s:RS | s:RA | 0 | RA_OR_ZERO | 0 | RS | 0 | 0 | 0 | RA |
+| stbu | LDST |  | 2P | EXTRA2 | d:RA | s:RS | s:RA | 0 | RA_OR_ZERO | 0 | RS | 0 | 0 | 0 | RA |
+| lhz | LDST | SVP64BREV | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | 0 | RC | RT | 0 | 0 | 0 |
+| lha | LDST | SVP64BREV | 2P | EXTRA2 | d:RT | s:RA | s:RB | 0 | RA_OR_ZERO | 0 | RC | RT | 0 | 0 | 0 |
+| sthu | LDST |  | 2P | EXTRA2 | d:RA | s:RS | s:RA | 0 | RA_OR_ZERO | 0 | RS | 0 | 0 | 0 | RA |
+| lfs | LDST | SVP64BREV | 2P | EXTRA2 | d:FRT | s:RA | s:RB | 0 | RA_OR_ZERO | 0 | RC | FRT | 0 | 0 | 0 |
+| lfd | LDST | SVP64BREV | 2P | EXTRA2 | d:FRT | s:RA | s:RB | 0 | RA_OR_ZERO | 0 | RC | FRT | 0 | 0 | 0 |
+| stfsu | LDST |  | 2P | EXTRA2 | d:RA | s:FRS | s:RA | 0 | RA | 0 | FRS | 0 | 0 | 0 | RA |
+| stfdu | LDST |  | 2P | EXTRA2 | d:RA | s:FRS | s:RA | 0 | RA | 0 | FRS | 0 | 0 | 0 | RA |
+| stdu | LDST |  | 2P | EXTRA2 | d:RA | s:RS | s:RA | 0 | RA_OR_ZERO | 0 | RS | 0 | 0 | 0 | RA |
+| ldux | LDST |  | 2P | EXTRA2 | d:RT | d:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | RA |
+| lwzux | LDST |  | 2P | EXTRA2 | d:RT | d:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | RA |
+| lbzux | LDST |  | 2P | EXTRA2 | d:RT | d:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | RA |
+| lhzux | LDST |  | 2P | EXTRA2 | d:RT | d:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | RA |
+| lwaux | LDST |  | 2P | EXTRA2 | d:RT | d:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | RA |
+| lhaux | LDST |  | 2P | EXTRA2 | d:RT | d:RA | s:RB | 0 | RA_OR_ZERO | RB | 0 | RT | 0 | 0 | RA |
+| lfsux | LDST |  | 2P | EXTRA2 | d:FRT | d:RA | s:RB | 0 | RA | RB | 0 | FRT | 0 | 0 | RA |
+| lfdux | LDST |  | 2P | EXTRA2 | d:FRT | d:RA | s:RB | 0 | RA | RB | 0 | FRT | 0 | 0 | RA |
+| stdux | LDST |  | 2P | EXTRA2 | d:RA | s:RSs:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | RA |
+| stwux | LDST |  | 2P | EXTRA2 | d:RA | s:RSs:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | RA |
+| stbux | LDST |  | 2P | EXTRA2 | d:RA | s:RSs:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | RA |
+| sthux | LDST |  | 2P | EXTRA2 | d:RA | s:RSs:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | RA |
+| stfsux | LDST |  | 2P | EXTRA2 | d:RA | s:FRSs:RA | s:RB | 0 | RA | RB | FRS | 0 | 0 | 0 | RA |
+| stfdux | LDST |  | 2P | EXTRA2 | d:RA | s:FRSs:RA | s:RB | 0 | RA | RB | FRS | 0 | 0 | 0 | RA |
 
 ## LDSTRM-2P-3S
 
-[[!table format=csv file="openpower/isatables/LDSTRM-2P-3S.csv"]]
-
-## -
-
-[[!table format=csv file="openpower/isatables/-.csv"]]
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| stdx | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| stwx | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| stbx | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| sthx | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| stdbrx | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| stwbrx | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| stfsx | LDST |  | 2P | EXTRA2 | s:FRS | s:RA | s:RB | 0 | RA | RB | FRS | 0 | 0 | 0 | 0 |
+| stfdx | LDST |  | 2P | EXTRA2 | s:FRS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | FRS | 0 | 0 | 0 | 0 |
+| stwcix | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| sthbrx | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| sthcix | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| stbcix | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| stfiwx | LDST |  | 2P | EXTRA2 | s:FRS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | FRS | 0 | 0 | 0 | 0 |
+| stdcix | LDST |  | 2P | EXTRA2 | s:RS | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | 0 | 0 |
+| stwcx | LDST |  | 2P | EXTRA2 | s:RSd:CR0 | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | CR0 | 0 |
+| stdcx | LDST |  | 2P | EXTRA2 | s:RSd:CR0 | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | CR0 | 0 |
+| stbcx | LDST |  | 2P | EXTRA2 | s:RSd:CR0 | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | CR0 | 0 |
+| sthcx | LDST |  | 2P | EXTRA2 | s:RSd:CR0 | s:RA | s:RB | 0 | RA_OR_ZERO | RB | RS | 0 | 0 | CR0 | 0 |
 
 ## RM-2P-1S1D
 
-[[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| mcrf | NORMAL |  | 2P | EXTRA3 | d:BF | s:BFA | 0 | 0 | 0 | 0 | 0 | 0 | BFA | BF | 0 |
+| bclr | BRANCH |  | 2P | EXTRA3 | d:BI | s:BI | 0 | 0 | SPR | SPR | 0 | SPR | BI | 0 | 0 |
+| mfcr/mfocrf | NORMAL |  | 2P | EXTRA3 | d:RT | s:CR | 0 | 0 | 0 | 0 | 0 | RT | WHOLE_REG | 0 | 0 |
+| setb | NORMAL |  | 2P | EXTRA3 | d:RT | s:BFA | 0 | 0 | 0 | 0 | 0 | RT | BFA | 0 | 0 |
+| bc | BRANCH |  | 2P | EXTRA3 | d:BI | s:BI | 0 | 0 | SPR | 0 | 0 | SPR | BI | 0 | 0 |
+| 5/0=ftsqrt | NORMAL |  | 2P | EXTRA3 | d:BF | s:FRB | 0 | 0 | 0 | FRB | 0 | 0 | 0 | BF | 0 |
+| 22/7=mtfsf | NORMAL |  | 2P | EXTRA3 | d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | 0 | 0 | CR1 | 0 |
+| cmpli | NORMAL |  | 2P | EXTRA3 | d:BF | s:RA | 0 | 0 | RA | 0 | 0 | 0 | 0 | BF | 0 |
+| cmpi | NORMAL |  | 2P | EXTRA3 | d:BF | s:RA | 0 | 0 | RA | 0 | 0 | 0 | 0 | BF | 0 |
+| neg | NORMAL |  | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | 0 | 0 |
+| popcntb | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| prtyw | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| prtyd | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| cdtbcd | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| cbcdtd | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| mfspr | NORMAL |  | 2P | EXTRA3 | d:RS | s:SPR | 0 | 0 | SPR | 0 | 0 | RT | 0 | 0 | 0 |
+| popcntw | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| mtspr | NORMAL |  | 2P | EXTRA3 | d:SPR | s:RS | 0 | 0 | RS | 0 | 0 | SPR | 0 | 0 | 0 |
+| popcntd | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| nego | NORMAL |  | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | 0 | 0 |
+| addic | NORMAL |  | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | 0 | 0 |
+| addi | NORMAL |  | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | 0 |
+| addis | NORMAL |  | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA_OR_ZERO | 0 | 0 | RT | 0 | 0 | 0 |
+| ori | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| oris | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| xori | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| xoris | NORMAL |  | 2P | EXTRA3 | d:RA | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | 0 | 0 |
+| subfic | NORMAL |  | 2P | EXTRA3 | d:RT | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | 0 | 0 |
+| cntlzw | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | CR0 | 0 |
+| cntlzd | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | CR0 | 0 |
+| subfze | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| addze | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| cnttzw | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | CR0 | 0 |
+| cnttzd | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | CR0 | 0 |
+| subfzeo | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| addzeo | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| extsh | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | CR0 | 0 |
+| extsb | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | CR0 | 0 |
+| extsw | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | CR0 | 0 |
+| fsqrts | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fres | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| frsqrtes | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fsins | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fcoss | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fcfids | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fcfidus | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fsqrt | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fre | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| frsqrte | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 0/12=frsp | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 0/14=fctiw | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 0/15=fctiwz | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 1/8=fneg | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 2/8=fmr | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 4/8=fnabs | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 4/14=fctiwu | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 4/15=fctiwuz | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 8/8=fabs | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 12/8=frin | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 13/8=friz | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 14/8=frip | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 15/8=frim | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 18/7=mffs | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 25/14=fctid | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 25/15=fctidz | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 26/14=fcfid | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 29/14=fctidu | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 29/15=fctiduz | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| 30/14=fcfidu | NORMAL |  | 2P | EXTRA3 | d:FRT;d:CR1 | s:FRB | 0 | 0 | 0 | FRB | 0 | FRT | 0 | CR1 | 0 |
+| addic. | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| rlwinm | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| andi. | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | CR0 | 0 |
+| andis. | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | RS | 0 | 0 | RA | 0 | CR0 | 0 |
+| mulli | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| rldicl | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| rldicl | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| rldicr | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| rldicr | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| rldic | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| rldic | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| subfme | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| addme | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| subfmeo | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| addmeo | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| srawi | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| sradi | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| sradi | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| extswsli | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| extswsli | NORMAL |  | 2P | EXTRA3 | d:RA;d:CR0 | s:RS | 0 | 0 | 0 | 0 | RS | RA | 0 | CR0 | 0 |
+| grevi | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
+| grevwi | NORMAL |  | 2P | EXTRA3 | d:RT;d:CR0 | s:RA | 0 | 0 | RA | 0 | 0 | RT | 0 | CR0 | 0 |
 
 ## RM-1P-2S1D
 
-[[!table format=csv file="openpower/isatables/RM-1P-2S1D.csv"]]
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| crnor | CROP |  | 1P | EXTRA3 | d:BT | s:BA | s:BB | 0 | 0 | 0 | 0 | 0 | BA_BB | BT | 0 |
+| crandc | CROP |  | 1P | EXTRA3 | d:BT | s:BA | s:BB | 0 | 0 | 0 | 0 | 0 | BA_BB | BT | 0 |
+| crxor | CROP |  | 1P | EXTRA3 | d:BT | s:BA | s:BB | 0 | 0 | 0 | 0 | 0 | BA_BB | BT | 0 |
+| crnand | CROP |  | 1P | EXTRA3 | d:BT | s:BA | s:BB | 0 | 0 | 0 | 0 | 0 | BA_BB | BT | 0 |
+| crand | CROP |  | 1P | EXTRA3 | d:BT | s:BA | s:BB | 0 | 0 | 0 | 0 | 0 | BA_BB | BT | 0 |
+| creqv | CROP |  | 1P | EXTRA3 | d:BT | s:BA | s:BB | 0 | 0 | 0 | 0 | 0 | BA_BB | BT | 0 |
+| crorc | CROP |  | 1P | EXTRA3 | d:BT | s:BA | s:BB | 0 | 0 | 0 | 0 | 0 | BA_BB | BT | 0 |
+| cror | CROP |  | 1P | EXTRA3 | d:BT | s:BA | s:BB | 0 | 0 | 0 | 0 | 0 | BA_BB | BT | 0 |
+| cmp | NORMAL |  | 1P | EXTRA3 | d:BF | s:RA | s:RB | 0 | RA | RB | 0 | 0 | 0 | BF | 0 |
+| cmpl | NORMAL |  | 1P | EXTRA3 | d:BF | s:RA | s:RB | 0 | RA | RB | 0 | 0 | 0 | BF | 0 |
+| cmprb | NORMAL |  | 1P | EXTRA3 | d:BF | s:RA | s:RB | 0 | RA | RB | 0 | 0 | 0 | BF | 0 |
+| cmpeqb | NORMAL |  | 1P | EXTRA3 | d:BF | s:RA | s:RB | 0 | RA | RB | 0 | 0 | 0 | BF | 0 |
+| 0/0=fcmpu | NORMAL |  | 1P | EXTRA3 | d:BF | s:FRA | s:FRB | 0 | FRA | FRB | 0 | 0 | 0 | BF | 0 |
+| 1/0=fcmpo | NORMAL |  | 1P | EXTRA3 | d:BF | s:FRA | s:FRB | 0 | FRA | FRB | 0 | 0 | 0 | BF | 0 |
+| 4/0=ftdiv | NORMAL |  | 1P | EXTRA3 | d:BF | s:FRA | s:FRB | 0 | FRA | FRB | 0 | 0 | 0 | BF | 0 |
+| bmask | NORMAL |  | 1P | EXTRA3 | d:RT | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | 0 | 0 |
+| bpermd | NORMAL |  | 1P | EXTRA3 | d:RA | s:RS | s:RB | 0 | RS | RB | 0 | RA | 0 | 0 | 0 |
+| modud | NORMAL |  | 1P | EXTRA3 | d:RT | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | 0 | 0 |
+| moduw | NORMAL |  | 1P | EXTRA3 | d:RT | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | 0 | 0 |
+| cmpb | NORMAL |  | 1P | EXTRA3 | d:RA | s:RS | s:RB | 0 | RS | RB | 0 | RA | 0 | 0 | 0 |
+| modsd | NORMAL |  | 1P | EXTRA3 | d:RT | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | 0 | 0 |
+| modsw | NORMAL |  | 1P | EXTRA3 | d:RT | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | 0 | 0 |
+| 26/6=fmrgow | NORMAL |  | 1P | EXTRA3 | d:FRT | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | 0 | 0 |
+| 30/6=fmrgew | NORMAL |  | 1P | EXTRA3 | d:FRT | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | 0 | 0 |
+| rlwnm | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | 0 | RB | RS | RA | 0 | CR0 | 0 |
+| minu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| maxu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mins | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| cprop | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| maxs | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| absds | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| absdu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| avgadd | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| rldcl | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | 0 | RB | RS | RA | 0 | CR0 | 0 |
+| rldcr | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | 0 | RB | RS | RA | 0 | CR0 | 0 |
+| subfc | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mulhdu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| addc | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mulhwu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| slw | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | 0 | RB | RS | RA | 0 | CR0 | 0 |
+| sld | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | 0 | RB | RS | RA | 0 | CR0 | 0 |
+| and | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | RS | RB | 0 | RA | 0 | CR0 | 0 |
+| subf | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| andc | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | RS | RB | 0 | RA | 0 | CR0 | 0 |
+| mulhd | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| addg6s | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mulhw | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| nor | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | RS | RB | 0 | RA | 0 | CR0 | 0 |
+| subfe | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| adde | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mulld | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mullw | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| add | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| eqv | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | RS | RB | 0 | RA | 0 | CR0 | 0 |
+| xor | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | RS | RB | 0 | RA | 0 | CR0 | 0 |
+| divdeu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divweu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| orc | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | RS | RB | 0 | RA | 0 | CR0 | 0 |
+| divde | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divwe | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| or | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | RS | RB | 0 | RA | 0 | CR0 | 0 |
+| divdu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divwu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| nand | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | RS | RB | 0 | RA | 0 | CR0 | 0 |
+| divd | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divw | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| subfco | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mulhdu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| addco | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mulhwu | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| srw | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | 0 | RB | RS | RA | 0 | CR0 | 0 |
+| srd | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | 0 | RB | RS | RA | 0 | CR0 | 0 |
+| subfo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mulhd | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mulhw | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| subfeo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| addeo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mulldo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| mullwo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| addo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| sraw | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | 0 | RB | RS | RA | 0 | CR0 | 0 |
+| srad | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RB | s:RS | 0 | 0 | RB | RS | RA | 0 | CR0 | 0 |
+| divdeuo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divweuo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divdeo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divweo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divduo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divwuo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divdo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| divwo | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| grev | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| grevw | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | s:RA | s:RB | 0 | RA | RB | 0 | RT | 0 | CR0 | 0 |
+| ffadds | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fdivs | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fsubs | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fadds | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fmuls | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRC | 0 | FRA | 0 | FRC | FRT | 0 | CR1 | 0 |
+| fdiv | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fsub | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fadd | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | CR1 | 0 |
+| fmul | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRC | 0 | FRA | 0 | FRC | FRT | 0 | CR1 | 0 |
+| 0/8=fcpsgn | NORMAL |  | 1P | EXTRA3 | d:FRT;d:CR1 | s:FRA | s:FRB | 0 | FRA | FRB | 0 | FRT | 0 | CR1 | 0 |
+| rlwimi | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RA | s:RS | 0 | RA | 0 | RS | RA | 0 | CR0 | 0 |
+| rldimi | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RA | s:RS | 0 | RA | 0 | RS | RA | 0 | CR0 | 0 |
+| rldimi | NORMAL |  | 1P | EXTRA3 | d:RA;d:CR0 | s:RA | s:RS | 0 | RA | 0 | RS | RA | 0 | CR0 | 0 |
+
+## RM-1P-1D
+
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| svstep | NORMAL |  | 1P | EXTRA3 | d:RT;d:CR0 | 0 | 0 | 0 | 0 | 0 | 0 | RT | 0 | CR0 | 0 |
 
 ## RM-2P-2S1D
 
-[[!table format=csv file="openpower/isatables/RM-2P-2S1D.csv"]]
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| mtcrf/mtocrf | NORMAL |  | 2P | EXTRA2 | d:CR | s:RS | s:CR | 0 | RS | 0 | 0 | 0 | WHOLE_REG | WHOLE_REG | 0 |
 
 ## RM-1P-3S1D
 
-[[!table format=csv file="openpower/isatables/RM-1P-3S1D.csv"]]
+| insn | mode | CONDITIONS | Ptype | Etype | 0 | 1 | 2 | 3 | in1 | in2 | in3 | out | CR in | CR out | out2 |
+|  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |  -  |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| isel | NORMAL |  | 1P | EXTRA2 | d:RT | s:RA | s:RB | s:BC | RA_OR_ZERO | RB | 0 | RT | BC | 0 | 0 |
+| absdacs | NORMAL |  | 1P | EXTRA2 | d:RT;d:CR0 | s:RA | s:RB | s:RT | RA | RB | RT | RT | 0 | CR0 | 0 |
+| absdacu | NORMAL |  | 1P | EXTRA2 | d:RT;d:CR0 | s:RA | s:RB | s:RT | RA | RB | RT | RT | 0 | CR0 | 0 |
+| ternlogi | NORMAL |  | 1P | EXTRA2 | d:RT;d:CR0 | s:RA | s:RB | s:RT | RA | RB | RT | RT | 0 | CR0 | 0 |
+| ffmsubs | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| ffmadds | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| ffnmsubs | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| ffnmadds | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fdmadds | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fmsubs | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fmadds | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fnmsubs | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fnmadds | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fsel | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fmsub | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fmadd | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fnmsub | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |
+| fnmadd | NORMAL |  | 1P | EXTRA2 | d:FRT;d:CR1 | s:FRA | s:FRB | s:FRC | FRA | FRB | FRC | FRT | 0 | CR1 | 0 |