diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-10-10 17:14:44 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2017-12-06 09:32:04 -0600 |
| commit | e31942b4865634e613b3b3d17af80b38e82d5fbe (patch) | |
| tree | 01b5a5c0a1ac3a05fa73e96748c3f310a19db486 | |
| parent | 5aa698ab5fa049df7ff137e8cc76e75fdfd59bfe (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>
(cherry picked from commit 17bd9597be45b96ae00716b0ae01a4d11bbee1ab)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | target/nios2/translate.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 8b97d6585f..f25ef7e2bb 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, |