[Xen-changelog] [qemu-upstream-unstable] tcg: mark local temps as MEM in dead_temp()

[patchbot@xxxxxxx]

commit e5138db510efb61523be92c225d8c65eb985fff0
Author: Aurelien Jarno <aurelien@xxxxxxxxxxx>
Date:   Sat Nov 24 11:53:55 2012 +0100

    tcg: mark local temps as MEM in dead_temp()
    
    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@xxxxxxxxx>
    Tested-by: Max Filippov <jcmvbkbc@xxxxxxxxx>
    Signed-off-by: Aurelien Jarno <aurelien@xxxxxxxxxxx>
---
 tcg/tcg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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;
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog