From patchwork Sat Nov 24 10:58:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: tcg: mark local temps as MEM in dead_temp() Date: Sat, 24 Nov 2012 00:58:14 -0000 From: Aurelien Jarno X-Patchwork-Id: 201455 Message-Id: <1353754694-18712-1-git-send-email-aurelien@aurel32.net> To: qemu-devel@nongnu.org Cc: Max Filippov , Aurelien Jarno In dead_temp, local temps should always be marked as back to memory, even if they have not been allocated (i.e. they are discared before cross a basic block). It fixes the following assertion in target-xtensa: qemu-system-xtensa: tcg/tcg.c:1665: temp_save: Assertion `s->temps[temp].val_type == 2 || s->temps[temp].fixed_reg' failed. Aborted Reported-by: Max Filippov Signed-off-by: Aurelien Jarno Tested-by: Max Filippov --- tcg/tcg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 4f75696..cb193f2 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1615,7 +1615,7 @@ static inline void temp_dead(TCGContext *s, int temp) if (ts->val_type == TEMP_VAL_REG) { s->reg_to_temp[ts->reg] = -1; } - if (temp < s->nb_globals || (ts->temp_local && ts->mem_allocated)) { + if (temp < s->nb_globals || ts->temp_local) { ts->val_type = TEMP_VAL_MEM; } else { ts->val_type = TEMP_VAL_DEAD;