haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tcg: Change parameters for tcg_target_const_match

Browse source 
Change the return value to bool, because that's what is should
have been from the start.  Pass the ct mask instead of the whole
TCGArgConstraint, as that's the only part that's relevant.

Change the value argument to int64_t.  We will need the extra
width for 32-bit hosts wanting to match vector constants.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-05-03 16:47:37 -07:00
parent 1cbd2d9149
commit a4fbbd779a
10 changed files with 12 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -277,11 +277,8 @@ static bool is_shimm1632(uint32_t v32, int *cmode, int *imm8)
}
}
static int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
static bool tcg_target_const_match(int64_t val, TCGType type, int ct)
{
int ct = arg_ct->ct;
if (ct & TCG_CT_CONST) {
return 1;
}

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

@ -301,11 +301,8 @@ static inline int check_fit_imm(uint32_t imm)
* mov operand2: values represented with x << (2 * y), x < 0x100
* add, sub, eor...: ditto
*/
static inline int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
static bool tcg_target_const_match(int64_t val, TCGType type, int ct)
{
int ct;
ct = arg_ct->ct;
if (ct & TCG_CT_CONST) {
return 1;
} else if ((ct & TCG_CT_CONST_ARM) && check_fit_imm(val)) {

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

@ -210,10 +210,8 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
}
/* test if a constant matches the constraint */
static inline int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
static bool tcg_target_const_match(int64_t val, TCGType type, int ct)
{
int ct = arg_ct->ct;
if (ct & TCG_CT_CONST) {
return 1;
}

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

@ -193,11 +193,8 @@ static inline bool is_p2m1(tcg_target_long val)
}
/* test if a constant matches the constraint */
static inline int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
static bool tcg_target_const_match(int64_t val, TCGType type, int ct)
{
int ct;
ct = arg_ct->ct;
if (ct & TCG_CT_CONST) {
return 1;
} else if ((ct & TCG_CT_CONST_ZERO) && val == 0) {

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

@ -238,10 +238,8 @@ static bool reloc_pc14(tcg_insn_unit *src_rw, const tcg_insn_unit *target)
}
/* test if a constant matches the constraint */
static int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
static bool tcg_target_const_match(int64_t val, TCGType type, int ct)
{
int ct = arg_ct->ct;
if (ct & TCG_CT_CONST) {
return 1;
}

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

@ -145,10 +145,8 @@ static inline tcg_target_long sextreg(tcg_target_long val, int pos, int len)
}
/* test if a constant matches the constraint */
static int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
static bool tcg_target_const_match(int64_t val, TCGType type, int ct)
{
int ct = arg_ct->ct;
if (ct & TCG_CT_CONST) {
return 1;
}

5
tcg/s390/tcg-target.c.inc
View file

@ -417,11 +417,8 @@ static bool patch_reloc(tcg_insn_unit *src_rw, int type,
}
/* Test if a constant matches the constraint. */
static int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
static bool tcg_target_const_match(int64_t val, TCGType type, int ct)
{
int ct = arg_ct->ct;
if (ct & TCG_CT_CONST) {
return 1;
}

5
tcg/sparc/tcg-target.c.inc
View file

@ -341,11 +341,8 @@ static bool patch_reloc(tcg_insn_unit *src_rw, int type,
}
/* test if a constant matches the constraint */
static inline int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
static bool tcg_target_const_match(int64_t val, TCGType type, int ct)
{
int ct = arg_ct->ct;
if (ct & TCG_CT_CONST) {
return 1;
}

5
tcg/tcg.c
View file

@ -148,8 +148,7 @@ static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1,
static bool tcg_out_sti(TCGContext *s, TCGType type, TCGArg val,
TCGReg base, intptr_t ofs);
static void tcg_out_call(TCGContext *s, const tcg_insn_unit *target);
static int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct);
static bool tcg_target_const_match(int64_t val, TCGType type, int ct);
#ifdef TCG_TARGET_NEED_LDST_LABELS
static int tcg_out_ldst_finalize(TCGContext *s);
#endif
@ -4078,7 +4077,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op)
ts = arg_temp(arg);
if (ts->val_type == TEMP_VAL_CONST
&& tcg_target_const_match(ts->val, ts->type, arg_ct)) {
&& tcg_target_const_match(ts->val, ts->type, arg_ct->ct)) {
/* constant is OK for instruction */
const_args[i] = 1;
new_args[i] = ts->val;

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

@ -789,11 +789,9 @@ static inline bool tcg_out_sti(TCGContext *s, TCGType type, TCGArg val,
}
/* Test if a constant matches the constraint. */
static int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct)
static bool tcg_target_const_match(int64_t val, TCGType type, int ct)
{
/* No need to return 0 or 1, 0 or != 0 is good enough. */
return arg_ct->ct & TCG_CT_CONST;
return ct & TCG_CT_CONST;
}
static void tcg_target_init(TCGContext *s)