[xcc,opcodes,pk,sim] krste's re-renaming spree

3 files changed, 124 insertions, 158 deletions

diff --git a/inst.v b/inst.v
index eaef07b..ddea342 100644
--- a/inst.v
+++ b/inst.v
@@ -52,17 +52,17 @@
 `define DIVUW      32'b?????_?????_?????_0000001101_0111011
 `define REMW       32'b?????_?????_?????_0000001110_0111011
 `define REMUW      32'b?????_?????_?????_0000001111_0111011
-`define L_B        32'b?????_?????_????????????_000_0000011
-`define L_H        32'b?????_?????_????????????_001_0000011
-`define L_W        32'b?????_?????_????????????_010_0000011
-`define L_D        32'b?????_?????_????????????_011_0000011
-`define L_BU       32'b?????_?????_????????????_100_0000011
-`define L_HU       32'b?????_?????_????????????_101_0000011
-`define L_WU       32'b?????_?????_????????????_110_0000011
-`define S_B        32'b?????_?????_?????_???????_000_0100011
-`define S_H        32'b?????_?????_?????_???????_001_0100011
-`define S_W        32'b?????_?????_?????_???????_010_0100011
-`define S_D        32'b?????_?????_?????_???????_011_0100011
+`define LB         32'b?????_?????_????????????_000_0000011
+`define LH         32'b?????_?????_????????????_001_0000011
+`define LW         32'b?????_?????_????????????_010_0000011
+`define LD         32'b?????_?????_????????????_011_0000011
+`define LBU        32'b?????_?????_????????????_100_0000011
+`define LHU        32'b?????_?????_????????????_101_0000011
+`define LWU        32'b?????_?????_????????????_110_0000011
+`define SB         32'b?????_?????_?????_???????_000_0100011
+`define SH         32'b?????_?????_?????_???????_001_0100011
+`define SW         32'b?????_?????_?????_???????_010_0100011
+`define SD         32'b?????_?????_?????_???????_011_0100011
 `define AMOADD_W   32'b?????_?????_?????_00000_000_10_1000011
 `define AMOSWAP_W  32'b?????_?????_?????_00000_010_10_1000011
 `define AMOAND_W   32'b?????_?????_?????_00000_100_10_1000011
@@ -93,51 +93,51 @@
 `define FMUL_S     32'b?????_?????_?????_00010_???_00_1010011
 `define FDIV_S     32'b?????_?????_?????_00011_???_00_1010011
 `define FSQRT_S    32'b?????_?????_00000_00100_???_00_1010011
-`define FSINJ_S    32'b?????_?????_?????_0010111100_1010011
-`define FSINJN_S   32'b?????_?????_?????_0011011100_1010011
-`define FSMUL_S    32'b?????_?????_?????_0011111100_1010011
+`define FSGNJ_S    32'b?????_?????_?????_0010111100_1010011
+`define FSGNJN_S   32'b?????_?????_?????_0011011100_1010011
+`define FSGNJX_S   32'b?????_?????_?????_0011111100_1010011
 `define FADD_D     32'b?????_?????_?????_00000_???_01_1010011
 `define FSUB_D     32'b?????_?????_?????_00001_???_01_1010011
 `define FMUL_D     32'b?????_?????_?????_00010_???_01_1010011
 `define FDIV_D     32'b?????_?????_?????_00011_???_01_1010011
 `define FSQRT_D    32'b?????_?????_00000_00100_???_01_1010011
-`define FSINJ_D    32'b?????_?????_?????_0010111101_1010011
-`define FSINJN_D   32'b?????_?????_?????_0011011101_1010011
-`define FSMUL_D    32'b?????_?????_?????_0011111101_1010011
+`define FSGNJ_D    32'b?????_?????_?????_0010111101_1010011
+`define FSGNJN_D   32'b?????_?????_?????_0011011101_1010011
+`define FSGNJX_D   32'b?????_?????_?????_0011111101_1010011
 `define FCVT_L_S   32'b?????_?????_00000_01000_???_00_1010011
-`define FCVTU_L_S  32'b?????_?????_00000_01001_???_00_1010011
+`define FCVT_LU_S  32'b?????_?????_00000_01001_???_00_1010011
 `define FCVT_W_S   32'b?????_?????_00000_01010_???_00_1010011
-`define FCVTU_W_S  32'b?????_?????_00000_01011_???_00_1010011
+`define FCVT_WU_S  32'b?????_?????_00000_01011_???_00_1010011
 `define FCVT_L_D   32'b?????_?????_00000_01000_???_01_1010011
-`define FCVTU_L_D  32'b?????_?????_00000_01001_???_01_1010011
+`define FCVT_LU_D  32'b?????_?????_00000_01001_???_01_1010011
 `define FCVT_W_D   32'b?????_?????_00000_01010_???_01_1010011
-`define FCVTU_W_D  32'b?????_?????_00000_01011_???_01_1010011
+`define FCVT_WU_D  32'b?????_?????_00000_01011_???_01_1010011
 `define FCVT_S_L   32'b?????_?????_00000_01100_???_00_1010011
-`define FCVTU_S_L  32'b?????_?????_00000_01101_???_00_1010011
+`define FCVT_S_LU  32'b?????_?????_00000_01101_???_00_1010011
 `define FCVT_S_W   32'b?????_?????_00000_01110_???_00_1010011
-`define FCVTU_S_W  32'b?????_?????_00000_01111_???_00_1010011
+`define FCVT_S_WU  32'b?????_?????_00000_01111_???_00_1010011
 `define FCVT_D_L   32'b?????_?????_00000_01100_???_01_1010011
-`define FCVTU_D_L  32'b?????_?????_00000_01101_???_01_1010011
+`define FCVT_D_LU  32'b?????_?????_00000_01101_???_01_1010011
 `define FCVT_D_W   32'b?????_?????_00000_0111011101_1010011
-`define FCVTU_D_W  32'b?????_?????_00000_0111111101_1010011
+`define FCVT_D_WU  32'b?????_?????_00000_0111111101_1010011
 `define FCVT_S_D   32'b?????_?????_00000_10001_???_00_1010011
-`define FCVT_D_S   32'b?????_?????_00000_1000011101_1010011
-`define FC_EQ_S    32'b?????_?????_?????_1010111100_1010011
-`define FC_LT_S    32'b?????_?????_?????_1011011100_1010011
-`define FC_LE_S    32'b?????_?????_?????_1011111100_1010011
-`define FC_EQ_D    32'b?????_?????_?????_1010111101_1010011
-`define FC_LT_D    32'b?????_?????_?????_1011011101_1010011
-`define FC_LE_D    32'b?????_?????_?????_1011111101_1010011
-`define MFF_S      32'b?????_00000_?????_1100011100_1010011
-`define MFF_D      32'b?????_00000_?????_1100011101_1010011
+`define FCVT_D_S   32'b?????_?????_00000_10000_???_01_1010011
+`define FEQ_S      32'b?????_?????_?????_1010111100_1010011
+`define FLT_S      32'b?????_?????_?????_1011011100_1010011
+`define FLE_S      32'b?????_?????_?????_1011111100_1010011
+`define FEQ_D      32'b?????_?????_?????_1010111101_1010011
+`define FLT_D      32'b?????_?????_?????_1011011101_1010011
+`define FLE_D      32'b?????_?????_?????_1011111101_1010011
+`define MFTX_S     32'b?????_00000_?????_1100011100_1010011
+`define MFTX_D     32'b?????_00000_?????_1100011101_1010011
 `define MFFSR      32'b?????_00000_00000_1101111100_1010011
-`define MTF_S      32'b?????_?????_00000_1110011100_1010011
-`define MTF_D      32'b?????_?????_00000_1110011101_1010011
+`define MXTF_S     32'b?????_?????_00000_1110011100_1010011
+`define MXTF_D     32'b?????_?????_00000_1110011101_1010011
 `define MTFSR      32'b00000_?????_00000_1110111100_1010011
-`define LF_W       32'b?????_?????_????????????_010_0000111
-`define LF_D       32'b?????_?????_????????????_011_0000111
-`define SF_W       32'b?????_?????_?????_???????_010_0100111
-`define SF_D       32'b?????_?????_?????_???????_011_0100111
+`define FLW        32'b?????_?????_????????????_010_0000111
+`define FLD        32'b?????_?????_????????????_011_0000111
+`define FSW        32'b?????_?????_?????_???????_010_0100111
+`define FSD        32'b?????_?????_?????_???????_011_0100111
 `define FMADD_S    32'b?????_?????_?????_?????_???_00_1000011
 `define FMSUB_S    32'b?????_?????_?????_?????_???_00_1000111
 `define FNMSUB_S   32'b?????_?????_?????_?????_???_00_1001011
diff --git a/instr-table.tex b/instr-table.tex
index ec1462d..ade746c 100644
--- a/instr-table.tex
+++ b/instr-table.tex
@@ -568,7 +568,7 @@
 \multicolumn{2}{c|}{000} &
 \multicolumn{4}{c|}{imm12} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & L.B rd,rs1,imm12 \\
+\multicolumn{1}{c|}{rd} & LB rd,rs1,imm12 \\
 \cline{2-10}
   
 
@@ -577,7 +577,7 @@
 \multicolumn{2}{c|}{000} &
 \multicolumn{4}{c|}{imm12} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & L.H rd,rs1,imm12 \\
+\multicolumn{1}{c|}{rd} & LH rd,rs1,imm12 \\
 \cline{2-10}
   
 
@@ -586,7 +586,7 @@
 \multicolumn{2}{c|}{000} &
 \multicolumn{4}{c|}{imm12} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & L.W rd,rs1,imm12 \\
+\multicolumn{1}{c|}{rd} & LW rd,rs1,imm12 \\
 \cline{2-10}
   
 
@@ -595,7 +595,7 @@
 \multicolumn{2}{c|}{000} &
 \multicolumn{4}{c|}{imm12} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & L.D rd,rs1,imm12 \\
+\multicolumn{1}{c|}{rd} & LD rd,rs1,imm12 \\
 \cline{2-10}
   
 
@@ -604,7 +604,7 @@
 \multicolumn{2}{c|}{000} &
 \multicolumn{4}{c|}{imm12} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & L.BU rd,rs1,imm12 \\
+\multicolumn{1}{c|}{rd} & LBU rd,rs1,imm12 \\
 \cline{2-10}
   
 
@@ -613,7 +613,7 @@
 \multicolumn{2}{c|}{000} &
 \multicolumn{4}{c|}{imm12} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & L.HU rd,rs1,imm12 \\
+\multicolumn{1}{c|}{rd} & LHU rd,rs1,imm12 \\
 \cline{2-10}
   
 
@@ -622,7 +622,7 @@
 \multicolumn{2}{c|}{000} &
 \multicolumn{4}{c|}{imm12} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & L.WU rd,rs1,imm12 \\
+\multicolumn{1}{c|}{rd} & LWU rd,rs1,imm12 \\
 \cline{2-10}
   
 
@@ -632,7 +632,7 @@
 \multicolumn{3}{c|}{imm12hi} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm12lo} & S.B imm12hi,rs1,rs2,imm12lo \\
+\multicolumn{1}{c|}{imm12lo} & SB imm12hi,rs1,rs2,imm12lo \\
 \cline{2-10}
   
 
@@ -642,7 +642,7 @@
 \multicolumn{3}{c|}{imm12hi} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm12lo} & S.H imm12hi,rs1,rs2,imm12lo \\
+\multicolumn{1}{c|}{imm12lo} & SH imm12hi,rs1,rs2,imm12lo \\
 \cline{2-10}
   
 
@@ -652,7 +652,7 @@
 \multicolumn{3}{c|}{imm12hi} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm12lo} & S.W imm12hi,rs1,rs2,imm12lo \\
+\multicolumn{1}{c|}{imm12lo} & SW imm12hi,rs1,rs2,imm12lo \\
 \cline{2-10}
   
 
@@ -662,7 +662,7 @@
 \multicolumn{3}{c|}{imm12hi} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm12lo} & S.D imm12hi,rs1,rs2,imm12lo \\
+\multicolumn{1}{c|}{imm12lo} & SD imm12hi,rs1,rs2,imm12lo \\
 \cline{2-10}
   
 
@@ -967,7 +967,7 @@
 \multicolumn{5}{c|}{0000000000} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FSINJ.S rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FSGNJ.S rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -976,7 +976,7 @@
 \multicolumn{5}{c|}{0000000000} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FSINJN.S rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FSGNJN.S rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -985,7 +985,7 @@
 \multicolumn{5}{c|}{0000000000} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FSMUL.S rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FSGNJX.S rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1049,7 +1049,7 @@
 \multicolumn{5}{c|}{0000000000} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FSINJ.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FSGNJ.D rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1058,7 +1058,7 @@
 \multicolumn{5}{c|}{0000000000} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FSINJN.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FSGNJN.D rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1067,7 +1067,7 @@
 \multicolumn{5}{c|}{0000000000} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FSMUL.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FSGNJX.D rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1089,7 +1089,7 @@
 \multicolumn{2}{c|}{00001} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FCVTU.L.S rd,rs1[,rm] \\
+\multicolumn{1}{c|}{rd} & FCVT.LU.S rd,rs1[,rm] \\
 \cline{2-10}
   
 
@@ -1111,7 +1111,7 @@
 \multicolumn{2}{c|}{00001} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FCVTU.W.S rd,rs1[,rm] \\
+\multicolumn{1}{c|}{rd} & FCVT.WU.S rd,rs1[,rm] \\
 \cline{2-10}
   
 
@@ -1133,7 +1133,7 @@
 \multicolumn{2}{c|}{00001} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FCVTU.L.D rd,rs1[,rm] \\
+\multicolumn{1}{c|}{rd} & FCVT.LU.D rd,rs1[,rm] \\
 \cline{2-10}
   
 
@@ -1155,7 +1155,7 @@
 \multicolumn{2}{c|}{00001} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FCVTU.W.D rd,rs1[,rm] \\
+\multicolumn{1}{c|}{rd} & FCVT.WU.D rd,rs1[,rm] \\
 \cline{2-10}
   
 
@@ -1177,7 +1177,7 @@
 \multicolumn{2}{c|}{00001} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FCVTU.S.L rd,rs1[,rm] \\
+\multicolumn{1}{c|}{rd} & FCVT.S.LU rd,rs1[,rm] \\
 \cline{2-10}
   
 
@@ -1199,7 +1199,7 @@
 \multicolumn{2}{c|}{00001} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FCVTU.S.W rd,rs1[,rm] \\
+\multicolumn{1}{c|}{rd} & FCVT.S.WU rd,rs1[,rm] \\
 \cline{2-10}
   
 
@@ -1221,7 +1221,7 @@
 \multicolumn{2}{c|}{00001} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FCVTU.D.L rd,rs1[,rm] \\
+\multicolumn{1}{c|}{rd} & FCVT.D.LU rd,rs1[,rm] \\
 \cline{2-10}
   
 
@@ -1239,7 +1239,7 @@
 \multicolumn{5}{c|}{0000000001} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FCVTU.D.W rd,rs1 \\
+\multicolumn{1}{c|}{rd} & FCVT.D.WU rd,rs1 \\
 \cline{2-10}
   
 
@@ -1256,10 +1256,12 @@
 
 &
 \multicolumn{1}{|c|}{0000000} &
-\multicolumn{5}{c|}{0000000010} &
+\multicolumn{1}{c|}{00} &
+\multicolumn{2}{c|}{rm} &
+\multicolumn{2}{c|}{00010} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FCVT.D.S rd,rs1 \\
+\multicolumn{1}{c|}{rd} & FCVT.D.S rd,rs1[,rm] \\
 \cline{2-10}
   
 
@@ -1268,7 +1270,7 @@
 \multicolumn{5}{c|}{0000000010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FC.EQ.S rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FEQ.S rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1277,7 +1279,7 @@
 \multicolumn{5}{c|}{0000000010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FC.LT.S rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FLT.S rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1286,7 +1288,7 @@
 \multicolumn{5}{c|}{0000000010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FC.LE.S rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FLE.S rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1295,7 +1297,7 @@
 \multicolumn{5}{c|}{0000000010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FC.EQ.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FEQ.D rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1304,7 +1306,7 @@
 \multicolumn{5}{c|}{0000000010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FC.LT.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FLT.D rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1313,7 +1315,7 @@
 \multicolumn{5}{c|}{0000000010} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & FC.LE.D rd,rs1,rs2 \\
+\multicolumn{1}{c|}{rd} & FLE.D rd,rs1,rs2 \\
 \cline{2-10}
   
 
@@ -1322,7 +1324,7 @@
 \multicolumn{5}{c|}{0000000011} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rd} & MFF.S rd,rs2 \\
+\multicolumn{1}{c|}{rd} & MFTX.S rd,rs2 \\
 \cline{2-10}
   
 
@@ -1331,7 +1333,7 @@
 \multicolumn{5}{c|}{0000000011} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rd} & MFF.D rd,rs2 \\
+\multicolumn{1}{c|}{rd} & MFTX.D rd,rs2 \\
 \cline{2-10}
   
 
@@ -1349,7 +1351,7 @@
 \multicolumn{5}{c|}{0000000011} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & MTF.S rd,rs1 \\
+\multicolumn{1}{c|}{rd} & MXTF.S rd,rs1 \\
 \cline{2-10}
   
 
@@ -1358,7 +1360,7 @@
 \multicolumn{5}{c|}{0000000011} &
 \multicolumn{1}{c|}{00000} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & MTF.D rd,rs1 \\
+\multicolumn{1}{c|}{rd} & MXTF.D rd,rs1 \\
 \cline{2-10}
   
 
@@ -1376,7 +1378,7 @@
 \multicolumn{2}{c|}{000} &
 \multicolumn{4}{c|}{imm12} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & LF.W rd,rs1,imm12 \\
+\multicolumn{1}{c|}{rd} & FLW rd,rs1,imm12 \\
 \cline{2-10}
   
 
@@ -1385,7 +1387,7 @@
 \multicolumn{2}{c|}{000} &
 \multicolumn{4}{c|}{imm12} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & LF.D rd,rs1,imm12 \\
+\multicolumn{1}{c|}{rd} & FLD rd,rs1,imm12 \\
 \cline{2-10}
   
 
@@ -1395,7 +1397,7 @@
 \multicolumn{3}{c|}{imm12hi} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm12lo} & SF.W imm12hi,rs1,rs2,imm12lo \\
+\multicolumn{1}{c|}{imm12lo} & FSW imm12hi,rs1,rs2,imm12lo \\
 \cline{2-10}
   
 
@@ -1405,7 +1407,7 @@
 \multicolumn{3}{c|}{imm12hi} &
 \multicolumn{1}{c|}{rs2} &
 \multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{imm12lo} & SF.D imm12hi,rs1,rs2,imm12lo \\
+\multicolumn{1}{c|}{imm12lo} & FSD imm12hi,rs1,rs2,imm12lo \\
 \cline{2-10}
   
 
@@ -1789,48 +1791,12 @@
   
 
 &
-\multicolumn{1}{|c|}{0000000} &
-\multicolumn{5}{c|}{0000000011} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & MTF.S rd,rs1 \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{0000000} &
-\multicolumn{5}{c|}{0000000011} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rs1} &
-\multicolumn{1}{c|}{rd} & MTF.D rd,rs1 \\
-\cline{2-10}
-  
-
-&
 \multicolumn{9}{c}{} & \\
 &
 \multicolumn{9}{c}{\bf Floating-Point to Integer Move \& Conversion Instructions} & \\
 \cline{2-10}
   
 
-&
-\multicolumn{1}{|c|}{0000000} &
-\multicolumn{5}{c|}{0000000011} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rd} & MFF.S rd,rs2 \\
-\cline{2-10}
-  
-
-&
-\multicolumn{1}{|c|}{0000000} &
-\multicolumn{5}{c|}{0000000011} &
-\multicolumn{1}{c|}{rs2} &
-\multicolumn{1}{c|}{00000} &
-\multicolumn{1}{c|}{rd} & MFF.D rd,rs2 \\
-\cline{2-10}
-  
-
 \end{tabular}
 \end{center}
 \end{small}
diff --git a/opcodes b/opcodes
index 10f0298..6a002fe 100644
--- a/opcodes
+++ b/opcodes
@@ -71,21 +71,21 @@ divuw   rd rs1 rs2 16=0 15..10=1 9..7=5 6..2=0x0E 1..0=3
 remw    rd rs1 rs2 16=0 15..10=1 9..7=6 6..2=0x0E 1..0=3
 remuw   rd rs1 rs2 16=0 15..10=1 9..7=7 6..2=0x0E 1..0=3
 
-l.b     rd rs1       imm12 9..7=0 6..2=0x00 1..0=3
-l.h     rd rs1       imm12 9..7=1 6..2=0x00 1..0=3
-l.w     rd rs1       imm12 9..7=2 6..2=0x00 1..0=3
-l.d     rd rs1       imm12 9..7=3 6..2=0x00 1..0=3
-l.bu    rd rs1       imm12 9..7=4 6..2=0x00 1..0=3
-l.hu    rd rs1       imm12 9..7=5 6..2=0x00 1..0=3
-l.wu    rd rs1       imm12 9..7=6 6..2=0x00 1..0=3
+lb      rd rs1       imm12 9..7=0 6..2=0x00 1..0=3
+lh      rd rs1       imm12 9..7=1 6..2=0x00 1..0=3
+lw      rd rs1       imm12 9..7=2 6..2=0x00 1..0=3
+ld      rd rs1       imm12 9..7=3 6..2=0x00 1..0=3
+lbu     rd rs1       imm12 9..7=4 6..2=0x00 1..0=3
+lhu     rd rs1       imm12 9..7=5 6..2=0x00 1..0=3
+lwu     rd rs1       imm12 9..7=6 6..2=0x00 1..0=3
 
 # NOTE: if you add new store instructions, make sure to modify tc-mips-riscv.c
 # and elfxx-mips.c to detect them.  this is a hack to handle the split immed.
 # just open up those files and search for MATCH_S_W; should be obvious.
-s.b     imm12hi rs1 rs2 imm12lo 9..7=0 6..2=0x08 1..0=3
-s.h     imm12hi rs1 rs2 imm12lo 9..7=1 6..2=0x08 1..0=3
-s.w     imm12hi rs1 rs2 imm12lo 9..7=2 6..2=0x08 1..0=3
-s.d     imm12hi rs1 rs2 imm12lo 9..7=3 6..2=0x08 1..0=3
+sb     imm12hi rs1 rs2 imm12lo 9..7=0 6..2=0x08 1..0=3
+sh     imm12hi rs1 rs2 imm12lo 9..7=1 6..2=0x08 1..0=3
+sw     imm12hi rs1 rs2 imm12lo 9..7=2 6..2=0x08 1..0=3
+sd     imm12hi rs1 rs2 imm12lo 9..7=3 6..2=0x08 1..0=3
 
 amoadd.w    rd rs1 rs2 16..10=0 9..7=2 6..2=0x10 1..0=3
 amoswap.w   rd rs1 rs2 16..10=1 9..7=2 6..2=0x10 1..0=3
@@ -123,62 +123,62 @@ fsub.s      rd rs1 rs2      16..12=1    rm      8..7=0 6..2=0x14 1..0=3
 fmul.s      rd rs1 rs2      16..12=2    rm      8..7=0 6..2=0x14 1..0=3
 fdiv.s      rd rs1 rs2      16..12=3    rm      8..7=0 6..2=0x14 1..0=3
 fsqrt.s     rd rs1 21..17=0 16..12=4    rm      8..7=0 6..2=0x14 1..0=3
-fsinj.s     rd rs1 rs2      16..12=5    11..9=7 8..7=0 6..2=0x14 1..0=3
-fsinjn.s    rd rs1 rs2      16..12=6    11..9=7 8..7=0 6..2=0x14 1..0=3
-fsmul.s     rd rs1 rs2      16..12=7    11..9=7 8..7=0 6..2=0x14 1..0=3
+fsgnj.s     rd rs1 rs2      16..12=5    11..9=7 8..7=0 6..2=0x14 1..0=3
+fsgnjn.s    rd rs1 rs2      16..12=6    11..9=7 8..7=0 6..2=0x14 1..0=3
+fsgnjx.s    rd rs1 rs2      16..12=7    11..9=7 8..7=0 6..2=0x14 1..0=3
 
 fadd.d      rd rs1 rs2      16..12=0x0  rm      8..7=1 6..2=0x14 1..0=3
 fsub.d      rd rs1 rs2      16..12=0x1  rm      8..7=1 6..2=0x14 1..0=3
 fmul.d      rd rs1 rs2      16..12=0x2  rm      8..7=1 6..2=0x14 1..0=3
 fdiv.d      rd rs1 rs2      16..12=0x3  rm      8..7=1 6..2=0x14 1..0=3
 fsqrt.d     rd rs1 21..17=0 16..12=0x4  rm      8..7=1 6..2=0x14 1..0=3
-fsinj.d     rd rs1 rs2      16..12=0x5  11..9=7 8..7=1 6..2=0x14 1..0=3
-fsinjn.d    rd rs1 rs2      16..12=0x6  11..9=7 8..7=1 6..2=0x14 1..0=3
-fsmul.d     rd rs1 rs2      16..12=0x7  11..9=7 8..7=1 6..2=0x14 1..0=3
+fsgnj.d     rd rs1 rs2      16..12=0x5  11..9=7 8..7=1 6..2=0x14 1..0=3
+fsgnjn.d    rd rs1 rs2      16..12=0x6  11..9=7 8..7=1 6..2=0x14 1..0=3
+fsgnjx.d    rd rs1 rs2      16..12=0x7  11..9=7 8..7=1 6..2=0x14 1..0=3
 
 fcvt.l.s    rd rs1 21..17=0 16..12=0x8  rm      8..7=0 6..2=0x14 1..0=3
-fcvtu.l.s   rd rs1 21..17=0 16..12=0x9  rm      8..7=0 6..2=0x14 1..0=3
+fcvt.lu.s   rd rs1 21..17=0 16..12=0x9  rm      8..7=0 6..2=0x14 1..0=3
 fcvt.w.s    rd rs1 21..17=0 16..12=0xA  rm      8..7=0 6..2=0x14 1..0=3
-fcvtu.w.s   rd rs1 21..17=0 16..12=0xB  rm      8..7=0 6..2=0x14 1..0=3
+fcvt.wu.s   rd rs1 21..17=0 16..12=0xB  rm      8..7=0 6..2=0x14 1..0=3
 
 fcvt.l.d    rd rs1 21..17=0 16..12=0x8  rm      8..7=1 6..2=0x14 1..0=3
-fcvtu.l.d   rd rs1 21..17=0 16..12=0x9  rm      8..7=1 6..2=0x14 1..0=3
+fcvt.lu.d   rd rs1 21..17=0 16..12=0x9  rm      8..7=1 6..2=0x14 1..0=3
 fcvt.w.d    rd rs1 21..17=0 16..12=0xA  rm      8..7=1 6..2=0x14 1..0=3
-fcvtu.w.d   rd rs1 21..17=0 16..12=0xB  rm      8..7=1 6..2=0x14 1..0=3
+fcvt.wu.d   rd rs1 21..17=0 16..12=0xB  rm      8..7=1 6..2=0x14 1..0=3
 
 fcvt.s.l    rd rs1 21..17=0 16..12=0xC  rm      8..7=0 6..2=0x14 1..0=3
-fcvtu.s.l   rd rs1 21..17=0 16..12=0xD  rm      8..7=0 6..2=0x14 1..0=3
+fcvt.s.lu   rd rs1 21..17=0 16..12=0xD  rm      8..7=0 6..2=0x14 1..0=3
 fcvt.s.w    rd rs1 21..17=0 16..12=0xE  rm      8..7=0 6..2=0x14 1..0=3
-fcvtu.s.w   rd rs1 21..17=0 16..12=0xF  rm      8..7=0 6..2=0x14 1..0=3
+fcvt.s.wu   rd rs1 21..17=0 16..12=0xF  rm      8..7=0 6..2=0x14 1..0=3
 
 fcvt.d.l    rd rs1 21..17=0 16..12=0xC  rm      8..7=1 6..2=0x14 1..0=3
-fcvtu.d.l   rd rs1 21..17=0 16..12=0xD  rm      8..7=1 6..2=0x14 1..0=3
+fcvt.d.lu   rd rs1 21..17=0 16..12=0xD  rm      8..7=1 6..2=0x14 1..0=3
 fcvt.d.w    rd rs1 21..17=0 16..12=0xE  11..9=7 8..7=1 6..2=0x14 1..0=3
-fcvtu.d.w   rd rs1 21..17=0 16..12=0xF  11..9=7 8..7=1 6..2=0x14 1..0=3
+fcvt.d.wu   rd rs1 21..17=0 16..12=0xF  11..9=7 8..7=1 6..2=0x14 1..0=3
 
-fcvt.s.d    rd rs1 21..17=0 16..14=0x4 13..12=1 rm      8..7=0 6..2=0x14 1..0=3
-fcvt.d.s    rd rs1 21..17=0 16..14=0x4 13..12=0 11..9=7 8..7=1 6..2=0x14 1..0=3
+fcvt.s.d    rd rs1 21..17=0 16..14=0x4 13..12=1 rm 8..7=0 6..2=0x14 1..0=3
+fcvt.d.s    rd rs1 21..17=0 16..14=0x4 13..12=0 rm 8..7=1 6..2=0x14 1..0=3
 
-fc.eq.s     rd rs1 rs2      16..12=0x15 11..9=7 8..7=0 6..2=0x14 1..0=3
-fc.lt.s     rd rs1 rs2      16..12=0x16 11..9=7 8..7=0 6..2=0x14 1..0=3
-fc.le.s     rd rs1 rs2      16..12=0x17 11..9=7 8..7=0 6..2=0x14 1..0=3
+feq.s     rd rs1 rs2      16..12=0x15 11..9=7 8..7=0 6..2=0x14 1..0=3
+flt.s     rd rs1 rs2      16..12=0x16 11..9=7 8..7=0 6..2=0x14 1..0=3
+fle.s     rd rs1 rs2      16..12=0x17 11..9=7 8..7=0 6..2=0x14 1..0=3
 
-fc.eq.d     rd rs1 rs2      16..12=0x15 11..9=7 8..7=1 6..2=0x14 1..0=3
-fc.lt.d     rd rs1 rs2      16..12=0x16 11..9=7 8..7=1 6..2=0x14 1..0=3
-fc.le.d     rd rs1 rs2      16..12=0x17 11..9=7 8..7=1 6..2=0x14 1..0=3
+feq.d     rd rs1 rs2      16..12=0x15 11..9=7 8..7=1 6..2=0x14 1..0=3
+flt.d     rd rs1 rs2      16..12=0x16 11..9=7 8..7=1 6..2=0x14 1..0=3
+fle.d     rd rs1 rs2      16..12=0x17 11..9=7 8..7=1 6..2=0x14 1..0=3
 
-mff.s       rd 26..22=0  rs2      16..12=0x18 11..9=7 8..7=0 6..2=0x14 1..0=3
-mff.d       rd 26..22=0  rs2      16..12=0x18 11..9=7 8..7=1 6..2=0x14 1..0=3
+mftx.s      rd 26..22=0  rs2      16..12=0x18 11..9=7 8..7=0 6..2=0x14 1..0=3
+mftx.d      rd 26..22=0  rs2      16..12=0x18 11..9=7 8..7=1 6..2=0x14 1..0=3
 mffsr       rd 26..22=0  21..17=0 16..12=0x1B 11..9=7 8..7=0 6..2=0x14 1..0=3
-mtf.s       rd       rs1 21..17=0 16..12=0x1C 11..9=7 8..7=0 6..2=0x14 1..0=3
-mtf.d       rd       rs1 21..17=0 16..12=0x1C 11..9=7 8..7=1 6..2=0x14 1..0=3
+mxtf.s      rd       rs1 21..17=0 16..12=0x1C 11..9=7 8..7=0 6..2=0x14 1..0=3
+mxtf.d      rd       rs1 21..17=0 16..12=0x1C 11..9=7 8..7=1 6..2=0x14 1..0=3
 mtfsr       31..27=0 rs1 21..17=0 16..12=0x1D 11..9=7 8..7=0 6..2=0x14 1..0=3
 
-lf.w        rd rs1 imm12 9..7=2 6..2=0x01 1..0=3
-lf.d        rd rs1 imm12 9..7=3 6..2=0x01 1..0=3
+flw        rd rs1 imm12 9..7=2 6..2=0x01 1..0=3
+fld        rd rs1 imm12 9..7=3 6..2=0x01 1..0=3
 
-sf.w        imm12hi rs1 rs2 imm12lo 9..7=2 6..2=0x09 1..0=3
-sf.d        imm12hi rs1 rs2 imm12lo 9..7=3 6..2=0x09 1..0=3
+fsw        imm12hi rs1 rs2 imm12lo 9..7=2 6..2=0x09 1..0=3
+fsd        imm12hi rs1 rs2 imm12lo 9..7=3 6..2=0x09 1..0=3
 
 fmadd.s     rd rs1 rs2 rs3 rm 8..7=0 6..2=0x10 1..0=3
 fmsub.s     rd rs1 rs2 rs3 rm 8..7=0 6..2=0x11 1..0=3