[xcc] modified opcodes for better FP decode mapping

3 files changed, 21 insertions, 21 deletions

diff --git a/inst.v b/inst.v
index 8a427a4..493516e 100644
--- a/inst.v
+++ b/inst.v
@@ -133,13 +133,13 @@
 `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 MFF_S      32'b1101010_?????_00000_0001011000_?????
+`define MFF_D      32'b1101010_?????_00000_1101011000_?????
+`define MFFL_D     32'b1101010_?????_00000_1101011001_?????
+`define MFFH_D     32'b1101010_?????_00000_1101011010_?????
+`define MTF_S      32'b1101010_00000_?????_0001011100_?????
+`define MTF_D      32'b1101010_00000_?????_1101011100_?????
+`define MTFLH_D    32'b1101010_?????_?????_1101011101_?????
 `define L_S        32'b1101000_?????_?????_010_????????????
 `define L_D        32'b1101000_?????_?????_011_????????????
 `define S_S        32'b1101001_?????_?????_010_????????????
diff --git a/instr-table.tex b/instr-table.tex
index b5759b2..4389fb4 100644
--- a/instr-table.tex
+++ b/instr-table.tex
@@ -1523,7 +1523,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1110011001} &
+\multicolumn{4}{c|}{1101011101} &
 \multicolumn{1}{c|}{rdr} & MTFLH.D rdr,rs1,rs2 \\
 \cline{2-10}
   
@@ -1532,7 +1532,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{0010111001} &
+\multicolumn{4}{c|}{0001011100} &
 \multicolumn{1}{c|}{rdr} & MTF.S rdr,rs1 \\
 \cline{2-10}
   
@@ -1541,7 +1541,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{4}{c|}{1110111001} &
+\multicolumn{4}{c|}{1101011100} &
 \multicolumn{1}{c|}{rdr} & MTF.D rdr,rs1 \\
 \cline{2-10}
   
@@ -1629,7 +1629,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{1100111000} &
+\multicolumn{4}{c|}{1101011001} &
 \multicolumn{1}{c|}{rdr} & MFFL.D rdr,rs2 \\
 \cline{2-10}
   
@@ -1638,7 +1638,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{1101011000} &
+\multicolumn{4}{c|}{1101011010} &
 \multicolumn{1}{c|}{rdr} & MFFH.D rdr,rs2 \\
 \cline{2-10}
   
@@ -1647,7 +1647,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{0001111000} &
+\multicolumn{4}{c|}{0001011000} &
 \multicolumn{1}{c|}{rdr} & MFF.S rdr,rs2 \\
 \cline{2-10}
   
@@ -1656,7 +1656,7 @@
 \multicolumn{2}{|c|}{1101010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{4}{c|}{1101111000} &
+\multicolumn{4}{c|}{1101011000} &
 \multicolumn{1}{c|}{rdr} & MFF.D rdr,rs2 \\
 \cline{2-10}
   
diff --git a/opcodes b/opcodes
index 5577187..ecb066e 100644
--- a/opcodes
+++ b/opcodes
@@ -170,13 +170,13 @@ 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
+mff.s   31..25=0x6A 19..15=0 14..13=0 12..10=2 9..5=0x18 rdr rs2
+mff.d   31..25=0x6A 19..15=0 14..13=3 12..10=2 9..5=0x18 rdr rs2
+mffl.d  31..25=0x6A 19..15=0 14..13=3 12..10=2 9..5=0x19 rdr rs2
+mffh.d  31..25=0x6A 19..15=0 14..13=3 12..10=2 9..5=0x1A rdr rs2
+mtf.s   31..25=0x6A 24..20=0 14..13=0 12..10=2 9..5=0x1C rdr rs1
+mtf.d   31..25=0x6A 24..20=0 14..13=3 12..10=2 9..5=0x1C rdr rs1
+mtflh.d 31..25=0x6A          14..13=3 12..10=3 9..5=0x1C rdr rs1 rs2
 
 l.s     31..25=0x68 14..12=2 rdi rs1 imm12
 l.d     31..25=0x68 14..12=3 rdi rs1 imm12