[xcc, sim] mff now uses rs2 for data

this is symmetric with fp stores, so we only need one decoding pipe

3 files changed, 111 insertions, 111 deletions

diff --git a/inst.v b/inst.v
index a8530bf..a9b70fa 100644
--- a/inst.v
+++ b/inst.v
@@ -109,37 +109,37 @@
 `define SGNINJ_D   32'b1101010_?????_?????_1100000101_?????
 `define SGNINJN_D  32'b1101010_?????_?????_1100000110_?????
 `define SGNMUL_D   32'b1101010_?????_?????_1100000111_?????
-`define TRUNC_L_S  32'b1101010_00000_?????_0000100000_?????
-`define TRUNCU_L_S 32'b1101010_00000_?????_0000100001_?????
-`define TRUNC_W_S  32'b1101010_00000_?????_0000100010_?????
-`define TRUNCU_W_S 32'b1101010_00000_?????_0000100011_?????
-`define TRUNC_L_D  32'b1101010_00000_?????_1100100000_?????
-`define TRUNCU_L_D 32'b1101010_00000_?????_1100100001_?????
-`define TRUNC_W_D  32'b1101010_00000_?????_1100100010_?????
-`define TRUNCU_W_D 32'b1101010_00000_?????_1100100011_?????
-`define CVT_S_L    32'b1101010_00000_?????_0000100100_?????
-`define CVTU_S_L   32'b1101010_00000_?????_0000100101_?????
-`define CVT_S_W    32'b1101010_00000_?????_0000100110_?????
-`define CVTU_S_W   32'b1101010_00000_?????_0000100111_?????
-`define CVT_D_L    32'b1101010_00000_?????_1100100100_?????
-`define CVTU_D_L   32'b1101010_00000_?????_1100100101_?????
-`define CVT_D_W    32'b1101010_00000_?????_1100100110_?????
-`define CVTU_D_W   32'b1101010_00000_?????_1100100111_?????
+`define TRUNC_L_S  32'b1101010_00000_?????_0000001000_?????
+`define TRUNCU_L_S 32'b1101010_00000_?????_0000001001_?????
+`define TRUNC_W_S  32'b1101010_00000_?????_0000001010_?????
+`define TRUNCU_W_S 32'b1101010_00000_?????_0000001011_?????
+`define TRUNC_L_D  32'b1101010_00000_?????_1100001000_?????
+`define TRUNCU_L_D 32'b1101010_00000_?????_1100001001_?????
+`define TRUNC_W_D  32'b1101010_00000_?????_1100001010_?????
+`define TRUNCU_W_D 32'b1101010_00000_?????_1100001011_?????
+`define CVT_S_L    32'b1101010_00000_?????_0000001100_?????
+`define CVTU_S_L   32'b1101010_00000_?????_0000001101_?????
+`define CVT_S_W    32'b1101010_00000_?????_0000001110_?????
+`define CVTU_S_W   32'b1101010_00000_?????_0000001111_?????
+`define CVT_D_L    32'b1101010_00000_?????_1100001100_?????
+`define CVTU_D_L   32'b1101010_00000_?????_1100001101_?????
+`define CVT_D_W    32'b1101010_00000_?????_1100001110_?????
+`define CVTU_D_W   32'b1101010_00000_?????_1100001111_?????
 `define CVT_S_D    32'b1101010_00000_?????_0000110011_?????
 `define CVT_D_S    32'b1101010_00000_?????_1100110000_?????
-`define C_EQ_S     32'b1101010_?????_?????_0001000001_?????
-`define C_LT_S     32'b1101010_?????_?????_0001000010_?????
-`define C_LE_S     32'b1101010_?????_?????_0001000011_?????
-`define C_EQ_D     32'b1101010_?????_?????_1101000001_?????
-`define C_LT_D     32'b1101010_?????_?????_1101000010_?????
-`define C_LE_D     32'b1101010_?????_?????_1101000011_?????
-`define MTFLH_D    32'b1101010_?????_?????_1110000000_?????
-`define MFFL_D     32'b1101010_00000_?????_0010100000_?????
-`define MFFH_D     32'b1101010_00000_?????_0010100001_?????
-`define MFF_S      32'b1101010_00000_?????_0011000000_?????
-`define MFF_D      32'b1101010_00000_?????_1111000000_?????
-`define MTF_S      32'b1101010_00000_?????_0011100000_?????
-`define MTF_D      32'b1101010_00000_?????_1111100000_?????
+`define C_EQ_S     32'b1101010_?????_?????_0000010101_?????
+`define C_LT_S     32'b1101010_?????_?????_0000010110_?????
+`define C_LE_S     32'b1101010_?????_?????_0000010111_?????
+`define C_EQ_D     32'b1101010_?????_?????_1100010101_?????
+`define C_LT_D     32'b1101010_?????_?????_1100010110_?????
+`define C_LE_D     32'b1101010_?????_?????_1100010111_?????
+`define MFFL_D     32'b1101010_?????_00000_1100111000_?????
+`define MFFH_D     32'b1101010_?????_00000_1101011000_?????
+`define MFF_S      32'b1101010_?????_00000_0001111000_?????
+`define MFF_D      32'b1101010_?????_00000_1101111000_?????
+`define MTFLH_D    32'b1101010_?????_?????_1110011001_?????
+`define MTF_S      32'b1101010_00000_?????_0010111001_?????
+`define MTF_D      32'b1101010_00000_?????_1110111001_?????
 `define L_S        32'b1101000_00000_?????_0100000000_00000
 `define L_D        32'b1101000_00000_?????_0110000000_00000
 `define S_S        32'b1101001_00000_?????_010_????????????
diff --git a/instr-table.tex b/instr-table.tex
index 602afbf..7c847bb 100644
--- a/instr-table.tex
+++ b/instr-table.tex
@@ -1354,7 +1354,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000100000} &
+\multicolumn{4}{c|}{0000001000} &
 \multicolumn{1}{c|}{rdr} & TRUNC.L.S rdr,rs1 \\
 \cline{2-10}
   
@@ -1363,7 +1363,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000100001} &
+\multicolumn{4}{c|}{0000001001} &
 \multicolumn{1}{c|}{rdr} & TRUNCU.L.S rdr,rs1 \\
 \cline{2-10}
   
@@ -1372,7 +1372,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000100010} &
+\multicolumn{4}{c|}{0000001010} &
 \multicolumn{1}{c|}{rdr} & TRUNC.W.S rdr,rs1 \\
 \cline{2-10}
   
@@ -1381,7 +1381,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000100011} &
+\multicolumn{4}{c|}{0000001011} &
 \multicolumn{1}{c|}{rdr} & TRUNCU.W.S rdr,rs1 \\
 \cline{2-10}
   
@@ -1390,7 +1390,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100100000} &
+\multicolumn{4}{c|}{1100001000} &
 \multicolumn{1}{c|}{rdr} & TRUNC.L.D rdr,rs1 \\
 \cline{2-10}
   
@@ -1399,7 +1399,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100100001} &
+\multicolumn{4}{c|}{1100001001} &
 \multicolumn{1}{c|}{rdr} & TRUNCU.L.D rdr,rs1 \\
 \cline{2-10}
   
@@ -1408,7 +1408,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100100010} &
+\multicolumn{4}{c|}{1100001010} &
 \multicolumn{1}{c|}{rdr} & TRUNC.W.D rdr,rs1 \\
 \cline{2-10}
   
@@ -1417,7 +1417,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100100011} &
+\multicolumn{4}{c|}{1100001011} &
 \multicolumn{1}{c|}{rdr} & TRUNCU.W.D rdr,rs1 \\
 \cline{2-10}
   
@@ -1426,7 +1426,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000100100} &
+\multicolumn{4}{c|}{0000001100} &
 \multicolumn{1}{c|}{rdr} & CVT.S.L rdr,rs1 \\
 \cline{2-10}
   
@@ -1435,7 +1435,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000100101} &
+\multicolumn{4}{c|}{0000001101} &
 \multicolumn{1}{c|}{rdr} & CVTU.S.L rdr,rs1 \\
 \cline{2-10}
   
@@ -1444,7 +1444,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000100110} &
+\multicolumn{4}{c|}{0000001110} &
 \multicolumn{1}{c|}{rdr} & CVT.S.W rdr,rs1 \\
 \cline{2-10}
   
@@ -1453,7 +1453,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0000100111} &
+\multicolumn{4}{c|}{0000001111} &
 \multicolumn{1}{c|}{rdr} & CVTU.S.W rdr,rs1 \\
 \cline{2-10}
   
@@ -1462,7 +1462,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100100100} &
+\multicolumn{4}{c|}{1100001100} &
 \multicolumn{1}{c|}{rdr} & CVT.D.L rdr,rs1 \\
 \cline{2-10}
   
@@ -1471,7 +1471,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100100101} &
+\multicolumn{4}{c|}{1100001101} &
 \multicolumn{1}{c|}{rdr} & CVTU.D.L rdr,rs1 \\
 \cline{2-10}
   
@@ -1480,7 +1480,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100100110} &
+\multicolumn{4}{c|}{1100001110} &
 \multicolumn{1}{c|}{rdr} & CVT.D.W rdr,rs1 \\
 \cline{2-10}
   
@@ -1489,7 +1489,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1100100111} &
+\multicolumn{4}{c|}{1100001111} &
 \multicolumn{1}{c|}{rdr} & CVTU.D.W rdr,rs1 \\
 \cline{2-10}
   
@@ -1516,7 +1516,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0001000001} &
+\multicolumn{4}{c|}{0000010101} &
 \multicolumn{1}{c|}{rdr} & C.EQ.S rdr,rs1,rs2 \\
 \cline{2-10}
   
@@ -1525,7 +1525,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0001000010} &
+\multicolumn{4}{c|}{0000010110} &
 \multicolumn{1}{c|}{rdr} & C.LT.S rdr,rs1,rs2 \\
 \cline{2-10}
   
@@ -1534,7 +1534,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0001000011} &
+\multicolumn{4}{c|}{0000010111} &
 \multicolumn{1}{c|}{rdr} & C.LE.S rdr,rs1,rs2 \\
 \cline{2-10}
   
@@ -1543,7 +1543,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1101000001} &
+\multicolumn{4}{c|}{1100010101} &
 \multicolumn{1}{c|}{rdr} & C.EQ.D rdr,rs1,rs2 \\
 \cline{2-10}
   
@@ -1552,7 +1552,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1101000010} &
+\multicolumn{4}{c|}{1100010110} &
 \multicolumn{1}{c|}{rdr} & C.LT.D rdr,rs1,rs2 \\
 \cline{2-10}
   
@@ -1561,7 +1561,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1101000011} &
+\multicolumn{4}{c|}{1100010111} &
 \multicolumn{1}{c|}{rdr} & C.LE.D rdr,rs1,rs2 \\
 \cline{2-10}
   
@@ -1569,45 +1569,45 @@
 &
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1110000000} &
-\multicolumn{1}{c|}{rdr} & MTFLH.D rdr,rs1,rs2 \\
+\multicolumn{1}{c|}{00000} &
+\multicolumn{4}{c|}{1100111000} &
+\multicolumn{1}{c|}{rdr} & MFFL.D rdr,rs2 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0010100000} &
-\multicolumn{1}{c|}{rdr} & MFFL.D rdr,rs1 \\
+\multicolumn{4}{c|}{1101011000} &
+\multicolumn{1}{c|}{rdr} & MFFH.D rdr,rs2 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0010100001} &
-\multicolumn{1}{c|}{rdr} & MFFH.D rdr,rs1 \\
+\multicolumn{4}{c|}{0001111000} &
+\multicolumn{1}{c|}{rdr} & MFF.S rdr,rs2 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0011000000} &
-\multicolumn{1}{c|}{rdr} & MFF.S rdr,rs1 \\
+\multicolumn{4}{c|}{1101111000} &
+\multicolumn{1}{c|}{rdr} & MFF.D rdr,rs2 \\
 \cline{2-10}
   
 
 &
 \multicolumn{2}{|c|}{1101010} &
-\multicolumn{1}{c|}{00000} &
+\multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1111000000} &
-\multicolumn{1}{c|}{rdr} & MFF.D rdr,rs1 \\
+\multicolumn{4}{c|}{1110011001} &
+\multicolumn{1}{c|}{rdr} & MTFLH.D rdr,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1615,7 +1615,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0011100000} &
+\multicolumn{4}{c|}{0010111001} &
 \multicolumn{1}{c|}{rdr} & MTF.S rdr,rs1 \\
 \cline{2-10}
   
@@ -1624,7 +1624,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1111100000} &
+\multicolumn{4}{c|}{1110111001} &
 \multicolumn{1}{c|}{rdr} & MTF.D rdr,rs1 \\
 \cline{2-10}
   
diff --git a/opcodes b/opcodes
index 555e73c..20fa649 100644
--- a/opcodes
+++ b/opcodes
@@ -130,53 +130,53 @@ sgninj.s    31..25=0x6A 14..13=0 12..10=0 9..5=5 rdr rs1 rs2
 sgninjn.s   31..25=0x6A 14..13=0 12..10=0 9..5=6 rdr rs1 rs2
 sgnmul.s    31..25=0x6A 14..13=0 12..10=0 9..5=7 rdr rs1 rs2
 
-add.d       31..25=0x6A 14..13=3 12..10=0 9..5=0 rdr rs1 rs2
-sub.d       31..25=0x6A 14..13=3 12..10=0 9..5=1 rdr rs1 rs2
-mul.d       31..25=0x6A 14..13=3 12..10=0 9..5=2 rdr rs1 rs2
-div.d       31..25=0x6A 14..13=3 12..10=0 9..5=3 rdr rs1 rs2
-sqrt.d      31..25=0x6A 14..13=3 12..10=0 9..5=4 24..20=0 rdr rs1
-sgninj.d    31..25=0x6A 14..13=3 12..10=0 9..5=5 rdr rs1 rs2
-sgninjn.d   31..25=0x6A 14..13=3 12..10=0 9..5=6 rdr rs1 rs2
-sgnmul.d    31..25=0x6A 14..13=3 12..10=0 9..5=7 rdr rs1 rs2
-
-trunc.l.s   31..25=0x6A 14..13=0 12..10=1 9..5=0 24..20=0 rdr rs1
-truncu.l.s  31..25=0x6A 14..13=0 12..10=1 9..5=1 24..20=0 rdr rs1
-trunc.w.s   31..25=0x6A 14..13=0 12..10=1 9..5=2 24..20=0 rdr rs1
-truncu.w.s  31..25=0x6A 14..13=0 12..10=1 9..5=3 24..20=0 rdr rs1
-
-trunc.l.d   31..25=0x6A 14..13=3 12..10=1 9..5=0 24..20=0 rdr rs1
-truncu.l.d  31..25=0x6A 14..13=3 12..10=1 9..5=1 24..20=0 rdr rs1
-trunc.w.d   31..25=0x6A 14..13=3 12..10=1 9..5=2 24..20=0 rdr rs1
-truncu.w.d  31..25=0x6A 14..13=3 12..10=1 9..5=3 24..20=0 rdr rs1
-
-cvt.s.l     31..25=0x6A 14..13=0 12..10=1 9..5=4 24..20=0 rdr rs1
-cvtu.s.l    31..25=0x6A 14..13=0 12..10=1 9..5=5 24..20=0 rdr rs1
-cvt.s.w     31..25=0x6A 14..13=0 12..10=1 9..5=6 24..20=0 rdr rs1
-cvtu.s.w    31..25=0x6A 14..13=0 12..10=1 9..5=7 24..20=0 rdr rs1
-
-cvt.d.l     31..25=0x6A 14..13=3 12..10=1 9..5=4 24..20=0 rdr rs1
-cvtu.d.l    31..25=0x6A 14..13=3 12..10=1 9..5=5 24..20=0 rdr rs1
-cvt.d.w     31..25=0x6A 14..13=3 12..10=1 9..5=6 24..20=0 rdr rs1
-cvtu.d.w    31..25=0x6A 14..13=3 12..10=1 9..5=7 24..20=0 rdr rs1
+add.d       31..25=0x6A 14..13=3 12..10=0 9..5=0x0 rdr rs1 rs2
+sub.d       31..25=0x6A 14..13=3 12..10=0 9..5=0x1 rdr rs1 rs2
+mul.d       31..25=0x6A 14..13=3 12..10=0 9..5=0x2 rdr rs1 rs2
+div.d       31..25=0x6A 14..13=3 12..10=0 9..5=0x3 rdr rs1 rs2
+sqrt.d      31..25=0x6A 14..13=3 12..10=0 9..5=0x4 24..20=0 rdr rs1
+sgninj.d    31..25=0x6A 14..13=3 12..10=0 9..5=0x5 rdr rs1 rs2
+sgninjn.d   31..25=0x6A 14..13=3 12..10=0 9..5=0x6 rdr rs1 rs2
+sgnmul.d    31..25=0x6A 14..13=3 12..10=0 9..5=0x7 rdr rs1 rs2
+
+trunc.l.s   31..25=0x6A 14..13=0 12..10=0 9..5=0x8 24..20=0 rdr rs1
+truncu.l.s  31..25=0x6A 14..13=0 12..10=0 9..5=0x9 24..20=0 rdr rs1
+trunc.w.s   31..25=0x6A 14..13=0 12..10=0 9..5=0xA 24..20=0 rdr rs1
+truncu.w.s  31..25=0x6A 14..13=0 12..10=0 9..5=0xB 24..20=0 rdr rs1
+
+trunc.l.d   31..25=0x6A 14..13=3 12..10=0 9..5=0x8 24..20=0 rdr rs1
+truncu.l.d  31..25=0x6A 14..13=3 12..10=0 9..5=0x9 24..20=0 rdr rs1
+trunc.w.d   31..25=0x6A 14..13=3 12..10=0 9..5=0xA 24..20=0 rdr rs1
+truncu.w.d  31..25=0x6A 14..13=3 12..10=0 9..5=0xB 24..20=0 rdr rs1
+
+cvt.s.l     31..25=0x6A 14..13=0 12..10=0 9..5=0xC 24..20=0 rdr rs1
+cvtu.s.l    31..25=0x6A 14..13=0 12..10=0 9..5=0xD 24..20=0 rdr rs1
+cvt.s.w     31..25=0x6A 14..13=0 12..10=0 9..5=0xE 24..20=0 rdr rs1
+cvtu.s.w    31..25=0x6A 14..13=0 12..10=0 9..5=0xF 24..20=0 rdr rs1
+
+cvt.d.l     31..25=0x6A 14..13=3 12..10=0 9..5=0xC 24..20=0 rdr rs1
+cvtu.d.l    31..25=0x6A 14..13=3 12..10=0 9..5=0xD 24..20=0 rdr rs1
+cvt.d.w     31..25=0x6A 14..13=3 12..10=0 9..5=0xE 24..20=0 rdr rs1
+cvtu.d.w    31..25=0x6A 14..13=3 12..10=0 9..5=0xF 24..20=0 rdr rs1
 
 cvt.s.d     31..25=0x6A 14..13=0 12..10=1 9..5=0x13 24..20=0 rdr rs1
 cvt.d.s     31..25=0x6A 14..13=3 12..10=1 9..5=0x10 24..20=0 rdr rs1
 
-c.eq.s  31..25=0x6A 14..13=0 12..10=2 9..5=1 rdr rs1 rs2
-c.lt.s  31..25=0x6A 14..13=0 12..10=2 9..5=2 rdr rs1 rs2
-c.le.s  31..25=0x6A 14..13=0 12..10=2 9..5=3 rdr rs1 rs2
-
-c.eq.d  31..25=0x6A 14..13=3 12..10=2 9..5=1 rdr rs1 rs2
-c.lt.d  31..25=0x6A 14..13=3 12..10=2 9..5=2 rdr rs1 rs2
-c.le.d  31..25=0x6A 14..13=3 12..10=2 9..5=3 rdr rs1 rs2
-
-mtflh.d 31..25=0x6A          14..13=3 12..10=4 9..5=0 rdr rs1 rs2
-mffl.d  31..25=0x6A 24..20=0 14..13=0 12..10=5 9..5=0 rdr rs1
-mffh.d  31..25=0x6A 24..20=0 14..13=0 12..10=5 9..5=1 rdr rs1
-mff.s   31..25=0x6A 24..20=0 14..13=0 12..10=6 9..5=0 rdr rs1
-mff.d   31..25=0x6A 24..20=0 14..13=3 12..10=6 9..5=0 rdr rs1
-mtf.s   31..25=0x6A 24..20=0 14..13=0 12..10=7 9..5=0 rdr rs1
-mtf.d   31..25=0x6A 24..20=0 14..13=3 12..10=7 9..5=0 rdr rs1
+c.eq.s  31..25=0x6A 14..13=0 12..10=0 9..5=0x15 rdr rs1 rs2
+c.lt.s  31..25=0x6A 14..13=0 12..10=0 9..5=0x16 rdr rs1 rs2
+c.le.s  31..25=0x6A 14..13=0 12..10=0 9..5=0x17 rdr rs1 rs2
+
+c.eq.d  31..25=0x6A 14..13=3 12..10=0 9..5=0x15 rdr rs1 rs2
+c.lt.d  31..25=0x6A 14..13=3 12..10=0 9..5=0x16 rdr rs1 rs2
+c.le.d  31..25=0x6A 14..13=3 12..10=0 9..5=0x17 rdr rs1 rs2
+
+mffl.d  31..25=0x6A 19..15=0 14..13=3 12..10=1 9..5=0x18 rdr rs2
+mffh.d  31..25=0x6A 19..15=0 14..13=3 12..10=2 9..5=0x18 rdr rs2
+mff.s   31..25=0x6A 19..15=0 14..13=0 12..10=3 9..5=0x18 rdr rs2
+mff.d   31..25=0x6A 19..15=0 14..13=3 12..10=3 9..5=0x18 rdr rs2
+mtflh.d 31..25=0x6A          14..13=3 12..10=4 9..5=0x19 rdr rs1 rs2
+mtf.s   31..25=0x6A 24..20=0 14..13=0 12..10=5 9..5=0x19 rdr rs1
+mtf.d   31..25=0x6A 24..20=0 14..13=3 12..10=5 9..5=0x19 rdr rs1
 
 l.s     31..25=0x68 14..12=2 rdi rs1 imm12
 l.d     31..25=0x68 14..12=3 rdi rs1 imm12