On Fri, Oct 15, 2021 at 6:57 PM <frank.ch...@sifive.com> wrote: > > From: Frank Chang <frank.ch...@sifive.com> > > Signed-off-by: Frank Chang <frank.ch...@sifive.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com> Alistair > --- > target/riscv/helper.h | 4 ++-- > target/riscv/insn32.decode | 4 ++-- > target/riscv/insn_trans/trans_rvv.c.inc | 4 ++-- > target/riscv/vector_helper.c | 4 ++-- > 4 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/target/riscv/helper.h b/target/riscv/helper.h > index 6e58343af35..c15497e4a15 100644 > --- a/target/riscv/helper.h > +++ b/target/riscv/helper.h > @@ -1016,11 +1016,11 @@ DEF_HELPER_6(vfwredsum_vs_w, void, ptr, ptr, ptr, > ptr, env, i32) > > DEF_HELPER_6(vmand_mm, void, ptr, ptr, ptr, ptr, env, i32) > DEF_HELPER_6(vmnand_mm, void, ptr, ptr, ptr, ptr, env, i32) > -DEF_HELPER_6(vmandnot_mm, void, ptr, ptr, ptr, ptr, env, i32) > +DEF_HELPER_6(vmandn_mm, void, ptr, ptr, ptr, ptr, env, i32) > DEF_HELPER_6(vmxor_mm, void, ptr, ptr, ptr, ptr, env, i32) > DEF_HELPER_6(vmor_mm, void, ptr, ptr, ptr, ptr, env, i32) > DEF_HELPER_6(vmnor_mm, void, ptr, ptr, ptr, ptr, env, i32) > -DEF_HELPER_6(vmornot_mm, void, ptr, ptr, ptr, ptr, env, i32) > +DEF_HELPER_6(vmorn_mm, void, ptr, ptr, ptr, ptr, env, i32) > DEF_HELPER_6(vmxnor_mm, void, ptr, ptr, ptr, ptr, env, i32) > > DEF_HELPER_4(vcpop_m, tl, ptr, ptr, env, i32) > diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode > index 1a4a2871464..8617307b29a 100644 > --- a/target/riscv/insn32.decode > +++ b/target/riscv/insn32.decode > @@ -635,11 +635,11 @@ vfredmax_vs 000111 . ..... ..... 001 ..... 1010111 > @r_vm > vfwredsum_vs 1100-1 . ..... ..... 001 ..... 1010111 @r_vm > vmand_mm 011001 - ..... ..... 010 ..... 1010111 @r > vmnand_mm 011101 - ..... ..... 010 ..... 1010111 @r > -vmandnot_mm 011000 - ..... ..... 010 ..... 1010111 @r > +vmandn_mm 011000 - ..... ..... 010 ..... 1010111 @r > vmxor_mm 011011 - ..... ..... 010 ..... 1010111 @r > vmor_mm 011010 - ..... ..... 010 ..... 1010111 @r > vmnor_mm 011110 - ..... ..... 010 ..... 1010111 @r > -vmornot_mm 011100 - ..... ..... 010 ..... 1010111 @r > +vmorn_mm 011100 - ..... ..... 010 ..... 1010111 @r > vmxnor_mm 011111 - ..... ..... 010 ..... 1010111 @r > vcpop_m 010000 . ..... 10000 010 ..... 1010111 @r2_vm > vfirst_m 010000 . ..... 10001 010 ..... 1010111 @r2_vm > diff --git a/target/riscv/insn_trans/trans_rvv.c.inc > b/target/riscv/insn_trans/trans_rvv.c.inc > index 6eebcffb29e..b78c13f0be7 100644 > --- a/target/riscv/insn_trans/trans_rvv.c.inc > +++ b/target/riscv/insn_trans/trans_rvv.c.inc > @@ -2861,11 +2861,11 @@ static bool trans_##NAME(DisasContext *s, arg_r *a) > \ > > GEN_MM_TRANS(vmand_mm) > GEN_MM_TRANS(vmnand_mm) > -GEN_MM_TRANS(vmandnot_mm) > +GEN_MM_TRANS(vmandn_mm) > GEN_MM_TRANS(vmxor_mm) > GEN_MM_TRANS(vmor_mm) > GEN_MM_TRANS(vmnor_mm) > -GEN_MM_TRANS(vmornot_mm) > +GEN_MM_TRANS(vmorn_mm) > GEN_MM_TRANS(vmxnor_mm) > > /* Vector count population in mask vcpop */ > diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c > index 276a2c1aab6..1afa4d454c2 100644 > --- a/target/riscv/vector_helper.c > +++ b/target/riscv/vector_helper.c > @@ -4470,11 +4470,11 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, > \ > > GEN_VEXT_MASK_VV(vmand_mm, DO_AND) > GEN_VEXT_MASK_VV(vmnand_mm, DO_NAND) > -GEN_VEXT_MASK_VV(vmandnot_mm, DO_ANDNOT) > +GEN_VEXT_MASK_VV(vmandn_mm, DO_ANDNOT) > GEN_VEXT_MASK_VV(vmxor_mm, DO_XOR) > GEN_VEXT_MASK_VV(vmor_mm, DO_OR) > GEN_VEXT_MASK_VV(vmnor_mm, DO_NOR) > -GEN_VEXT_MASK_VV(vmornot_mm, DO_ORNOT) > +GEN_VEXT_MASK_VV(vmorn_mm, DO_ORNOT) > GEN_VEXT_MASK_VV(vmxnor_mm, DO_XNOR) > > /* Vector count population in mask vcpop */ > -- > 2.25.1 > >
