SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tcg: Remove tcg_regset_set

Browse Source 
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2017-09-11 11:58:44 -07:00
parent ccb1bb66ea
commit d21369f5fb
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tcg/mips/tcg-target.inc.c
View File

@ -195,11 +195,11 @@ static const char *target_parse_constraint(TCGArgConstraint *ct,
switch(*ct_str++) { switch(*ct_str++) {
case 'r': case 'r':
ct->ct |= TCG_CT_REG; ct->ct |= TCG_CT_REG;
tcg_regset_set(ct->u.regs, 0xffffffff); ct->u.regs = 0xffffffff;
break; break;
case 'L': /* qemu_ld input arg constraint */ case 'L': /* qemu_ld input arg constraint */
ct->ct |= TCG_CT_REG; ct->ct |= TCG_CT_REG;
tcg_regset_set(ct->u.regs, 0xffffffff); ct->u.regs = 0xffffffff;
tcg_regset_reset_reg(ct->u.regs, TCG_REG_A0); tcg_regset_reset_reg(ct->u.regs, TCG_REG_A0);
#if defined(CONFIG_SOFTMMU) #if defined(CONFIG_SOFTMMU)
if (TCG_TARGET_REG_BITS < TARGET_LONG_BITS) { if (TCG_TARGET_REG_BITS < TARGET_LONG_BITS) {
@ -209,7 +209,7 @@ static const char *target_parse_constraint(TCGArgConstraint *ct,
break; break;
case 'S': /* qemu_st constraint */ case 'S': /* qemu_st constraint */
ct->ct |= TCG_CT_REG; ct->ct |= TCG_CT_REG;
tcg_regset_set(ct->u.regs, 0xffffffff); ct->u.regs = 0xffffffff;
tcg_regset_reset_reg(ct->u.regs, TCG_REG_A0); tcg_regset_reset_reg(ct->u.regs, TCG_REG_A0);
#if defined(CONFIG_SOFTMMU) #if defined(CONFIG_SOFTMMU)
if (TCG_TARGET_REG_BITS < TARGET_LONG_BITS) { if (TCG_TARGET_REG_BITS < TARGET_LONG_BITS) {
@ -2607,27 +2607,28 @@ static void tcg_target_qemu_prologue(TCGContext *s)
static void tcg_target_init(TCGContext *s) static void tcg_target_init(TCGContext *s)
{ {
tcg_target_detect_isa(); tcg_target_detect_isa();
tcg_regset_set(tcg_target_available_regs[TCG_TYPE_I32], 0xffffffff); tcg_target_available_regs[TCG_TYPE_I32] = 0xffffffff;
if (TCG_TARGET_REG_BITS == 64) { if (TCG_TARGET_REG_BITS == 64) {
tcg_regset_set(tcg_target_available_regs[TCG_TYPE_I64], 0xffffffff); tcg_target_available_regs[TCG_TYPE_I64] = 0xffffffff;
} }
tcg_regset_set(tcg_target_call_clobber_regs,
(1 << TCG_REG_V0) | tcg_target_call_clobber_regs = 0;
(1 << TCG_REG_V1) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_V0);
(1 << TCG_REG_A0) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_V1);
(1 << TCG_REG_A1) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_A0);
(1 << TCG_REG_A2) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_A1);
(1 << TCG_REG_A3) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_A2);
(1 << TCG_REG_T0) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_A3);
(1 << TCG_REG_T1) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T0);
(1 << TCG_REG_T2) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T1);
(1 << TCG_REG_T3) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T2);
(1 << TCG_REG_T4) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T3);
(1 << TCG_REG_T5) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T4);
(1 << TCG_REG_T6) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T5);
(1 << TCG_REG_T7) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T6);
(1 << TCG_REG_T8) | tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T7);
(1 << TCG_REG_T9)); tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T8);
tcg_regset_set_reg(tcg_target_call_clobber_regs, TCG_REG_T9);
s->reserved_regs = 0; s->reserved_regs = 0;
tcg_regset_set_reg(s->reserved_regs, TCG_REG_ZERO); /* zero register */ tcg_regset_set_reg(s->reserved_regs, TCG_REG_ZERO); /* zero register */

8
tcg/tcg.c
View File

@ -2362,7 +2362,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOpDef *def,
TCGTemp *ts, *ots; TCGTemp *ts, *ots;
TCGType otype, itype; TCGType otype, itype;
tcg_regset_set(allocated_regs, s->reserved_regs); allocated_regs = s->reserved_regs;
ots = &s->temps[args[0]]; ots = &s->temps[args[0]];
ts = &s->temps[args[1]]; ts = &s->temps[args[1]];
@ -2450,8 +2450,8 @@ static void tcg_reg_alloc_op(TCGContext *s,
args + nb_oargs + nb_iargs, args + nb_oargs + nb_iargs,
sizeof(TCGArg) * def->nb_cargs); sizeof(TCGArg) * def->nb_cargs);
tcg_regset_set(i_allocated_regs, s->reserved_regs); i_allocated_regs = s->reserved_regs;
tcg_regset_set(o_allocated_regs, s->reserved_regs); o_allocated_regs = s->reserved_regs;
/* satisfy input constraints */ /* satisfy input constraints */
for(k = 0; k < nb_iargs; k++) { for(k = 0; k < nb_iargs; k++) {
@ -2651,7 +2651,7 @@ static void tcg_reg_alloc_call(TCGContext *s, int nb_oargs, int nb_iargs,
} }
/* assign input registers */ /* assign input registers */
tcg_regset_set(allocated_regs, s->reserved_regs); allocated_regs = s->reserved_regs;
for(i = 0; i < nb_regs; i++) { for(i = 0; i < nb_regs; i++) {
arg = args[nb_oargs + i]; arg = args[nb_oargs + i];
if (arg != TCG_CALL_DUMMY_ARG) { if (arg != TCG_CALL_DUMMY_ARG) {

1
tcg/tcg.h
View File

@ -186,7 +186,6 @@ typedef enum TCGOpcode {
NB_OPS, NB_OPS,
} TCGOpcode; } TCGOpcode;
#define tcg_regset_set(d, s) (d) = (s)
#define tcg_regset_set32(d, reg, val32) (d) |= (val32) << (reg) #define tcg_regset_set32(d, reg, val32) (d) |= (val32) << (reg)
#define tcg_regset_set_reg(d, r) (d) |= 1L << (r) #define tcg_regset_set_reg(d, r) (d) |= 1L << (r)
#define tcg_regset_reset_reg(d, r) (d) &= ~(1L << (r)) #define tcg_regset_reset_reg(d, r) (d) &= ~(1L << (r))