OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

revert "TCG: fix copy propagation"

Browse Source 
Given the copy propagation breakage on 32-bit hosts has been fixed
commit e31b0a7c05 can be reverted.

Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2012-09-10 13:14:12 +02:00
parent 332864bd95
commit d104bebd07
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tcg/optimize.c
View File

@ -107,15 +107,12 @@ static TCGOpcode op_to_movi(TCGOpcode op)
} }
} }
static void tcg_opt_gen_mov(TCGContext *s, TCGArg *gen_args, TCGArg dst, static void tcg_opt_gen_mov(TCGArg *gen_args, TCGArg dst, TCGArg src,
TCGArg src, int nb_temps, int nb_globals) int nb_temps, int nb_globals)
{ {
reset_temp(dst, nb_temps, nb_globals); reset_temp(dst, nb_temps, nb_globals);
assert(temps[src].state != TCG_TEMP_COPY); assert(temps[src].state != TCG_TEMP_COPY);
/* Don't try to copy if one of temps is a global or either one if (src >= nb_globals) {
is local and another is register */
if (src >= nb_globals && dst >= nb_globals &&
tcg_arg_is_local(s, src) == tcg_arg_is_local(s, dst)) {
assert(temps[src].state != TCG_TEMP_CONST); assert(temps[src].state != TCG_TEMP_CONST);
if (temps[src].state != TCG_TEMP_HAS_COPY) { if (temps[src].state != TCG_TEMP_HAS_COPY) {
temps[src].state = TCG_TEMP_HAS_COPY; temps[src].state = TCG_TEMP_HAS_COPY;
@ -444,7 +441,7 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
gen_opc_buf[op_index] = INDEX_op_nop; gen_opc_buf[op_index] = INDEX_op_nop;
} else { } else {
gen_opc_buf[op_index] = op_to_mov(op); gen_opc_buf[op_index] = op_to_mov(op);
tcg_opt_gen_mov(s, gen_args, args[0], args[1], tcg_opt_gen_mov(gen_args, args[0], args[1],
nb_temps, nb_globals); nb_temps, nb_globals);
gen_args += 2; gen_args += 2;
} }
@ -482,7 +479,7 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
gen_opc_buf[op_index] = INDEX_op_nop; gen_opc_buf[op_index] = INDEX_op_nop;
} else { } else {
gen_opc_buf[op_index] = op_to_mov(op); gen_opc_buf[op_index] = op_to_mov(op);
tcg_opt_gen_mov(s, gen_args, args[0], args[1], nb_temps, tcg_opt_gen_mov(gen_args, args[0], args[1], nb_temps,
nb_globals); nb_globals);
gen_args += 2; gen_args += 2;
} }
@ -507,7 +504,7 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
break; break;
} }
if (temps[args[1]].state != TCG_TEMP_CONST) { if (temps[args[1]].state != TCG_TEMP_CONST) {
tcg_opt_gen_mov(s, gen_args, args[0], args[1], tcg_opt_gen_mov(gen_args, args[0], args[1],
nb_temps, nb_globals); nb_temps, nb_globals);
gen_args += 2; gen_args += 2;
args += 2; args += 2;

5
tcg/tcg.h
View File

@ -459,11 +459,6 @@ static inline TCGv_i64 tcg_temp_local_new_i64(void)
void tcg_temp_free_i64(TCGv_i64 arg); void tcg_temp_free_i64(TCGv_i64 arg);
char *tcg_get_arg_str_i64(TCGContext *s, char *buf, int buf_size, TCGv_i64 arg); char *tcg_get_arg_str_i64(TCGContext *s, char *buf, int buf_size, TCGv_i64 arg);
static inline bool tcg_arg_is_local(TCGContext *s, TCGArg arg)
{
return s->temps[arg].temp_local;
}
#if defined(CONFIG_DEBUG_TCG) #if defined(CONFIG_DEBUG_TCG)
/* If you call tcg_clear_temp_count() at the start of a section of /* If you call tcg_clear_temp_count() at the start of a section of
* code which is not supposed to leak any TCG temporaries, then * code which is not supposed to leak any TCG temporaries, then