motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tcg: Convert shr to TCGOutOpBinary

Browse source 
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2025-01-07 22:22:36 -08:00
parent 6ca594517a
commit edd6ba8a6b
11 changed files with 229 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tcg/aarch64/tcg-target.c.inc
View file

@ -1347,13 +1347,6 @@ static inline void tcg_out_extr(TCGContext *s, TCGType ext, TCGReg rd,
tcg_out_insn(s, 3403, EXTR, ext, rd, rn, rm, a); tcg_out_insn(s, 3403, EXTR, ext, rd, rn, rm, a);
} }
static inline void tcg_out_shr(TCGContext *s, TCGType ext,
TCGReg rd, TCGReg rn, unsigned int m)
{
int max = ext ? 63 : 31;
tcg_out_ubfm(s, ext, rd, rn, m & max, max);
}
static inline void tcg_out_sar(TCGContext *s, TCGType ext, static inline void tcg_out_sar(TCGContext *s, TCGType ext,
TCGReg rd, TCGReg rn, unsigned int m) TCGReg rd, TCGReg rn, unsigned int m)
{ {
@ -2310,6 +2303,25 @@ static const TCGOutOpBinary outop_shl = {
.out_rri = tgen_shli, .out_rri = tgen_shli,
}; };
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
tcg_out_insn(s, 3508, LSRV, type, a0, a1, a2);
}
static void tgen_shri(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, tcg_target_long a2)
{
int max = type == TCG_TYPE_I32 ? 31 : 63;
tcg_out_ubfm(s, type, a0, a1, a2 & max, max);
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_O1_I2(r, r, ri),
.out_rrr = tgen_shr,
.out_rri = tgen_shri,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -2427,15 +2439,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType ext,
tcg_out_ldst(s, I3312_STRX, a0, a1, a2, 3); tcg_out_ldst(s, I3312_STRX, a0, a1, a2, 3);
break; break;
case INDEX_op_shr_i64:
case INDEX_op_shr_i32:
if (c2) {
tcg_out_shr(s, ext, a0, a1, a2);
} else {
tcg_out_insn(s, 3508, LSRV, ext, a0, a1, a2);
}
break;
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
if (c2) { if (c2) {
@ -3093,11 +3096,9 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_negsetcond_i64: case INDEX_op_negsetcond_i64:
return C_O1_I2(r, r, rC); return C_O1_I2(r, r, rC);
case INDEX_op_shr_i32:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_rotl_i32: case INDEX_op_rotl_i32:
case INDEX_op_rotr_i32: case INDEX_op_rotr_i32:
case INDEX_op_shr_i64:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_rotl_i64: case INDEX_op_rotl_i64:
case INDEX_op_rotr_i64: case INDEX_op_rotr_i64:

24
tcg/arm/tcg-target.c.inc
View file

@ -1982,6 +1982,25 @@ static const TCGOutOpBinary outop_shl = {
.out_rri = tgen_shli, .out_rri = tgen_shli,
}; };
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
tcg_out_dat_reg(s, COND_AL, ARITH_MOV, a0, 0, a1, SHIFT_REG_LSR(a2));
}
static void tgen_shri(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, tcg_target_long a2)
{
tcg_out_dat_reg(s, COND_AL, ARITH_MOV, a0, 0, a1,
SHIFT_IMM_LSR(a2 & 0x1f));
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_O1_I2(r, r, ri),
.out_rrr = tgen_shr,
.out_rri = tgen_shri,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -2133,10 +2152,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
case INDEX_op_muls2_i32: case INDEX_op_muls2_i32:
tcg_out_smull32(s, COND_AL, args[0], args[1], args[2], args[3]); tcg_out_smull32(s, COND_AL, args[0], args[1], args[2], args[3]);
break; break;
case INDEX_op_shr_i32:
c = const_args[2] ? (args[2] & 0x1f) ? SHIFT_IMM_LSR(args[2] & 0x1f) :
SHIFT_IMM_LSL(0) : SHIFT_REG_LSR(args[2]);
goto gen_shift32;
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
c = const_args[2] ? (args[2] & 0x1f) ? SHIFT_IMM_ASR(args[2] & 0x1f) : c = const_args[2] ? (args[2] & 0x1f) ? SHIFT_IMM_ASR(args[2] & 0x1f) :
SHIFT_IMM_LSL(0) : SHIFT_REG_ASR(args[2]); SHIFT_IMM_LSL(0) : SHIFT_REG_ASR(args[2]);
@ -2314,7 +2329,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_muls2_i32: case INDEX_op_muls2_i32:
return C_O2_I2(r, r, r, r); return C_O2_I2(r, r, r, r);
case INDEX_op_shr_i32:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_rotl_i32: case INDEX_op_rotl_i32:
case INDEX_op_rotr_i32: case INDEX_op_rotr_i32:

33
tcg/i386/tcg-target.c.inc
View file

@ -2787,6 +2787,33 @@ static const TCGOutOpBinary outop_shl = {
.out_rri = tgen_shli, .out_rri = tgen_shli,
}; };
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
int rexw = type == TCG_TYPE_I32 ? 0 : P_REXW;
if (have_bmi2) {
tcg_out_vex_modrm(s, OPC_SHRX + rexw, a0, a2, a1);
} else {
tcg_out_modrm(s, OPC_SHIFT_cl + rexw, SHIFT_SHR, a0);
}
}
static void tgen_shri(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, tcg_target_long a2)
{
int rexw = type == TCG_TYPE_I32 ? 0 : P_REXW;
tcg_out_mov(s, type, a0, a1);
tcg_out_shifti(s, SHIFT_SHR + rexw, a0, a2);
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_Dynamic,
.base.dynamic_constraint = cset_shift,
.out_rrr = tgen_shr,
.out_rri = tgen_shri,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -2922,10 +2949,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
} }
break; break;
OP_32_64(shr):
c = SHIFT_SHR;
vexop = OPC_SHRX;
goto gen_shift_maybe_vex;
OP_32_64(sar): OP_32_64(sar):
c = SHIFT_SAR; c = SHIFT_SAR;
vexop = OPC_SARX; vexop = OPC_SARX;
@ -3787,8 +3810,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_st_i64: case INDEX_op_st_i64:
return C_O0_I2(re, r); return C_O0_I2(re, r);
case INDEX_op_shr_i32:
case INDEX_op_shr_i64:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
return have_bmi2 ? C_O1_I2(r, r, ri) : C_O1_I2(r, 0, ci); return have_bmi2 ? C_O1_I2(r, r, ri) : C_O1_I2(r, 0, ci);

43
tcg/loongarch64/tcg-target.c.inc
View file

@ -1515,6 +1515,32 @@ static const TCGOutOpBinary outop_shl = {
.out_rri = tgen_shli, .out_rri = tgen_shli,
}; };
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
if (type == TCG_TYPE_I32) {
tcg_out_opc_srl_w(s, a0, a1, a2);
} else {
tcg_out_opc_srl_d(s, a0, a1, a2);
}
}
static void tgen_shri(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, tcg_target_long a2)
{
if (type == TCG_TYPE_I32) {
tcg_out_opc_srli_w(s, a0, a1, a2 & 0x1f);
} else {
tcg_out_opc_srli_d(s, a0, a1, a2 & 0x3f);
}
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_O1_I2(r, r, ri),
.out_rrr = tgen_shr,
.out_rri = tgen_shri,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -1686,21 +1712,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
tcg_out_clzctz(s, OPC_CTZ_D, a0, a1, a2, c2, false); tcg_out_clzctz(s, OPC_CTZ_D, a0, a1, a2, c2, false);
break; break;
case INDEX_op_shr_i32:
if (c2) {
tcg_out_opc_srli_w(s, a0, a1, a2 & 0x1f);
} else {
tcg_out_opc_srl_w(s, a0, a1, a2);
}
break;
case INDEX_op_shr_i64:
if (c2) {
tcg_out_opc_srli_d(s, a0, a1, a2 & 0x3f);
} else {
tcg_out_opc_srl_d(s, a0, a1, a2);
}
break;
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
if (c2) { if (c2) {
tcg_out_opc_srai_w(s, a0, a1, a2 & 0x1f); tcg_out_opc_srai_w(s, a0, a1, a2 & 0x1f);
@ -2380,8 +2391,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_qemu_ld_i64: case INDEX_op_qemu_ld_i64:
return C_O1_I1(r, r); return C_O1_I1(r, r);
case INDEX_op_shr_i32:
case INDEX_op_shr_i64:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_rotl_i32: case INDEX_op_rotl_i32:

35
tcg/mips/tcg-target.c.inc
View file

@ -1931,6 +1931,29 @@ static const TCGOutOpBinary outop_shl = {
.out_rri = tgen_shli, .out_rri = tgen_shli,
}; };
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
MIPSInsn insn = type == TCG_TYPE_I32 ? OPC_SRLV : OPC_DSRLV;
tcg_out_opc_reg(s, insn, a0, a1, a2);
}
static void tgen_shri(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, tcg_target_long a2)
{
if (type == TCG_TYPE_I32) {
tcg_out_opc_sa(s, OPC_SRL, a0, a1, a2);
} else {
tcg_out_dsrl(s, a0, a1, a2);
}
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_O1_I2(r, r, ri),
.out_rrr = tgen_shr,
.out_rri = tgen_shri,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -2091,9 +2114,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
i1 = OPC_SRAV, i2 = OPC_SRA; i1 = OPC_SRAV, i2 = OPC_SRA;
goto do_shift; goto do_shift;
case INDEX_op_shr_i32:
i1 = OPC_SRLV, i2 = OPC_SRL;
goto do_shift;
case INDEX_op_rotr_i32: case INDEX_op_rotr_i32:
i1 = OPC_ROTRV, i2 = OPC_ROTR; i1 = OPC_ROTRV, i2 = OPC_ROTR;
do_shift: do_shift:
@ -2119,13 +2139,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
} }
i1 = OPC_DSRAV; i1 = OPC_DSRAV;
goto do_shiftv; goto do_shiftv;
case INDEX_op_shr_i64:
if (c2) {
tcg_out_dsrl(s, a0, a1, a2);
break;
}
i1 = OPC_DSRLV;
goto do_shiftv;
case INDEX_op_rotr_i64: case INDEX_op_rotr_i64:
if (c2) { if (c2) {
tcg_out_opc_sa64(s, OPC_DROTR, OPC_DROTR32, a0, a1, a2); tcg_out_opc_sa64(s, OPC_DROTR, OPC_DROTR32, a0, a1, a2);
@ -2306,11 +2319,9 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_muls2_i64: case INDEX_op_muls2_i64:
case INDEX_op_mulu2_i64: case INDEX_op_mulu2_i64:
return C_O2_I2(r, r, r, r); return C_O2_I2(r, r, r, r);
case INDEX_op_shr_i32:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_rotr_i32: case INDEX_op_rotr_i32:
case INDEX_op_rotl_i32: case INDEX_op_rotl_i32:
case INDEX_op_shr_i64:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_rotr_i64: case INDEX_op_rotr_i64:
case INDEX_op_rotl_i64: case INDEX_op_rotl_i64:

42
tcg/ppc/tcg-target.c.inc
View file

@ -3146,6 +3146,30 @@ static const TCGOutOpBinary outop_shl = {
.out_rri = tgen_shli, .out_rri = tgen_shli,
}; };
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
uint32_t insn = type == TCG_TYPE_I32 ? SRW : SRD;
tcg_out32(s, insn | SAB(a1, a0, a2));
}
static void tgen_shri(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, tcg_target_long a2)
{
/* Limit immediate shift count lest we create an illegal insn. */
if (type == TCG_TYPE_I32) {
tcg_out_shri32(s, a0, a1, a2 & 31);
} else {
tcg_out_shri64(s, a0, a1, a2 & 63);
}
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_O1_I2(r, r, ri),
.out_rrr = tgen_shr,
.out_rri = tgen_shri,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -3296,14 +3320,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
tcg_out32(s, CNTPOPD | SAB(args[1], args[0], 0)); tcg_out32(s, CNTPOPD | SAB(args[1], args[0], 0));
break; break;
case INDEX_op_shr_i32:
if (const_args[2]) {
/* Limit immediate shift count lest we create an illegal insn. */
tcg_out_shri32(s, args[0], args[1], args[2] & 31);
} else {
tcg_out32(s, SRW | SAB(args[1], args[0], args[2]));
}
break;
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
if (const_args[2]) { if (const_args[2]) {
tcg_out_sari32(s, args[0], args[1], args[2]); tcg_out_sari32(s, args[0], args[1], args[2]);
@ -3341,14 +3357,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
tcg_out_brcond2(s, args, const_args); tcg_out_brcond2(s, args, const_args);
break; break;
case INDEX_op_shr_i64:
if (const_args[2]) {
/* Limit immediate shift count lest we create an illegal insn. */
tcg_out_shri64(s, args[0], args[1], args[2] & 63);
} else {
tcg_out32(s, SRD | SAB(args[1], args[0], args[2]));
}
break;
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
if (const_args[2]) { if (const_args[2]) {
tcg_out_sari64(s, args[0], args[1], args[2]); tcg_out_sari64(s, args[0], args[1], args[2]);
@ -4214,11 +4222,9 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_st_i64: case INDEX_op_st_i64:
return C_O0_I2(r, r); return C_O0_I2(r, r);
case INDEX_op_shr_i32:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_rotl_i32: case INDEX_op_rotl_i32:
case INDEX_op_rotr_i32: case INDEX_op_rotr_i32:
case INDEX_op_shr_i64:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_rotl_i64: case INDEX_op_rotl_i64:
case INDEX_op_rotr_i64: case INDEX_op_rotr_i64:

38
tcg/riscv/tcg-target.c.inc
View file

@ -2165,6 +2165,27 @@ static const TCGOutOpBinary outop_shl = {
.out_rri = tgen_shli, .out_rri = tgen_shli,
}; };
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
RISCVInsn insn = type == TCG_TYPE_I32 ? OPC_SRLW : OPC_SRL;
tcg_out_opc_reg(s, insn, a0, a1, a2);
}
static void tgen_shri(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, tcg_target_long a2)
{
RISCVInsn insn = type == TCG_TYPE_I32 ? OPC_SRLIW : OPC_SRLI;
unsigned mask = type == TCG_TYPE_I32 ? 31 : 63;
tcg_out_opc_imm(s, insn, a0, a1, a2 & mask);
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_O1_I2(r, r, ri),
.out_rrr = tgen_shr,
.out_rri = tgen_shri,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -2278,21 +2299,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
tcg_out_ldst(s, OPC_SD, a0, a1, a2); tcg_out_ldst(s, OPC_SD, a0, a1, a2);
break; break;
case INDEX_op_shr_i32:
if (c2) {
tcg_out_opc_imm(s, OPC_SRLIW, a0, a1, a2 & 0x1f);
} else {
tcg_out_opc_reg(s, OPC_SRLW, a0, a1, a2);
}
break;
case INDEX_op_shr_i64:
if (c2) {
tcg_out_opc_imm(s, OPC_SRLI, a0, a1, a2 & 0x3f);
} else {
tcg_out_opc_reg(s, OPC_SRL, a0, a1, a2);
}
break;
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
if (c2) { if (c2) {
tcg_out_opc_imm(s, OPC_SRAIW, a0, a1, a2 & 0x1f); tcg_out_opc_imm(s, OPC_SRAIW, a0, a1, a2 & 0x1f);
@ -2764,11 +2770,9 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_negsetcond_i64: case INDEX_op_negsetcond_i64:
return C_O1_I2(r, r, rI); return C_O1_I2(r, r, rI);
case INDEX_op_shr_i32:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_rotl_i32: case INDEX_op_rotl_i32:
case INDEX_op_rotr_i32: case INDEX_op_rotr_i32:
case INDEX_op_shr_i64:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_rotl_i64: case INDEX_op_rotl_i64:
case INDEX_op_rotr_i64: case INDEX_op_rotr_i64:

39
tcg/s390x/tcg-target.c.inc
View file

@ -2475,6 +2475,36 @@ static const TCGOutOpBinary outop_shl = {
.out_rri = tgen_shli, .out_rri = tgen_shli,
}; };
static void tgen_shr_int(TCGContext *s, TCGType type, TCGReg dst,
TCGReg src, TCGReg v, tcg_target_long i)
{
if (type != TCG_TYPE_I32) {
tcg_out_sh64(s, RSY_SRLG, dst, src, v, i);
} else if (dst == src) {
tcg_out_sh32(s, RS_SRL, dst, v, i);
} else {
tcg_out_sh64(s, RSY_SRLK, dst, src, v, i);
}
}
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
tgen_shr_int(s, type, a0, a1, a2, 0);
}
static void tgen_shri(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, tcg_target_long a2)
{
tgen_shr_int(s, type, a0, a1, TCG_REG_NONE, a2);
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_O1_I2(r, r, ri),
.out_rrr = tgen_shr,
.out_rri = tgen_shri,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -2621,10 +2651,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
} }
} }
break; break;
case INDEX_op_shr_i32:
op = RS_SRL;
op2 = RSY_SRLK;
goto do_shift32;
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
op = RS_SRA; op = RS_SRA;
op2 = RSY_SRAK; op2 = RSY_SRAK;
@ -2780,9 +2806,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
tcg_out_sh64(s, op, args[0], args[1], args[2], 0); tcg_out_sh64(s, op, args[0], args[1], args[2], 0);
} }
break; break;
case INDEX_op_shr_i64:
op = RSY_SRLG;
goto do_shift64;
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
op = RSY_SRAG; op = RSY_SRAG;
goto do_shift64; goto do_shift64;
@ -3371,7 +3394,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_st_i64: case INDEX_op_st_i64:
return C_O0_I2(r, r); return C_O0_I2(r, r);
case INDEX_op_shr_i64:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_rotl_i32: case INDEX_op_rotl_i32:
case INDEX_op_rotl_i64: case INDEX_op_rotl_i64:
@ -3387,7 +3409,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_clz_i64: case INDEX_op_clz_i64:
return C_O1_I2(r, r, rI); return C_O1_I2(r, r, rI);
case INDEX_op_shr_i32:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
return C_O1_I2(r, r, ri); return C_O1_I2(r, r, ri);

29
tcg/sparc64/tcg-target.c.inc
View file

@ -1505,6 +1505,27 @@ static const TCGOutOpBinary outop_shl = {
.out_rri = tgen_shli, .out_rri = tgen_shli,
}; };
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
uint32_t insn = type == TCG_TYPE_I32 ? SHIFT_SRL : SHIFT_SRLX;
tcg_out_arith(s, a0, a1, a2, insn);
}
static void tgen_shri(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, tcg_target_long a2)
{
uint32_t insn = type == TCG_TYPE_I32 ? SHIFT_SRL : SHIFT_SRLX;
uint32_t mask = type == TCG_TYPE_I32 ? 31 : 63;
tcg_out_arithi(s, a0, a1, a2 & mask, insn);
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_O1_I2(r, r, rJ),
.out_rrr = tgen_shr,
.out_rri = tgen_shri,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -1612,9 +1633,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
/* Limit immediate shift count lest we create an illegal insn. */ /* Limit immediate shift count lest we create an illegal insn. */
tcg_out_arithc(s, a0, a1, a2 & 31, c2, c); tcg_out_arithc(s, a0, a1, a2 & 31, c2, c);
break; break;
case INDEX_op_shr_i32:
c = SHIFT_SRL;
goto do_shift32;
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
c = SHIFT_SRA; c = SHIFT_SRA;
goto do_shift32; goto do_shift32;
@ -1679,9 +1697,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
/* Limit immediate shift count lest we create an illegal insn. */ /* Limit immediate shift count lest we create an illegal insn. */
tcg_out_arithc(s, a0, a1, a2 & 63, c2, c); tcg_out_arithc(s, a0, a1, a2 & 63, c2, c);
break; break;
case INDEX_op_shr_i64:
c = SHIFT_SRLX;
goto do_shift64;
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
c = SHIFT_SRAX; c = SHIFT_SRAX;
goto do_shift64; goto do_shift64;
@ -1768,8 +1783,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_qemu_st_i64: case INDEX_op_qemu_st_i64:
return C_O0_I2(rz, r); return C_O0_I2(rz, r);
case INDEX_op_shr_i32:
case INDEX_op_shr_i64:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_setcond_i32: case INDEX_op_setcond_i32:

6
tcg/tcg.c
View file

@ -1043,6 +1043,8 @@ static const TCGOutOp * const all_outop[NB_OPS] = {
OUTOP(INDEX_op_rems, TCGOutOpBinary, outop_rems), OUTOP(INDEX_op_rems, TCGOutOpBinary, outop_rems),
OUTOP(INDEX_op_remu, TCGOutOpBinary, outop_remu), OUTOP(INDEX_op_remu, TCGOutOpBinary, outop_remu),
OUTOP(INDEX_op_shl, TCGOutOpBinary, outop_shl), OUTOP(INDEX_op_shl, TCGOutOpBinary, outop_shl),
OUTOP(INDEX_op_shr_i32, TCGOutOpBinary, outop_shr),
OUTOP(INDEX_op_shr_i64, TCGOutOpBinary, outop_shr),
OUTOP(INDEX_op_sub, TCGOutOpSubtract, outop_sub), OUTOP(INDEX_op_sub, TCGOutOpSubtract, outop_sub),
OUTOP(INDEX_op_xor, TCGOutOpBinary, outop_xor), OUTOP(INDEX_op_xor, TCGOutOpBinary, outop_xor),
}; };
@ -2263,7 +2265,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_st8_i32: case INDEX_op_st8_i32:
case INDEX_op_st16_i32: case INDEX_op_st16_i32:
case INDEX_op_st_i32: case INDEX_op_st_i32:
case INDEX_op_shr_i32:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_extract_i32: case INDEX_op_extract_i32:
case INDEX_op_sextract_i32: case INDEX_op_sextract_i32:
@ -2314,7 +2315,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_st16_i64: case INDEX_op_st16_i64:
case INDEX_op_st32_i64: case INDEX_op_st32_i64:
case INDEX_op_st_i64: case INDEX_op_st_i64:
case INDEX_op_shr_i64:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_ext_i32_i64: case INDEX_op_ext_i32_i64:
case INDEX_op_extu_i32_i64: case INDEX_op_extu_i32_i64:
@ -5423,6 +5423,8 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op)
case INDEX_op_rems: case INDEX_op_rems:
case INDEX_op_remu: case INDEX_op_remu:
case INDEX_op_shl: case INDEX_op_shl:
case INDEX_op_shr_i32:
case INDEX_op_shr_i64:
case INDEX_op_xor: case INDEX_op_xor:
{ {
const TCGOutOpBinary *out = const TCGOutOpBinary *out =

18
tcg/tci/tcg-target.c.inc
View file

@ -79,8 +79,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_st_i64: case INDEX_op_st_i64:
return C_O0_I2(r, r); return C_O0_I2(r, r);
case INDEX_op_shr_i32:
case INDEX_op_shr_i64:
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
case INDEX_op_rotl_i32: case INDEX_op_rotl_i32:
@ -787,6 +785,21 @@ static const TCGOutOpBinary outop_shl = {
.out_rrr = tgen_shl, .out_rrr = tgen_shl,
}; };
static void tgen_shr(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
if (type < TCG_TYPE_REG) {
tcg_out_ext32u(s, TCG_REG_TMP, a1);
a1 = TCG_REG_TMP;
}
tcg_out_op_rrr(s, glue(INDEX_op_shr_i,TCG_TARGET_REG_BITS), a0, a1, a2);
}
static const TCGOutOpBinary outop_shr = {
.base.static_constraint = C_O1_I2(r, r, r),
.out_rrr = tgen_shr,
};
static void tgen_sub(TCGContext *s, TCGType type, static void tgen_sub(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2) TCGReg a0, TCGReg a1, TCGReg a2)
{ {
@ -871,7 +884,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
tcg_out_ldst(s, opc, args[0], args[1], args[2]); tcg_out_ldst(s, opc, args[0], args[1], args[2]);
break; break;
CASE_32_64(shr)
CASE_32_64(sar) CASE_32_64(sar)
CASE_32_64(rotl) /* Optional (TCG_TARGET_HAS_rot_*). */ CASE_32_64(rotl) /* Optional (TCG_TARGET_HAS_rot_*). */
CASE_32_64(rotr) /* Optional (TCG_TARGET_HAS_rot_*). */ CASE_32_64(rotr) /* Optional (TCG_TARGET_HAS_rot_*). */