path: root/target-arm
diff options
authorBlue Swirl <blauwirbel@gmail.com>2011-10-08 10:00:02 +0000
committerBlue Swirl <blauwirbel@gmail.com>2011-10-08 10:00:02 +0000
commit6e19a1379d3d12c2d8f934aa8154037a609f4507 (patch)
tree7495ab30dbb90ba2f9b278a6cd324588ae3f1767 /target-arm
parente4fc8781db7c49b0c5ac5d24762e17c59dfe0871 (diff)
ARM: fix segfault
Fix a bug in bccd9ec5f098668576342c83d90d6d6833d61d33, target-arm/op_helper.c missed a change unlike all other targets. This lead to a NULL pointer dereferences. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-arm')
1 files changed, 1 insertions, 0 deletions
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index ab9c9239d..1892b35ec 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -84,6 +84,7 @@ void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
int ret;
saved_env = env;
+ env = env1;
ret = cpu_arm_handle_mmu_fault(env, addr, is_write, mmu_idx);
if (unlikely(ret)) {
if (retaddr) {