[opcodes] minor opcode changes

2 files changed, 58 insertions, 58 deletions

diff --git a/inst.v b/inst.v
index 13e9e2b..f40fcec 100644
--- a/inst.v
+++ b/inst.v
@@ -64,22 +64,22 @@
 `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
-`define AMOOR_W    32'b?????_?????_?????_00000_110_10_1000011
-`define AMOMIN_W   32'b?????_?????_?????_00001_000_10_1000011
-`define AMOMAX_W   32'b?????_?????_?????_00001_010_10_1000011
-`define AMOMINU_W  32'b?????_?????_?????_00001_100_10_1000011
-`define AMOMAXU_W  32'b?????_?????_?????_00001_110_10_1000011
-`define AMOADD_D   32'b?????_?????_?????_00000_000_11_1000011
-`define AMOSWAP_D  32'b?????_?????_?????_00000_010_11_1000011
-`define AMOAND_D   32'b?????_?????_?????_00000_100_11_1000011
-`define AMOOR_D    32'b?????_?????_?????_00000_110_11_1000011
-`define AMOMIN_D   32'b?????_?????_?????_00001_000_11_1000011
-`define AMOMAX_D   32'b?????_?????_?????_00001_010_11_1000011
-`define AMOMINU_D  32'b?????_?????_?????_00001_100_11_1000011
-`define AMOMAXU_D  32'b?????_?????_?????_00001_110_11_1000011
+`define AMOADD_W   32'b?????_?????_?????_0000000010_0101011
+`define AMOSWAP_W  32'b?????_?????_?????_0000001010_0101011
+`define AMOAND_W   32'b?????_?????_?????_0000010010_0101011
+`define AMOOR_W    32'b?????_?????_?????_0000011010_0101011
+`define AMOMIN_W   32'b?????_?????_?????_0000100010_0101011
+`define AMOMAX_W   32'b?????_?????_?????_0000101010_0101011
+`define AMOMINU_W  32'b?????_?????_?????_0000110010_0101011
+`define AMOMAXU_W  32'b?????_?????_?????_0000111010_0101011
+`define AMOADD_D   32'b?????_?????_?????_0000000011_0101011
+`define AMOSWAP_D  32'b?????_?????_?????_0000001011_0101011
+`define AMOAND_D   32'b?????_?????_?????_0000010011_0101011
+`define AMOOR_D    32'b?????_?????_?????_0000011011_0101011
+`define AMOMIN_D   32'b?????_?????_?????_0000100011_0101011
+`define AMOMAX_D   32'b?????_?????_?????_0000101011_0101011
+`define AMOMINU_D  32'b?????_?????_?????_0000110011_0101011
+`define AMOMAXU_D  32'b?????_?????_?????_0000111011_0101011
 `define FENCE_I    32'b?????_?????_????????????_001_0101111
 `define FENCE      32'b?????_?????_????????????_010_0101111
 `define SYSCALL    32'b00000_00000_00000_0000000000_1110111
@@ -94,17 +94,17 @@
 `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 FSGNJ_S    32'b?????_?????_?????_0010100000_1010011
-`define FSGNJN_S   32'b?????_?????_?????_0011000000_1010011
-`define FSGNJX_S   32'b?????_?????_?????_0011100000_1010011
+`define FSGNJ_S    32'b?????_?????_?????_00101_000_00_1010011
+`define FSGNJN_S   32'b?????_?????_?????_00110_000_00_1010011
+`define FSGNJX_S   32'b?????_?????_?????_00111_000_00_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 FSGNJ_D    32'b?????_?????_?????_0010100001_1010011
-`define FSGNJN_D   32'b?????_?????_?????_0011000001_1010011
-`define FSGNJX_D   32'b?????_?????_?????_0011100001_1010011
+`define FSGNJ_D    32'b?????_?????_?????_00101_000_01_1010011
+`define FSGNJN_D   32'b?????_?????_?????_00110_000_01_1010011
+`define FSGNJX_D   32'b?????_?????_?????_00111_000_01_1010011
 `define FCVT_L_S   32'b?????_?????_00000_01000_???_00_1010011
 `define FCVT_LU_S  32'b?????_?????_00000_01001_???_00_1010011
 `define FCVT_W_S   32'b?????_?????_00000_01010_???_00_1010011
@@ -119,26 +119,26 @@
 `define FCVT_S_WU  32'b?????_?????_00000_01111_???_00_1010011
 `define FCVT_D_L   32'b?????_?????_00000_01100_???_01_1010011
 `define FCVT_D_LU  32'b?????_?????_00000_01101_???_01_1010011
-`define FCVT_D_W   32'b?????_?????_00000_0111000001_1010011
-`define FCVT_D_WU  32'b?????_?????_00000_0111100001_1010011
+`define FCVT_D_W   32'b?????_?????_00000_01110_000_01_1010011
+`define FCVT_D_WU  32'b?????_?????_00000_01111_000_01_1010011
 `define FCVT_S_D   32'b?????_?????_00000_10001_???_00_1010011
-`define FCVT_D_S   32'b?????_?????_00000_10000_???_01_1010011
-`define FEQ_S      32'b?????_?????_?????_1010100000_1010011
-`define FLT_S      32'b?????_?????_?????_1011000000_1010011
-`define FLE_S      32'b?????_?????_?????_1011100000_1010011
-`define FEQ_D      32'b?????_?????_?????_1010100001_1010011
-`define FLT_D      32'b?????_?????_?????_1011000001_1010011
-`define FLE_D      32'b?????_?????_?????_1011100001_1010011
-`define FMIN_S     32'b?????_?????_?????_1100000000_1010011
-`define FMAX_S     32'b?????_?????_?????_1100100000_1010011
-`define FMIN_D     32'b?????_?????_?????_1100000001_1010011
-`define FMAX_D     32'b?????_?????_?????_1100100001_1010011
-`define MFTX_S     32'b?????_00000_?????_1110000000_1010011
-`define MFTX_D     32'b?????_00000_?????_1110000001_1010011
-`define MFFSR      32'b?????_00000_00000_1110100000_1010011
-`define MXTF_S     32'b?????_?????_00000_1111000000_1010011
-`define MXTF_D     32'b?????_?????_00000_1111000001_1010011
-`define MTFSR      32'b?????_?????_00000_1111100000_1010011
+`define FCVT_D_S   32'b?????_?????_00000_10000_000_01_1010011
+`define FEQ_S      32'b?????_?????_?????_10101_000_00_1010011
+`define FLT_S      32'b?????_?????_?????_10110_000_00_1010011
+`define FLE_S      32'b?????_?????_?????_10111_000_00_1010011
+`define FEQ_D      32'b?????_?????_?????_10101_000_01_1010011
+`define FLT_D      32'b?????_?????_?????_10110_000_01_1010011
+`define FLE_D      32'b?????_?????_?????_10111_000_01_1010011
+`define FMIN_S     32'b?????_?????_?????_11000_000_00_1010011
+`define FMAX_S     32'b?????_?????_?????_11001_000_00_1010011
+`define FMIN_D     32'b?????_?????_?????_11000_000_01_1010011
+`define FMAX_D     32'b?????_?????_?????_11001_000_01_1010011
+`define MFTX_S     32'b?????_00000_?????_11100_000_00_1010011
+`define MFTX_D     32'b?????_00000_?????_11100_000_01_1010011
+`define MFFSR      32'b?????_00000_00000_11101_000_00_1010011
+`define MXTF_S     32'b?????_?????_00000_11110_000_00_1010011
+`define MXTF_D     32'b?????_?????_00000_11110_000_01_1010011
+`define MTFSR      32'b?????_?????_00000_11111_000_00_1010011
 `define FLW        32'b?????_?????_????????????_010_0000111
 `define FLD        32'b?????_?????_????????????_011_0000111
 `define FSW        32'b?????_?????_?????_???????_010_0100111
diff --git a/opcodes b/opcodes
index c0dce50..eff7bf5 100644
--- a/opcodes
+++ b/opcodes
@@ -88,23 +88,23 @@ 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
-amoand.w    rd rs1 rs2 16..10=2 9..7=2 6..2=0x10 1..0=3
-amoor.w     rd rs1 rs2 16..10=3 9..7=2 6..2=0x10 1..0=3
-amomin.w    rd rs1 rs2 16..10=4 9..7=2 6..2=0x10 1..0=3
-amomax.w    rd rs1 rs2 16..10=5 9..7=2 6..2=0x10 1..0=3
-amominu.w   rd rs1 rs2 16..10=6 9..7=2 6..2=0x10 1..0=3
-amomaxu.w   rd rs1 rs2 16..10=7 9..7=2 6..2=0x10 1..0=3
+amoadd.w    rd rs1 rs2 16..10=0 9..7=2 6..2=0x0A 1..0=3
+amoswap.w   rd rs1 rs2 16..10=1 9..7=2 6..2=0x0A 1..0=3
+amoand.w    rd rs1 rs2 16..10=2 9..7=2 6..2=0x0A 1..0=3
+amoor.w     rd rs1 rs2 16..10=3 9..7=2 6..2=0x0A 1..0=3
+amomin.w    rd rs1 rs2 16..10=4 9..7=2 6..2=0x0A 1..0=3
+amomax.w    rd rs1 rs2 16..10=5 9..7=2 6..2=0x0A 1..0=3
+amominu.w   rd rs1 rs2 16..10=6 9..7=2 6..2=0x0A 1..0=3
+amomaxu.w   rd rs1 rs2 16..10=7 9..7=2 6..2=0x0A 1..0=3
                                         
-amoadd.d     rd rs1 rs2 16..10=0 9..7=3 6..2=0x10 1..0=3
-amoswap.d    rd rs1 rs2 16..10=1 9..7=3 6..2=0x10 1..0=3
-amoand.d     rd rs1 rs2 16..10=2 9..7=3 6..2=0x10 1..0=3
-amoor.d      rd rs1 rs2 16..10=3 9..7=3 6..2=0x10 1..0=3
-amomin.d     rd rs1 rs2 16..10=4 9..7=3 6..2=0x10 1..0=3
-amomax.d     rd rs1 rs2 16..10=5 9..7=3 6..2=0x10 1..0=3
-amominu.d    rd rs1 rs2 16..10=6 9..7=3 6..2=0x10 1..0=3
-amomaxu.d    rd rs1 rs2 16..10=7 9..7=3 6..2=0x10 1..0=3
+amoadd.d     rd rs1 rs2 16..10=0 9..7=3 6..2=0x0A 1..0=3
+amoswap.d    rd rs1 rs2 16..10=1 9..7=3 6..2=0x0A 1..0=3
+amoand.d     rd rs1 rs2 16..10=2 9..7=3 6..2=0x0A 1..0=3
+amoor.d      rd rs1 rs2 16..10=3 9..7=3 6..2=0x0A 1..0=3
+amomin.d     rd rs1 rs2 16..10=4 9..7=3 6..2=0x0A 1..0=3
+amomax.d     rd rs1 rs2 16..10=5 9..7=3 6..2=0x0A 1..0=3
+amominu.d    rd rs1 rs2 16..10=6 9..7=3 6..2=0x0A 1..0=3
+amomaxu.d    rd rs1 rs2 16..10=7 9..7=3 6..2=0x0A 1..0=3
 
 fence.i rd rs1 imm12 9..7=1 6..2=0x0B 1..0=3
 fence   rd rs1 imm12 9..7=2 6..2=0x0B 1..0=3
@@ -159,7 +159,7 @@ fcvt.d.w    rd rs1 21..17=0 16..12=0xE  11..9=0 8..7=1 6..2=0x14 1..0=3
 fcvt.d.wu   rd rs1 21..17=0 16..12=0xF  11..9=0 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
+fcvt.d.s    rd rs1 21..17=0 16..14=0x4 13..12=0 11..9=0 8..7=1 6..2=0x14 1..0=3
 
 feq.s     rd rs1 rs2      16..12=0x15 11..9=0 8..7=0 6..2=0x14 1..0=3
 flt.s     rd rs1 rs2      16..12=0x16 11..9=0 8..7=0 6..2=0x14 1..0=3