row sorting

diff --git a/openpower/opcode_regs_deduped.mdwn b/openpower/opcode_regs_deduped.mdwn
index f76ab3717947e3161152b7524457735fe345dfee..4c00bd49f39125c27a32ea6711ab3235807c8f70 100644 (file)
--- a/openpower/opcode_regs_deduped.mdwn
+++ b/openpower/opcode_regs_deduped.mdwn
@@ -10,7 +10,6 @@ in1 | in2 | in3 | out | CR in | CR out | ldst len | rc | lk|
 0 | 0 | 0 | 0 | 1 | 1 | 1 | R | |
 0 | 0 | 0 | R | 0 | 0 | 0 | 0 | 0|
 0 | 0 | 0 | R | 1 | 0 | 0 | 0 | 0|
-0 | 0 | R | R | 0 | 0 | 0 | R | 0|
 0 | 0 | R | R | 0 | 1 | 0 | R | 0|
 0 | R | 0 | 0 | 0 | 0 | 0 | 0 | 0|
 0 | R | R | R | 0 | 0 | 0 | R | 0|
@@ -26,7 +25,6 @@ R | 0 | 0 | R | 0 | 1 | 0 | 1 | 0|
 R | 0 | 0 | R | 0 | 1 | 0 | R | 0|
 R | 0 | 0 | R | 0 | 1 | 1 | R | 0|
 R | 0 | R | 0 | 0 | 0 | 1 | 0 | 0|
-R | 0 | R | R | 0 | 0 | 0 | R | 0|
 R | 0 | R | R | 0 | 1 | 0 | R | 0|
 R | R | 0 | 0 | 0 | 0 | 0 | 0 | 0|
 R | R | 0 | 0 | 0 | 1 | 0 | 0 | 0|
@@ -42,19 +40,19 @@ R | R | R | 0 | 0 | 1 | 1 | R | 0|
 
 [[!table  data="""
 CSV | opcode | asm | form|
-major.csv | 17 | sc | SC-Form|
 extra.csv | 01100000000000000000000000000000 | nop | D-Form|
-minor_19.csv | 0b0010010110 | isync | XL-Form|
+major.csv | 17 | sc | SC-Form|
 minor_19.csv | 0b0000010010 | rfid | XL-Form|
+minor_19.csv | 0b0010010110 | isync | XL-Form|
 minor_19.csv | 0b0100010010 | hrfid | XL-Form|
-minor_31.csv | 0b0001010110 | dcbf | X-Form|
+minor_31.csv | 0b0000010110 | icbt | X-Form|
 minor_31.csv | 0b0000110110 | dcbst | X-Form|
-minor_31.csv | 0b0100010110 | dcbt | X-Form|
+minor_31.csv | 0b0001010110 | dcbf | X-Form|
 minor_31.csv | 0b0011110110 | dcbtst | X-Form|
-minor_31.csv | 0b1111010110 | icbi | X-Form|
-minor_31.csv | 0b0000010110 | icbt | 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|
 """]]
 
 ##  in1: 0 in2: 0 in3: 0 out: 0 CR in: 0 CR out: 0 ldst len: 0 rc: 0 lk: 1
@@ -68,8 +66,8 @@ major.csv | 18 | b | I-Form|
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_19_00000.csv | 0b00010 | add pcis not implemented yet | DX-Form|
 extra.csv | 000000---------------0100000000- | attn | NONE-Form|
+minor_19_00000.csv | 0b00010 | add pcis not implemented yet | DX-Form|
 """]]
 
 ##  in1: 0 in2: 0 in3: 0 out: 0 CR in: 1 CR out: 0 ldst len: 0 rc: 0 lk: 1
@@ -77,8 +75,8 @@ extra.csv | 000000---------------0100000000- | attn | NONE-Form|
 [[!table  data="""
 CSV | opcode | asm | form|
 major.csv | 16 | bc | B-Form|
-minor_19.csv | 0b1000010000 | bcctr | XL-Form|
 minor_19.csv | 0b0000010000 | bclr | XL-Form|
+minor_19.csv | 0b1000010000 | bcctr | XL-Form|
 minor_19.csv | 0b1000110000 | bctar | XL-Form|
 """]]
 
@@ -87,14 +85,14 @@ minor_19.csv | 0b1000110000 | bctar | XL-Form|
 [[!table  data="""
 CSV | opcode | asm | form|
 minor_19.csv | 0b0000000000 | mcrf | XL-Form|
-minor_19.csv | 0b0100000001 | crand | XL-Form|
+minor_19.csv | 0b0000100001 | crnor | XL-Form|
 minor_19.csv | 0b0010000001 | crandc | XL-Form|
-minor_19.csv | 0b0100100001 | creqv | XL-Form|
+minor_19.csv | 0b0011000001 | crxor | XL-Form|
 minor_19.csv | 0b0011100001 | crnand | XL-Form|
-minor_19.csv | 0b0000100001 | crnor | XL-Form|
-minor_19.csv | 0b0111000001 | cror | 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 | 0b0011000001 | crxor | XL-Form|
+minor_19.csv | 0b0111000001 | cror | XL-Form|
 """]]
 
 ##  in1: 0 in2: 0 in3: 0 out: 0 CR in: 1 CR out: 1 ldst len: 1 rc: R lk: 
@@ -102,9 +100,9 @@ minor_19.csv | 0b0011000001 | crxor | XL-Form|
 [[!table  data="""
 CSV | opcode | asm | form|
 minor_31.csv | 0b0011000000 | cmprb | X-Form|
-minor_31.csv | 0b1011110011 | darn | X-Form|
 minor_31.csv | 0b1000000000 | mcrxr | X-Form|
 minor_31.csv | 0b1001000000 | mcrxrx | X-Form|
+minor_31.csv | 0b1011110011 | darn | X-Form|
 """]]
 
 ##  in1: 0 in2: 0 in3: 0 out: R CR in: 0 CR out: 0 ldst len: 0 rc: 0 lk: 0
@@ -124,36 +122,30 @@ minor_31.csv | 0b0000010011 | mfcr/mfocrf | XFX-Form|
 minor_31.csv | 0b0010000000 | setb | VX-Form|
 """]]
 
-##  in1: 0 in2: 0 in3: R out: R CR in: 0 CR out: 0 ldst len: 0 rc: R lk: 0
-
-[[!table  data="""
-CSV | opcode | asm | form|
-major.csv | 21 | rlwinm | M-Form|
-"""]]
-
 ##  in1: 0 in2: 0 in3: R out: R CR in: 0 CR out: 1 ldst len: 0 rc: R lk: 0
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_30.csv | 0b0100 | rldic | MD-Form|
-minor_30.csv | 0b0101 | rldic | MD-Form|
+major.csv | 21 | rlwinm | M-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_31.csv | 0b1101111010 | extswsli | XS-Form|
-minor_31.csv | 0b1101111011 | extswsli | XS-Form|
+minor_30.csv | 0b0100 | rldic | MD-Form|
+minor_30.csv | 0b0101 | rldic | MD-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 | 0b1100111000 | srawi | X-Form|
+minor_31.csv | 0b1101111010 | extswsli | XS-Form|
+minor_31.csv | 0b1101111011 | extswsli | XS-Form|
 """]]
 
 ##  in1: 0 in2: R in3: 0 out: 0 CR in: 0 CR out: 0 ldst len: 0 rc: 0 lk: 0
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_31.csv | 0b0100110010 | tlbie | X-Form|
 minor_31.csv | 0b0100010010 | tlbiel | X-Form|
+minor_31.csv | 0b0100110010 | tlbie | X-Form|
 """]]
 
 ##  in1: 0 in2: R in3: R out: R CR in: 0 CR out: 0 ldst len: 0 rc: R lk: 0
@@ -169,12 +161,12 @@ major.csv | 23 | rlwnm | M-Form|
 CSV | opcode | asm | form|
 minor_30.csv | 0b1000 | rldcl | MD-Form|
 minor_30.csv | 0b1001 | rldcr | MD-Form|
-minor_31.csv | 0b0000011011 | sld | X-Form|
 minor_31.csv | 0b0000011000 | slw | X-Form|
-minor_31.csv | 0b1100011010 | srad | X-Form|
-minor_31.csv | 0b1100011000 | sraw | X-Form|
-minor_31.csv | 0b1000011011 | srd | X-Form|
+minor_31.csv | 0b0000011011 | sld | X-Form|
 minor_31.csv | 0b1000011000 | srw | X-Form|
+minor_31.csv | 0b1000011011 | srd | X-Form|
+minor_31.csv | 0b1100011000 | sraw | X-Form|
+minor_31.csv | 0b1100011010 | srad | X-Form|
 """]]
 
 ##  in1: R in2: 0 in3: 0 out: 0 CR in: 0 CR out: 0 ldst len: 0 rc: 0 lk: 0
@@ -183,8 +175,8 @@ minor_31.csv | 0b1000011000 | srw | X-Form|
 CSV | opcode | asm | form|
 major.csv | 2 | tdi | D-Form|
 major.csv | 3 | twi | D-Form|
-minor_31.csv | 0b0010110010 | mtmsrd | X-Form|
 minor_31.csv | 0b0010010010 | mtmsr | X-Form|
+minor_31.csv | 0b0010110010 | mtmsrd | X-Form|
 minor_31.csv | 0b0111010011 | mtspr | XFX-Form|
 """]]
 
@@ -192,8 +184,8 @@ minor_31.csv | 0b0111010011 | mtspr | XFX-Form|
 
 [[!table  data="""
 CSV | opcode | asm | form|
-major.csv | 11 | cmpi | D-Form|
 major.csv | 10 | cmpli | D-Form|
+major.csv | 11 | cmpi | D-Form|
 """]]
 
 ##  in1: R in2: 0 in3: 0 out: 0 CR in: 1 CR out: 1 ldst len: 0 rc: 0 lk: 0
@@ -212,9 +204,9 @@ 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 | 8 | subfic | D-Form|
 major.csv | 26 | xori | D-Form|
 major.csv | 27 | xoris | D-Form|
+major.csv | 8 | subfic | D-Form|
 """]]
 
 ##  in1: R in2: 0 in3: 0 out: R CR in: 0 CR out: 0 ldst len: 0 rc: R lk: 0
@@ -229,22 +221,22 @@ minor_31.csv | 0b1001101000 | nego | XO-Form|
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_58.csv | 0 | ld | DS-Form|
-minor_58.csv | 1 | ldu | DS-Form|
-minor_58.csv | 2 | lwa | DS-Form|
+major.csv | 32 | lwz | D-Form|
+major.csv | 33 | lwzu | D-Form|
 major.csv | 34 | lbz | D-Form|
 major.csv | 35 | lbzu | D-Form|
-major.csv | 42 | lha | D-Form|
-major.csv | 43 | lhau | D-Form|
 major.csv | 40 | lhz | D-Form|
 major.csv | 41 | lhzu | D-Form|
-major.csv | 32 | lwz | D-Form|
-major.csv | 33 | lwzu | D-Form|
+major.csv | 42 | lha | D-Form|
+major.csv | 43 | lhau | D-Form|
 minor_31.csv | 0b0001111010 | popcntb | X-Form|
-minor_31.csv | 0b0111111010 | popcntd | X-Form|
-minor_31.csv | 0b0101111010 | popcntw | X-Form|
-minor_31.csv | 0b0010111010 | prtyd | X-Form|
 minor_31.csv | 0b0010011010 | prtyw | X-Form|
+minor_31.csv | 0b0010111010 | prtyd | X-Form|
+minor_31.csv | 0b0101111010 | popcntw | X-Form|
+minor_31.csv | 0b0111111010 | popcntd | X-Form|
+minor_58.csv | 0 | ld | DS-Form|
+minor_58.csv | 1 | ldu | DS-Form|
+minor_58.csv | 2 | lwa | DS-Form|
 """]]
 
 ##  in1: R in2: 0 in3: 0 out: R CR in: 0 CR out: 1 ldst len: 0 rc: 0 lk: 0
@@ -267,26 +259,26 @@ major.csv | 29 | andis. | B-Form|
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_31.csv | 0b0011101010 | addme | XO-Form|
-minor_31.csv | 0b1011101010 | addmeo | XO-Form|
-minor_31.csv | 0b0011001010 | addze | XO-Form|
-minor_31.csv | 0b1011001010 | addzeo | XO-Form|
-minor_31.csv | 0b0000111010 | cntlzd | X-Form|
 minor_31.csv | 0b0000011010 | cntlzw | X-Form|
-minor_31.csv | 0b1000111010 | cnttzd | X-Form|
-minor_31.csv | 0b1000011010 | cnttzw | X-Form|
-minor_31.csv | 0b0011101000 | subfme | XO-Form|
-minor_31.csv | 0b1011101000 | subfmeo | XO-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 | 0b0011101000 | subfme | XO-Form|
+minor_31.csv | 0b0011101010 | addme | 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 | 0b1011101000 | subfmeo | XO-Form|
+minor_31.csv | 0b1011101010 | addmeo | XO-Form|
 """]]
 
 ##  in1: R in2: 0 in3: 0 out: R CR in: 0 CR out: 1 ldst len: 1 rc: R lk: 0
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_31.csv | 0b1110111010 | extsb | X-Form|
 minor_31.csv | 0b1110011010 | extsh | X-Form|
+minor_31.csv | 0b1110111010 | extsb | X-Form|
 minor_31.csv | 0b1111011010 | extsw | X-Form|
 """]]
 
@@ -294,27 +286,21 @@ minor_31.csv | 0b1111011010 | extsw | X-Form|
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_62.csv | 0 | std | DS-Form|
-minor_62.csv | 1 | stdu | DS-Form|
+major.csv | 36 | stw | D-Form|
+major.csv | 37 | stwu | D-Form|
 major.csv | 38 | stb | D-Form|
 major.csv | 39 | stbu | D-Form|
 major.csv | 44 | sth | D-Form|
 major.csv | 45 | sthu | D-Form|
-major.csv | 36 | stw | D-Form|
-major.csv | 37 | stwu | D-Form|
-"""]]
-
-##  in1: R in2: 0 in3: R out: R CR in: 0 CR out: 0 ldst len: 0 rc: R lk: 0
-
-[[!table  data="""
-CSV | opcode | asm | form|
-major.csv | 20 | rlwimi | M-Form|
+minor_62.csv | 0 | std | DS-Form|
+minor_62.csv | 1 | stdu | DS-Form|
 """]]
 
 ##  in1: R in2: 0 in3: R out: R CR in: 0 CR out: 1 ldst len: 0 rc: R lk: 0
 
 [[!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|
 """]]
@@ -323,9 +309,9 @@ minor_30.csv | 0b0111 | rldimi | MD-Form|
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_31.csv | 0b1111110110 | dcbz | X-Form|
-minor_31.csv | 0b0001000100 | td | X-Form|
 minor_31.csv | 0b0000000100 | tw | X-Form|
+minor_31.csv | 0b0001000100 | td | X-Form|
+minor_31.csv | 0b1111110110 | dcbz | X-Form|
 """]]
 
 ##  in1: R in2: R in3: 0 out: 0 CR in: 0 CR out: 1 ldst len: 0 rc: 0 lk: 0
@@ -333,8 +319,8 @@ minor_31.csv | 0b0000000100 | tw | X-Form|
 [[!table  data="""
 CSV | opcode | asm | form|
 minor_31.csv | 0b0000000000 | cmp | X-Form|
-minor_31.csv | 0b0011100000 | cmpeqb | X-Form|
 minor_31.csv | 0b0000100000 | cmpl | X-Form|
+minor_31.csv | 0b0011100000 | cmpeqb | X-Form|
 """]]
 
 ##  in1: R in2: R in3: 0 out: R CR in: 0 CR out: 0 ldst len: 0 rc: 0 lk: 0
@@ -342,9 +328,9 @@ minor_31.csv | 0b0000100000 | cmpl | X-Form|
 [[!table  data="""
 CSV | opcode | asm | form|
 minor_31.csv | 0b0011111100 | bpermd | X-Form|
-minor_31.csv | 0b0111111100 | cmpb | 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|
 """]]
@@ -353,83 +339,83 @@ minor_31.csv | 0b1100001011 | modsw | X-Form|
 
 [[!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 | 0b1101010101 | lbzcix | X-Form|
-minor_31.csv | 0b0001110111 | lbzux | X-Form|
-minor_31.csv | 0b0001010111 | lbzx | X-Form|
-minor_31.csv | 0b0001010100 | ldarx | X-Form|
-minor_31.csv | 0b1000010100 | ldbrx | X-Form|
-minor_31.csv | 0b1101110101 | ldcix | X-Form|
 minor_31.csv | 0b0000110101 | ldux | X-Form|
-minor_31.csv | 0b0000010101 | ldx | X-Form|
+minor_31.csv | 0b0000110111 | lwzux | 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 | 0b0101110111 | lhaux | X-Form|
-minor_31.csv | 0b0101010111 | lhax | X-Form|
-minor_31.csv | 0b1100010110 | lhbrx | X-Form|
-minor_31.csv | 0b1100110101 | lhzcix | X-Form|
-minor_31.csv | 0b0100110111 | lhzux | X-Form|
+minor_31.csv | 0b0001110111 | lbzux | X-Form|
 minor_31.csv | 0b0100010111 | lhzx | X-Form|
-minor_31.csv | 0b0000010100 | lwarx | X-Form|
-minor_31.csv | 0b0101110101 | lwaux | X-Form|
+minor_31.csv | 0b0100110111 | lhzux | X-Form|
 minor_31.csv | 0b0101010101 | lwax | X-Form|
+minor_31.csv | 0b0101010111 | lhax | X-Form|
+minor_31.csv | 0b0101110101 | lwaux | X-Form|
+minor_31.csv | 0b0101110111 | lhaux | 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 | 0b0000110111 | lwzux | X-Form|
-minor_31.csv | 0b0000010111 | lwzx | 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|
 """]]
 
 ##  in1: R in2: R in3: 0 out: R CR in: 0 CR out: 1 ldst len: 0 rc: R lk: 0
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_31.csv | 0b0100001010 | add | XO-Form|
-minor_31.csv | 0b1100001010 | addo | XO-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 | 0b1000001010 | addco | XO-Form|
-minor_31.csv | 0b0010001010 | adde | XO-Form|
-minor_31.csv | 0b1010001010 | addeo | XO-Form|
+minor_31.csv | 0b0000001011 | mulhwu | XO-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 | 0b1110001001 | divdeuo | XO-Form|
 minor_31.csv | 0b0110001011 | divweu | XO-Form|
-minor_31.csv | 0b1110001011 | divweuo | XO-Form|
+minor_31.csv | 0b0110011100 | orc | X-Form|
 minor_31.csv | 0b0110101001 | divde | XO-Form|
-minor_31.csv | 0b1110101001 | divdeo | XO-Form|
 minor_31.csv | 0b0110101011 | divwe | XO-Form|
-minor_31.csv | 0b1110101011 | divweo | XO-Form|
+minor_31.csv | 0b0110111100 | or | X-Form|
 minor_31.csv | 0b0111001001 | divdu | XO-Form|
-minor_31.csv | 0b1111001001 | divduo | XO-Form|
 minor_31.csv | 0b0111001011 | divwu | XO-Form|
-minor_31.csv | 0b1111001011 | divwuo | XO-Form|
+minor_31.csv | 0b0111011100 | nand | X-Form|
 minor_31.csv | 0b0111101001 | divd | XO-Form|
-minor_31.csv | 0b1111101001 | divdo | XO-Form|
 minor_31.csv | 0b0111101011 | divw | XO-Form|
-minor_31.csv | 0b1111101011 | divwo | XO-Form|
-minor_31.csv | 0b0100011100 | eqv | X-Form|
-minor_31.csv | 0b0001001001 | mulhd | XO-Form|
-minor_31.csv | 0b0000001001 | mulhdu | XO-Form|
-minor_31.csv | 0b0001001011 | mulhw | XO-Form|
-minor_31.csv | 0b0000001011 | mulhwu | XO-Form|
-minor_31.csv | 0b1001001001 | mulhd | XO-Form|
+minor_31.csv | 0b1000001000 | subfco | XO-Form|
 minor_31.csv | 0b1000001001 | mulhdu | XO-Form|
-minor_31.csv | 0b1001001011 | mulhw | XO-Form|
+minor_31.csv | 0b1000001010 | addco | XO-Form|
 minor_31.csv | 0b1000001011 | mulhwu | XO-Form|
-minor_31.csv | 0b0011101001 | mulld | XO-Form|
-minor_31.csv | 0b1011101001 | mulldo | XO-Form|
-minor_31.csv | 0b0011101011 | mullw | XO-Form|
-minor_31.csv | 0b1011101011 | mullwo | XO-Form|
-minor_31.csv | 0b0111011100 | nand | X-Form|
-minor_31.csv | 0b0001111100 | nor | X-Form|
-minor_31.csv | 0b0110111100 | or | X-Form|
-minor_31.csv | 0b0110011100 | orc | X-Form|
-minor_31.csv | 0b0000101000 | subf | XO-Form|
 minor_31.csv | 0b1000101000 | subfo | XO-Form|
-minor_31.csv | 0b0000001000 | subfc | XO-Form|
-minor_31.csv | 0b1000001000 | subfco | XO-Form|
-minor_31.csv | 0b0010001000 | subfe | 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 | 0b0100111100 | xor | X-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 | 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|
 """]]
 
 ##  in1: R in2: R in3: 0 out: R CR in: 1 CR out: 0 ldst len: 0 rc: 0 lk: 0
@@ -474,30 +460,30 @@ minor_31.csv | 0b1111101111 | isel | A-Form|
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_31.csv | 0b1111010101 | stbcix | X-Form|
-minor_31.csv | 0b1010010100 | stdbrx | X-Form|
-minor_31.csv | 0b1111110101 | stdcix | X-Form|
-minor_31.csv | 0b0011010110 | stdcx | X-Form|
-minor_31.csv | 0b0010110101 | stdux | X-Form|
 minor_31.csv | 0b0010010101 | stdx | X-Form|
-minor_31.csv | 0b1110010110 | sthbrx | X-Form|
-minor_31.csv | 0b1110110101 | sthcix | X-Form|
-minor_31.csv | 0b1011010110 | sthcx | X-Form|
-minor_31.csv | 0b0110110111 | sthux | X-Form|
+minor_31.csv | 0b0010010110 | stwcx | X-Form|
+minor_31.csv | 0b0010010111 | stwx | X-Form|
+minor_31.csv | 0b0010110101 | stdux | X-Form|
+minor_31.csv | 0b0010110111 | stwux | X-Form|
+minor_31.csv | 0b0011010110 | stdcx | X-Form|
 minor_31.csv | 0b0110010111 | sthx | X-Form|
+minor_31.csv | 0b0110110111 | sthux | X-Form|
+minor_31.csv | 0b1010010100 | stdbrx | X-Form|
 minor_31.csv | 0b1010010110 | stwbrx | X-Form|
+minor_31.csv | 0b1011010110 | sthcx | X-Form|
 minor_31.csv | 0b1110010101 | stwcix | X-Form|
-minor_31.csv | 0b0010010110 | stwcx | X-Form|
-minor_31.csv | 0b0010110111 | stwux | X-Form|
-minor_31.csv | 0b0010010111 | stwx | 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|
 """]]
 
 ##  in1: R in2: R in3: R out: 0 CR in: 0 CR out: 1 ldst len: 1 rc: R lk: 0
 
 [[!table  data="""
 CSV | opcode | asm | form|
-minor_31.csv | 0b1010110110 | stbcx | X-Form|
-minor_31.csv | 0b0011110111 | stbux | X-Form|
 minor_31.csv | 0b0011010111 | stbx | X-Form|
+minor_31.csv | 0b0011110111 | stbux | X-Form|
+minor_31.csv | 0b1010110110 | stbcx | X-Form|
 """]]
 

diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py
index 6c2d5d2e8651cb4e9adb6f855092c42af6d7449e..5a051dae677517e0da9eb8a712c44bf91d16d96d 100644 (file)
--- a/openpower/sv_analysis.py
+++ b/openpower/sv_analysis.py
@@ -123,7 +123,9 @@ def process_csvs():
         print ()
         print ('[[!table  data="""')
         print (tformat(['CSV', 'opcode', 'asm', 'form']))
-        for row in bykey[key]:
+        rows = bykey[key]
+        rows.sort()
+        for row in rows:
             print (tformat(row))
         print ('"""]]')
         print ()