[Xen-changelog] [qemu-xen stable-4.10] nios2: define tcg_env

[patchbot@xxxxxxx]

commit e31942b4865634e613b3b3d17af80b38e82d5fbe
Author:     Paolo Bonzini <pbonzini@xxxxxxxxxx>
AuthorDate: Tue Oct 10 17:14:44 2017 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Dec 6 09:32:04 2017 -0600

    nios2: define tcg_env
    
    This should be done by all target and, since commit 53f6672bcf
    ("gen-icount: use tcg_ctx.tcg_env instead of cpu_env", 2017-06-30),
    is causing the NIOS2 target to hang.
    
    This is because the test for "should I exit to the main loop"
    was being done with the correct offset to the icount decrementer,
    but using TCG temporary 0 (the frame pointer) rather than the
    env pointer.
    
    Cc: qemu-stable@xxxxxxxxxx
    Cc: Marek Vasut <marex@xxxxxxx>
    Reported-by: Thomas Huth <thuth@xxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit 17bd9597be45b96ae00716b0ae01a4d11bbee1ab)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 target/nios2/translate.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 8b97d65..f25ef7e 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -942,6 +942,7 @@ void nios2_tcg_init(void)
     int i;
 
     cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env");
+    tcg_ctx.tcg_env = cpu_env;
 
     for (i = 0; i < NUM_CORE_REGS; i++) {
         cpu_R[i] = tcg_global_mem_new(cpu_env,
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.10

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog