From 6e19a1379d3d12c2d8f934aa8154037a609f4507 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 8 Oct 2011 10:00:02 +0000 Subject: 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 Signed-off-by: Blue Swirl --- target-arm/op_helper.c | 1 + 1 file changed, 1 insertion(+) (limited to 'target-arm/op_helper.c') diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index ab9c9239d3..1892b35ecc 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) { -- cgit v1.2.1