ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcg: Fix tcg_reg_alloc_mov vs no-op truncation 

Commit af3cbfbe80 hoisted some "common"
loads of the temporary type, forgetting that the types could differ
during truncating moves.  This affects the correctness of the memory
offset on big-endian hosts.

Tested-by: Tom Musta <tommusta@gmail.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2014-05-13 14:50:18 -07:00
parent f30d56e7d6
commit 450445d543
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tcg/tcg.c
View File

@ -2096,12 +2096,15 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOpDef *def,
{ {
TCGRegSet allocated_regs; TCGRegSet allocated_regs;
TCGTemp *ts, *ots; TCGTemp *ts, *ots;
TCGType type; TCGType otype, itype;
tcg_regset_set(allocated_regs, s->reserved_regs); tcg_regset_set(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]];
type = ots->type;
/* Note that otype != itype for no-op truncation. */
otype = ots->type;
itype = ts->type;
/* If the source value is not in a register, and we're going to be /* If the source value is not in a register, and we're going to be
forced to have it in a register in order to perform the copy, forced to have it in a register in order to perform the copy,
@ -2109,13 +2112,13 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOpDef *def,
we don't have to reload SOURCE the next time it is used. */ we don't have to reload SOURCE the next time it is used. */
if (((NEED_SYNC_ARG(0) || ots->fixed_reg) && ts->val_type != TEMP_VAL_REG) if (((NEED_SYNC_ARG(0) || ots->fixed_reg) && ts->val_type != TEMP_VAL_REG)
|| ts->val_type == TEMP_VAL_MEM) { || ts->val_type == TEMP_VAL_MEM) {
ts->reg = tcg_reg_alloc(s, tcg_target_available_regs[type], ts->reg = tcg_reg_alloc(s, tcg_target_available_regs[itype],
allocated_regs); allocated_regs);
if (ts->val_type == TEMP_VAL_MEM) { if (ts->val_type == TEMP_VAL_MEM) {
tcg_out_ld(s, type, ts->reg, ts->mem_reg, ts->mem_offset); tcg_out_ld(s, itype, ts->reg, ts->mem_reg, ts->mem_offset);
ts->mem_coherent = 1; ts->mem_coherent = 1;
} else if (ts->val_type == TEMP_VAL_CONST) { } else if (ts->val_type == TEMP_VAL_CONST) {
tcg_out_movi(s, type, ts->reg, ts->val); tcg_out_movi(s, itype, ts->reg, ts->val);
} }
s->reg_to_temp[ts->reg] = args[1]; s->reg_to_temp[ts->reg] = args[1];
ts->val_type = TEMP_VAL_REG; ts->val_type = TEMP_VAL_REG;
@ -2130,7 +2133,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOpDef *def,
if (!ots->mem_allocated) { if (!ots->mem_allocated) {
temp_allocate_frame(s, args[0]); temp_allocate_frame(s, args[0]);
} }
tcg_out_st(s, type, ts->reg, ots->mem_reg, ots->mem_offset); tcg_out_st(s, otype, ts->reg, ots->mem_reg, ots->mem_offset);
if (IS_DEAD_ARG(1)) { if (IS_DEAD_ARG(1)) {
temp_dead(s, args[1]); temp_dead(s, args[1]);
} }
@ -2158,10 +2161,10 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOpDef *def,
/* When allocating a new register, make sure to not spill the /* When allocating a new register, make sure to not spill the
input one. */ input one. */
tcg_regset_set_reg(allocated_regs, ts->reg); tcg_regset_set_reg(allocated_regs, ts->reg);
ots->reg = tcg_reg_alloc(s, tcg_target_available_regs[type], ots->reg = tcg_reg_alloc(s, tcg_target_available_regs[otype],
allocated_regs); allocated_regs);
} }
tcg_out_mov(s, type, ots->reg, ts->reg); tcg_out_mov(s, otype, ots->reg, ts->reg);
} }
ots->val_type = TEMP_VAL_REG; ots->val_type = TEMP_VAL_REG;
ots->mem_coherent = 0; ots->mem_coherent = 0;