-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|
-"""]]
-
-## 2R-CRo (R)
-
-[[!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|
-"""]]
-
-## 2R-CRio (R)
-
-[[!table data="""
-CSV | opcode | asm | 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|
-"""]]
-
-## 2R-1W (R)
-
-[[!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|
-"""]]
-
-## 2R-1W-CRo (R)
-
-[[!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|
-"""]]
-
-## 2R-1W-CRo (R)
-
-[[!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|
-"""]]
-
-## 2R-1W-CRi (R)
-
-[[!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|
-"""]]
-
-## 2R-1W-CRio (R)
-
-[[!table data="""
-CSV | opcode | asm | 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 | 0b011011010 | 26/6=fmrgow | -Form|
-minor_63l.csv | 0b011011110 | 30/6=fmrgew | -Form|
-minor_63l.csv | 0b100000000 | 0/8=fcpsgn | -Form|
-"""]]
-
-## 3R-1W-CRio (FR4)
-
-[[!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|
-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|
-"""]]
+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 |
+"""]]
+
+## 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 |
+"""]]
+
+## 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 |
+"""]]
+
+## 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 |
+"""]]
+
+## 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 |
+"""]]
+
+## 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 |
+"""]]
+
+# svp64 remaps
+* **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
+* **CRo**: -
+* **CRio**: RM-2P-1S1D
+* **CR=2R1W**: RM-1P-2S1D
+* **1W-CRi**: RM-2P-1S1D
+* **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-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
+
+## LDSTRM-2P-1S1D
+
+[[!table format=csv file="openpower/isatables/LDSTRM-2P-1S1D.csv"]]
+
+## LDSTRM-2P-1S2D
+
+[[!table format=csv file="openpower/isatables/LDSTRM-2P-1S2D.csv"]]
+
+## LDSTRM-2P-2S
+
+[[!table format=csv file="openpower/isatables/LDSTRM-2P-2S.csv"]]
+
+## LDSTRM-2P-2S1D
+
+[[!table format=csv file="openpower/isatables/LDSTRM-2P-2S1D.csv"]]
+
+## LDSTRM-2P-3S
+
+[[!table format=csv file="openpower/isatables/LDSTRM-2P-3S.csv"]]
+
+## -
+
+[[!table format=csv file="openpower/isatables/-.csv"]]
+
+## RM-2P-1S1D
+
+[[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
+
+## RM-1P-2S1D
+
+[[!table format=csv file="openpower/isatables/RM-1P-2S1D.csv"]]
+
+## RM-2P-2S1D
+
+[[!table format=csv file="openpower/isatables/RM-2P-2S1D.csv"]]
+
+## RM-1P-3S1D
+
+[[!table format=csv file="openpower/isatables/RM-1P-3S1D.csv"]]