]> git.proxmox.com Git - qemu.git/commitdiff
tcg: mark local temps as MEM in dead_temp()
authorAurelien Jarno <aurelien@aurel32.net>
Sat, 24 Nov 2012 10:53:55 +0000 (11:53 +0100)
committerAurelien Jarno <aurelien@aurel32.net>
Sat, 24 Nov 2012 12:24:13 +0000 (13:24 +0100)
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 <jcmvbkbc@gmail.com>
Tested-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
tcg/tcg.c

index 4f756962c58b91e96a281e97d614e905907420d7..cb193f26830b5737b29f9bfbba533ce9c10db3ab 100644 (file)
--- 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;