summaryrefslogtreecommitdiff
path: root/target/nios2
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2017-10-10 17:14:44 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2017-10-16 18:03:52 +0200
commit17bd9597be45b96ae00716b0ae01a4d11bbee1ab (patch)
tree3f88ba61fac9e514430ee03eb62c82ca496513f5 /target/nios2
parent7271a81949ee9806705d51618379246fb2b72209 (diff)
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@nongnu.org Cc: Marek Vasut <marex@denx.de> Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target/nios2')
-rw-r--r--target/nios2/translate.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 6b0961837d..54fbe898df 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -948,6 +948,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,