From 228c474c372a023a24a7ee5557883f35e7bdb6e8 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Tue, 25 Apr 2017 11:37:06 -0700 Subject: FMV.X.S/FMV.S.X -> FMV.X.W/FMV.W.X --- opcodes | 4 ++-- opcodes-pseudo | 4 ++++ parse-opcodes | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/opcodes b/opcodes index ac546ec..4303abd 100644 --- a/opcodes +++ b/opcodes @@ -184,7 +184,7 @@ 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 +fmv.x.w 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 @@ -205,7 +205,7 @@ 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 +fmv.w.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 diff --git a/opcodes-pseudo b/opcodes-pseudo index effae54..ab713f5 100644 --- a/opcodes-pseudo +++ b/opcodes-pseudo @@ -22,3 +22,7 @@ # Old names for ecall/ebreak @scall 11..7=0 19..15=0 31..20=0x000 14..12=0 6..2=0x1C 1..0=3 @sbreak 11..7=0 19..15=0 31..20=0x001 14..12=0 6..2=0x1C 1..0=3 + +# Old names for fmv.x.w/fmv.w.x +@fmv.x.s rd rs1 24..20=0 31..27=0x1C 14..12=0 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 diff --git a/parse-opcodes b/parse-opcodes index 7b94bee..df86efa 100755 --- a/parse-opcodes +++ b/parse-opcodes @@ -780,9 +780,9 @@ def make_latex_table(): print_insts('fmadd.s', 'fmsub.s', 'fnmsub.s', 'fnmadd.s') print_insts('fadd.s', 'fsub.s', 'fmul.s', 'fdiv.s', 'fsqrt.s') print_insts('fsgnj.s', 'fsgnjn.s', 'fsgnjx.s', 'fmin.s', 'fmax.s') - print_insts('fcvt.w.s', 'fcvt.wu.s', 'fmv.x.s') + print_insts('fcvt.w.s', 'fcvt.wu.s', 'fmv.x.w') print_insts('feq.s', 'flt.s', 'fle.s', 'fclass.s') - print_insts('fcvt.s.w', 'fcvt.s.wu', 'fmv.s.x') + print_insts('fcvt.s.w', 'fcvt.s.wu', 'fmv.w.x') print_footer() print_header('r','r4','i','s') -- cgit v1.1