This patch includes: - VBITCLR[I].{B/H/W/D}; - VBITSET[I].{B/H/W/D}; - VBITREV[I].{B/H/W/D}.
Signed-off-by: Song Gao <gaos...@loongson.cn> --- target/loongarch/disas.c | 25 +++++++++ target/loongarch/helper.h | 25 +++++++++ target/loongarch/insn_trans/trans_lsx.c.inc | 25 +++++++++ target/loongarch/insns.decode | 25 +++++++++ target/loongarch/lsx_helper.c | 57 +++++++++++++++++++++ 5 files changed, 157 insertions(+) diff --git a/target/loongarch/disas.c b/target/loongarch/disas.c index 0ca51de9d8..48c7ea47a4 100644 --- a/target/loongarch/disas.c +++ b/target/loongarch/disas.c @@ -1272,3 +1272,28 @@ INSN_LSX(vpcnt_b, vv) INSN_LSX(vpcnt_h, vv) INSN_LSX(vpcnt_w, vv) INSN_LSX(vpcnt_d, vv) + +INSN_LSX(vbitclr_b, vvv) +INSN_LSX(vbitclr_h, vvv) +INSN_LSX(vbitclr_w, vvv) +INSN_LSX(vbitclr_d, vvv) +INSN_LSX(vbitclri_b, vv_i) +INSN_LSX(vbitclri_h, vv_i) +INSN_LSX(vbitclri_w, vv_i) +INSN_LSX(vbitclri_d, vv_i) +INSN_LSX(vbitset_b, vvv) +INSN_LSX(vbitset_h, vvv) +INSN_LSX(vbitset_w, vvv) +INSN_LSX(vbitset_d, vvv) +INSN_LSX(vbitseti_b, vv_i) +INSN_LSX(vbitseti_h, vv_i) +INSN_LSX(vbitseti_w, vv_i) +INSN_LSX(vbitseti_d, vv_i) +INSN_LSX(vbitrev_b, vvv) +INSN_LSX(vbitrev_h, vvv) +INSN_LSX(vbitrev_w, vvv) +INSN_LSX(vbitrev_d, vvv) +INSN_LSX(vbitrevi_b, vv_i) +INSN_LSX(vbitrevi_h, vv_i) +INSN_LSX(vbitrevi_w, vv_i) +INSN_LSX(vbitrevi_d, vv_i) diff --git a/target/loongarch/helper.h b/target/loongarch/helper.h index 38e310512b..4622f788ee 100644 --- a/target/loongarch/helper.h +++ b/target/loongarch/helper.h @@ -500,3 +500,28 @@ DEF_HELPER_3(vpcnt_b, void, env, i32, i32) DEF_HELPER_3(vpcnt_h, void, env, i32, i32) DEF_HELPER_3(vpcnt_w, void, env, i32, i32) DEF_HELPER_3(vpcnt_d, void, env, i32, i32) + +DEF_HELPER_4(vbitclr_b, void, env, i32, i32, i32) +DEF_HELPER_4(vbitclr_h, void, env, i32, i32, i32) +DEF_HELPER_4(vbitclr_w, void, env, i32, i32, i32) +DEF_HELPER_4(vbitclr_d, void, env, i32, i32, i32) +DEF_HELPER_4(vbitclri_b, void, env, i32, i32, i32) +DEF_HELPER_4(vbitclri_h, void, env, i32, i32, i32) +DEF_HELPER_4(vbitclri_w, void, env, i32, i32, i32) +DEF_HELPER_4(vbitclri_d, void, env, i32, i32, i32) +DEF_HELPER_4(vbitset_b, void, env, i32, i32, i32) +DEF_HELPER_4(vbitset_h, void, env, i32, i32, i32) +DEF_HELPER_4(vbitset_w, void, env, i32, i32, i32) +DEF_HELPER_4(vbitset_d, void, env, i32, i32, i32) +DEF_HELPER_4(vbitseti_b, void, env, i32, i32, i32) +DEF_HELPER_4(vbitseti_h, void, env, i32, i32, i32) +DEF_HELPER_4(vbitseti_w, void, env, i32, i32, i32) +DEF_HELPER_4(vbitseti_d, void, env, i32, i32, i32) +DEF_HELPER_4(vbitrev_b, void, env, i32, i32, i32) +DEF_HELPER_4(vbitrev_h, void, env, i32, i32, i32) +DEF_HELPER_4(vbitrev_w, void, env, i32, i32, i32) +DEF_HELPER_4(vbitrev_d, void, env, i32, i32, i32) +DEF_HELPER_4(vbitrevi_b, void, env, i32, i32, i32) +DEF_HELPER_4(vbitrevi_h, void, env, i32, i32, i32) +DEF_HELPER_4(vbitrevi_w, void, env, i32, i32, i32) +DEF_HELPER_4(vbitrevi_d, void, env, i32, i32, i32) diff --git a/target/loongarch/insn_trans/trans_lsx.c.inc b/target/loongarch/insn_trans/trans_lsx.c.inc index 59923eb1fa..6d3a804767 100644 --- a/target/loongarch/insn_trans/trans_lsx.c.inc +++ b/target/loongarch/insn_trans/trans_lsx.c.inc @@ -2799,3 +2799,28 @@ TRANS(vpcnt_b, gen_vv, gen_helper_vpcnt_b) TRANS(vpcnt_h, gen_vv, gen_helper_vpcnt_h) TRANS(vpcnt_w, gen_vv, gen_helper_vpcnt_w) TRANS(vpcnt_d, gen_vv, gen_helper_vpcnt_d) + +TRANS(vbitclr_b, gen_vvv, gen_helper_vbitclr_b) +TRANS(vbitclr_h, gen_vvv, gen_helper_vbitclr_h) +TRANS(vbitclr_w, gen_vvv, gen_helper_vbitclr_w) +TRANS(vbitclr_d, gen_vvv, gen_helper_vbitclr_d) +TRANS(vbitclri_b, gen_vv_i, gen_helper_vbitclri_b) +TRANS(vbitclri_h, gen_vv_i, gen_helper_vbitclri_h) +TRANS(vbitclri_w, gen_vv_i, gen_helper_vbitclri_w) +TRANS(vbitclri_d, gen_vv_i, gen_helper_vbitclri_d) +TRANS(vbitset_b, gen_vvv, gen_helper_vbitset_b) +TRANS(vbitset_h, gen_vvv, gen_helper_vbitset_h) +TRANS(vbitset_w, gen_vvv, gen_helper_vbitset_w) +TRANS(vbitset_d, gen_vvv, gen_helper_vbitset_d) +TRANS(vbitseti_b, gen_vv_i, gen_helper_vbitseti_b) +TRANS(vbitseti_h, gen_vv_i, gen_helper_vbitseti_h) +TRANS(vbitseti_w, gen_vv_i, gen_helper_vbitseti_w) +TRANS(vbitseti_d, gen_vv_i, gen_helper_vbitseti_d) +TRANS(vbitrev_b, gen_vvv, gen_helper_vbitrev_b) +TRANS(vbitrev_h, gen_vvv, gen_helper_vbitrev_h) +TRANS(vbitrev_w, gen_vvv, gen_helper_vbitrev_w) +TRANS(vbitrev_d, gen_vvv, gen_helper_vbitrev_d) +TRANS(vbitrevi_b, gen_vv_i, gen_helper_vbitrevi_b) +TRANS(vbitrevi_h, gen_vv_i, gen_helper_vbitrevi_h) +TRANS(vbitrevi_w, gen_vv_i, gen_helper_vbitrevi_w) +TRANS(vbitrevi_d, gen_vv_i, gen_helper_vbitrevi_d) diff --git a/target/loongarch/insns.decode b/target/loongarch/insns.decode index f865e83da5..801c97714e 100644 --- a/target/loongarch/insns.decode +++ b/target/loongarch/insns.decode @@ -973,3 +973,28 @@ vpcnt_b 0111 00101001 11000 01000 ..... ..... @vv vpcnt_h 0111 00101001 11000 01001 ..... ..... @vv vpcnt_w 0111 00101001 11000 01010 ..... ..... @vv vpcnt_d 0111 00101001 11000 01011 ..... ..... @vv + +vbitclr_b 0111 00010000 11000 ..... ..... ..... @vvv +vbitclr_h 0111 00010000 11001 ..... ..... ..... @vvv +vbitclr_w 0111 00010000 11010 ..... ..... ..... @vvv +vbitclr_d 0111 00010000 11011 ..... ..... ..... @vvv +vbitclri_b 0111 00110001 00000 01 ... ..... ..... @vv_ui3 +vbitclri_h 0111 00110001 00000 1 .... ..... ..... @vv_ui4 +vbitclri_w 0111 00110001 00001 ..... ..... ..... @vv_ui5 +vbitclri_d 0111 00110001 0001 ...... ..... ..... @vv_ui6 +vbitset_b 0111 00010000 11100 ..... ..... ..... @vvv +vbitset_h 0111 00010000 11101 ..... ..... ..... @vvv +vbitset_w 0111 00010000 11110 ..... ..... ..... @vvv +vbitset_d 0111 00010000 11111 ..... ..... ..... @vvv +vbitseti_b 0111 00110001 01000 01 ... ..... ..... @vv_ui3 +vbitseti_h 0111 00110001 01000 1 .... ..... ..... @vv_ui4 +vbitseti_w 0111 00110001 01001 ..... ..... ..... @vv_ui5 +vbitseti_d 0111 00110001 0101 ...... ..... ..... @vv_ui6 +vbitrev_b 0111 00010001 00000 ..... ..... ..... @vvv +vbitrev_h 0111 00010001 00001 ..... ..... ..... @vvv +vbitrev_w 0111 00010001 00010 ..... ..... ..... @vvv +vbitrev_d 0111 00010001 00011 ..... ..... ..... @vvv +vbitrevi_b 0111 00110001 10000 01 ... ..... ..... @vv_ui3 +vbitrevi_h 0111 00110001 10000 1 .... ..... ..... @vv_ui4 +vbitrevi_w 0111 00110001 10001 ..... ..... ..... @vv_ui5 +vbitrevi_d 0111 00110001 1001 ...... ..... ..... @vv_ui6 diff --git a/target/loongarch/lsx_helper.c b/target/loongarch/lsx_helper.c index 94dded7e49..e23c75bd56 100644 --- a/target/loongarch/lsx_helper.c +++ b/target/loongarch/lsx_helper.c @@ -2231,3 +2231,60 @@ VPCNT(vpcnt_b, 8, B, uint8_t) VPCNT(vpcnt_h, 16, H, uint16_t) VPCNT(vpcnt_w, 32, W, uint32_t) VPCNT(vpcnt_d, 64, D, uint64_t) + +#define DO_BITCLR(a, bit) (a & ~(1ul << bit)) +#define DO_BITSET(a, bit) (a | 1ul << bit) +#define DO_BITREV(a, bit) (a ^ (1ul << bit)) + +#define DO_BIT(NAME, BIT, T, E, DO_OP) \ +void HELPER(NAME)(CPULoongArchState *env, \ + uint32_t vd, uint32_t vj, uint32_t vk) \ +{ \ + int i; \ + VReg *Vd = &(env->fpr[vd].vreg); \ + VReg *Vj = &(env->fpr[vj].vreg); \ + VReg *Vk = &(env->fpr[vk].vreg); \ + \ + for (i = 0; i < LSX_LEN/BIT; i++) { \ + Vd->E(i) = DO_OP((T)Vj->E(i), (T)Vk->E(i)%BIT); \ + } \ +} + +DO_BIT(vbitclr_b, 8, uint8_t, B, DO_BITCLR) +DO_BIT(vbitclr_h, 16, uint16_t, H, DO_BITCLR) +DO_BIT(vbitclr_w, 32, uint32_t, W, DO_BITCLR) +DO_BIT(vbitclr_d, 64, uint64_t, D, DO_BITCLR) +DO_BIT(vbitset_b, 8, uint8_t, B, DO_BITSET) +DO_BIT(vbitset_h, 16, uint16_t, H, DO_BITSET) +DO_BIT(vbitset_w, 32, uint32_t, W, DO_BITSET) +DO_BIT(vbitset_d, 64, uint64_t, D, DO_BITSET) +DO_BIT(vbitrev_b, 8, uint8_t, B, DO_BITREV) +DO_BIT(vbitrev_h, 16, uint16_t, H, DO_BITREV) +DO_BIT(vbitrev_w, 32, uint32_t, W, DO_BITREV) +DO_BIT(vbitrev_d, 64, uint64_t, D, DO_BITREV) + +#define DO_BITI(NAME, BIT, T, E, DO_OP) \ +void HELPER(NAME)(CPULoongArchState *env, \ + uint32_t vd, uint32_t vj, uint32_t imm) \ +{ \ + int i; \ + VReg *Vd = &(env->fpr[vd].vreg); \ + VReg *Vj = &(env->fpr[vj].vreg); \ + \ + for (i = 0; i < LSX_LEN/BIT; i++) { \ + Vd->E(i) = DO_OP((T)Vj->E(i), imm); \ + } \ +} + +DO_BITI(vbitclri_b, 8, uint8_t, B, DO_BITCLR) +DO_BITI(vbitclri_h, 16, uint16_t, H, DO_BITCLR) +DO_BITI(vbitclri_w, 32, uint32_t, W, DO_BITCLR) +DO_BITI(vbitclri_d, 64, uint64_t, D, DO_BITCLR) +DO_BITI(vbitseti_b, 8, uint8_t, B, DO_BITSET) +DO_BITI(vbitseti_h, 16, uint16_t, H, DO_BITSET) +DO_BITI(vbitseti_w, 32, uint32_t, W, DO_BITSET) +DO_BITI(vbitseti_d, 64, uint64_t, D, DO_BITSET) +DO_BITI(vbitrevi_b, 8, uint8_t, B, DO_BITREV) +DO_BITI(vbitrevi_h, 16, uint16_t, H, DO_BITREV) +DO_BITI(vbitrevi_w, 32, uint32_t, W, DO_BITREV) +DO_BITI(vbitrevi_d, 64, uint64_t, D, DO_BITREV) -- 2.31.1