New FP encoding

1 files changed, 65 insertions, 69 deletions

diff --git a/opcodes b/opcodes
index 02e9eff..85b8dd3 100644
--- a/opcodes
+++ b/opcodes
@@ -124,80 +124,76 @@ csrrsi rd      rs1      imm12        14..12=6 6..2=0x1C 1..0=3
 csrrci rd      rs1      imm12        14..12=7 6..2=0x1C 1..0=3
 
 # F/D EXTENSIONS
-fadd.s      rd rs1 rs2      31..27=0x0  rm       26..25=0 6..2=0x14 1..0=3
-fsub.s      rd rs1 rs2      31..27=0x1  rm       26..25=0 6..2=0x14 1..0=3
-fmul.s      rd rs1 rs2      31..27=0x2  rm       26..25=0 6..2=0x14 1..0=3
-fdiv.s      rd rs1 rs2      31..27=0x3  rm       26..25=0 6..2=0x14 1..0=3
-fsqrt.s     rd rs1 24..20=0 31..27=0x4  rm       26..25=0 6..2=0x14 1..0=3
-fsgnj.s     rd rs1 rs2      31..27=0x5  14..12=0 26..25=0 6..2=0x14 1..0=3
-fsgnjn.s    rd rs1 rs2      31..27=0x6  14..12=0 26..25=0 6..2=0x14 1..0=3
-fsgnjx.s    rd rs1 rs2      31..27=0x7  14..12=0 26..25=0 6..2=0x14 1..0=3
-
-fadd.d      rd rs1 rs2      31..27=0x0  rm       26..25=1 6..2=0x14 1..0=3
-fsub.d      rd rs1 rs2      31..27=0x1  rm       26..25=1 6..2=0x14 1..0=3
-fmul.d      rd rs1 rs2      31..27=0x2  rm       26..25=1 6..2=0x14 1..0=3
-fdiv.d      rd rs1 rs2      31..27=0x3  rm       26..25=1 6..2=0x14 1..0=3
-fsqrt.d     rd rs1 24..20=0 31..27=0x4  rm       26..25=1 6..2=0x14 1..0=3
-fsgnj.d     rd rs1 rs2      31..27=0x5  14..12=0 26..25=1 6..2=0x14 1..0=3
-fsgnjn.d    rd rs1 rs2      31..27=0x6  14..12=0 26..25=1 6..2=0x14 1..0=3
-fsgnjx.d    rd rs1 rs2      31..27=0x7  14..12=0 26..25=1 6..2=0x14 1..0=3
-
-fcvt.l.s    rd rs1 24..20=0 31..27=0x8  rm      26..25=0 6..2=0x14 1..0=3
-fcvt.lu.s   rd rs1 24..20=0 31..27=0x9  rm      26..25=0 6..2=0x14 1..0=3
-fcvt.w.s    rd rs1 24..20=0 31..27=0xA  rm      26..25=0 6..2=0x14 1..0=3
-fcvt.wu.s   rd rs1 24..20=0 31..27=0xB  rm      26..25=0 6..2=0x14 1..0=3
-
-fcvt.l.d    rd rs1 24..20=0 31..27=0x8  rm      26..25=1 6..2=0x14 1..0=3
-fcvt.lu.d   rd rs1 24..20=0 31..27=0x9  rm      26..25=1 6..2=0x14 1..0=3
-fcvt.w.d    rd rs1 24..20=0 31..27=0xA  rm      26..25=1 6..2=0x14 1..0=3
-fcvt.wu.d   rd rs1 24..20=0 31..27=0xB  rm      26..25=1 6..2=0x14 1..0=3
-
-fcvt.s.l    rd rs1 24..20=0 31..27=0xC  rm      26..25=0 6..2=0x14 1..0=3
-fcvt.s.lu   rd rs1 24..20=0 31..27=0xD  rm      26..25=0 6..2=0x14 1..0=3
-fcvt.s.w    rd rs1 24..20=0 31..27=0xE  rm      26..25=0 6..2=0x14 1..0=3
-fcvt.s.wu   rd rs1 24..20=0 31..27=0xF  rm      26..25=0 6..2=0x14 1..0=3
-
-fcvt.d.l    rd rs1 24..20=0 31..27=0xC  rm      26..25=1 6..2=0x14 1..0=3
-fcvt.d.lu   rd rs1 24..20=0 31..27=0xD  rm      26..25=1 6..2=0x14 1..0=3
-fcvt.d.w    rd rs1 24..20=0 31..27=0xE  rm      26..25=1 6..2=0x14 1..0=3
-fcvt.d.wu   rd rs1 24..20=0 31..27=0xF  rm      26..25=1 6..2=0x14 1..0=3
-
-fcvt.s.d    rd rs1 24..20=0 31..29=0x4 28..27=1 rm 26..25=0 6..2=0x14 1..0=3
-fcvt.d.s    rd rs1 24..20=0 31..29=0x4 28..27=0 rm 26..25=1 6..2=0x14 1..0=3
-
-feq.s     rd rs1 rs2      31..27=0x15 14..12=0 26..25=0 6..2=0x14 1..0=3
-flt.s     rd rs1 rs2      31..27=0x16 14..12=0 26..25=0 6..2=0x14 1..0=3
-fle.s     rd rs1 rs2      31..27=0x17 14..12=0 26..25=0 6..2=0x14 1..0=3
-
-feq.d     rd rs1 rs2      31..27=0x15 14..12=0 26..25=1 6..2=0x14 1..0=3
-flt.d     rd rs1 rs2      31..27=0x16 14..12=0 26..25=1 6..2=0x14 1..0=3
-fle.d     rd rs1 rs2      31..27=0x17 14..12=0 26..25=1 6..2=0x14 1..0=3
-
-fmin.s    rd rs1 rs2      31..27=0x18 14..12=0 26..25=0 6..2=0x14 1..0=3
-fmax.s    rd rs1 rs2      31..27=0x19 14..12=0 26..25=0 6..2=0x14 1..0=3
-
-fmin.d    rd rs1 rs2      31..27=0x18 14..12=0 26..25=1 6..2=0x14 1..0=3
-fmax.d    rd rs1 rs2      31..27=0x19 14..12=0 26..25=1 6..2=0x14 1..0=3
-
+fadd.s    rd rs1 rs2      31..27=0x00 rm       26..25=0 6..2=0x14 1..0=3
+fsub.s    rd rs1 rs2      31..27=0x01 rm       26..25=0 6..2=0x14 1..0=3
+fmul.s    rd rs1 rs2      31..27=0x02 rm       26..25=0 6..2=0x14 1..0=3
+fdiv.s    rd rs1 rs2      31..27=0x03 rm       26..25=0 6..2=0x14 1..0=3
+fsgnj.s   rd rs1 rs2      31..27=0x04 14..12=0 26..25=0 6..2=0x14 1..0=3
+fsgnjn.s  rd rs1 rs2      31..27=0x04 14..12=1 26..25=0 6..2=0x14 1..0=3
+fsgnjx.s  rd rs1 rs2      31..27=0x04 14..12=2 26..25=0 6..2=0x14 1..0=3
+fmin.s    rd rs1 rs2      31..27=0x05 14..12=0 26..25=0 6..2=0x14 1..0=3
+fmax.s    rd rs1 rs2      31..27=0x05 14..12=1 26..25=0 6..2=0x14 1..0=3
+fsqrt.s   rd rs1 24..20=0 31..27=0x0B rm       26..25=0 6..2=0x14 1..0=3
+
+fadd.d    rd rs1 rs2      31..27=0x00 rm       26..25=1 6..2=0x14 1..0=3
+fsub.d    rd rs1 rs2      31..27=0x01 rm       26..25=1 6..2=0x14 1..0=3
+fmul.d    rd rs1 rs2      31..27=0x02 rm       26..25=1 6..2=0x14 1..0=3
+fdiv.d    rd rs1 rs2      31..27=0x03 rm       26..25=1 6..2=0x14 1..0=3
+fsgnj.d   rd rs1 rs2      31..27=0x04 14..12=0 26..25=1 6..2=0x14 1..0=3
+fsgnjn.d  rd rs1 rs2      31..27=0x04 14..12=1 26..25=1 6..2=0x14 1..0=3
+fsgnjx.d  rd rs1 rs2      31..27=0x04 14..12=2 26..25=1 6..2=0x14 1..0=3
+fmin.d    rd rs1 rs2      31..27=0x05 14..12=0 26..25=1 6..2=0x14 1..0=3
+fmax.d    rd rs1 rs2      31..27=0x05 14..12=1 26..25=1 6..2=0x14 1..0=3
+fcvt.s.d  rd rs1 24..20=1 31..27=0x08 rm       26..25=0 6..2=0x14 1..0=3
+fcvt.d.s  rd rs1 24..20=0 31..27=0x08 rm       26..25=1 6..2=0x14 1..0=3
+fsqrt.d   rd rs1 24..20=0 31..27=0x0B rm       26..25=1 6..2=0x14 1..0=3
+
+fle.s     rd rs1 rs2      31..27=0x14 14..12=0 26..25=0 6..2=0x14 1..0=3
+flt.s     rd rs1 rs2      31..27=0x14 14..12=1 26..25=0 6..2=0x14 1..0=3
+feq.s     rd rs1 rs2      31..27=0x14 14..12=2 26..25=0 6..2=0x14 1..0=3
+
+fle.d     rd rs1 rs2      31..27=0x14 14..12=0 26..25=1 6..2=0x14 1..0=3
+flt.d     rd rs1 rs2      31..27=0x14 14..12=1 26..25=1 6..2=0x14 1..0=3
+feq.d     rd rs1 rs2      31..27=0x14 14..12=2 26..25=1 6..2=0x14 1..0=3
+
+fcvt.w.s  rd rs1 24..20=0 31..27=0x18 rm       26..25=0 6..2=0x14 1..0=3
+fcvt.wu.s rd rs1 24..20=1 31..27=0x18 rm       26..25=0 6..2=0x14 1..0=3
+fcvt.l.s  rd rs1 24..20=2 31..27=0x18 rm       26..25=0 6..2=0x14 1..0=3
+fcvt.lu.s rd rs1 24..20=3 31..27=0x18 rm       26..25=0 6..2=0x14 1..0=3
 fmv.x.s   rd rs1 24..20=0 31..27=0x1C 14..12=0 26..25=0 6..2=0x14 1..0=3
+fclass.s  rd rs1 24..20=0 31..27=0x1C 14..12=1 26..25=0 6..2=0x14 1..0=3
+
+fcvt.w.d  rd rs1 24..20=0 31..27=0x18 rm       26..25=1 6..2=0x14 1..0=3
+fcvt.wu.d rd rs1 24..20=1 31..27=0x18 rm       26..25=1 6..2=0x14 1..0=3
+fcvt.l.d  rd rs1 24..20=2 31..27=0x18 rm       26..25=1 6..2=0x14 1..0=3
+fcvt.lu.d rd rs1 24..20=3 31..27=0x18 rm       26..25=1 6..2=0x14 1..0=3
 fmv.x.d   rd rs1 24..20=0 31..27=0x1C 14..12=0 26..25=1 6..2=0x14 1..0=3
-fclass.s  rd rs1 24..20=0 31..27=0x1D 14..12=0 26..25=0 6..2=0x14 1..0=3
-fclass.d  rd rs1 24..20=0 31..27=0x1D 14..12=0 26..25=1 6..2=0x14 1..0=3
+fclass.d  rd rs1 24..20=0 31..27=0x1C 14..12=1 26..25=1 6..2=0x14 1..0=3
+
+fcvt.s.w  rd rs1 24..20=0 31..27=0x1A rm       26..25=0 6..2=0x14 1..0=3
+fcvt.s.wu rd rs1 24..20=1 31..27=0x1A rm       26..25=0 6..2=0x14 1..0=3
+fcvt.s.l  rd rs1 24..20=2 31..27=0x1A rm       26..25=0 6..2=0x14 1..0=3
+fcvt.s.lu rd rs1 24..20=3 31..27=0x1A rm       26..25=0 6..2=0x14 1..0=3
 fmv.s.x   rd rs1 24..20=0 31..27=0x1E 14..12=0 26..25=0 6..2=0x14 1..0=3
+
+fcvt.d.w  rd rs1 24..20=0 31..27=0x1A rm       26..25=1 6..2=0x14 1..0=3
+fcvt.d.wu rd rs1 24..20=1 31..27=0x1A rm       26..25=1 6..2=0x14 1..0=3
+fcvt.d.l  rd rs1 24..20=2 31..27=0x1A rm       26..25=1 6..2=0x14 1..0=3
+fcvt.d.lu rd rs1 24..20=3 31..27=0x1A rm       26..25=1 6..2=0x14 1..0=3
 fmv.d.x   rd rs1 24..20=0 31..27=0x1E 14..12=0 26..25=1 6..2=0x14 1..0=3
 
-flw        rd rs1 imm12 14..12=2 6..2=0x01 1..0=3
-fld        rd rs1 imm12 14..12=3 6..2=0x01 1..0=3
+flw       rd rs1 imm12 14..12=2 6..2=0x01 1..0=3
+fld       rd rs1 imm12 14..12=3 6..2=0x01 1..0=3
 
-fsw        imm12hi rs1 rs2 imm12lo 14..12=2 6..2=0x09 1..0=3
-fsd        imm12hi rs1 rs2 imm12lo 14..12=3 6..2=0x09 1..0=3
+fsw       imm12hi rs1 rs2 imm12lo 14..12=2 6..2=0x09 1..0=3
+fsd       imm12hi rs1 rs2 imm12lo 14..12=3 6..2=0x09 1..0=3
 
-fmadd.s     rd rs1 rs2 rs3 rm 26..25=0 6..2=0x10 1..0=3
-fmsub.s     rd rs1 rs2 rs3 rm 26..25=0 6..2=0x11 1..0=3
-fnmsub.s    rd rs1 rs2 rs3 rm 26..25=0 6..2=0x12 1..0=3
-fnmadd.s    rd rs1 rs2 rs3 rm 26..25=0 6..2=0x13 1..0=3
+fmadd.s   rd rs1 rs2 rs3 rm 26..25=0 6..2=0x10 1..0=3
+fmsub.s   rd rs1 rs2 rs3 rm 26..25=0 6..2=0x11 1..0=3
+fnmsub.s  rd rs1 rs2 rs3 rm 26..25=0 6..2=0x12 1..0=3
+fnmadd.s  rd rs1 rs2 rs3 rm 26..25=0 6..2=0x13 1..0=3
 
-fmadd.d     rd rs1 rs2 rs3 rm 26..25=1 6..2=0x10 1..0=3
-fmsub.d     rd rs1 rs2 rs3 rm 26..25=1 6..2=0x11 1..0=3
-fnmsub.d    rd rs1 rs2 rs3 rm 26..25=1 6..2=0x12 1..0=3
-fnmadd.d    rd rs1 rs2 rs3 rm 26..25=1 6..2=0x13 1..0=3
+fmadd.d   rd rs1 rs2 rs3 rm 26..25=1 6..2=0x10 1..0=3
+fmsub.d   rd rs1 rs2 rs3 rm 26..25=1 6..2=0x11 1..0=3
+fnmsub.d  rd rs1 rs2 rs3 rm 26..25=1 6..2=0x12 1..0=3
+fnmadd.d  rd rs1 rs2 rs3 rm 26..25=1 6..2=0x13 1..0=3