diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-10-08 10:00:02 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-10-08 10:00:02 +0000 |
| commit | 6e19a1379d3d12c2d8f934aa8154037a609f4507 (patch) | |
| tree | 7495ab30dbb90ba2f9b278a6cd324588ae3f1767 /target-arm | |
| parent | e4fc8781db7c49b0c5ac5d24762e17c59dfe0871 (diff) | |
| download | qemu-6e19a1379d3d12c2d8f934aa8154037a609f4507.tar.gz qemu-6e19a1379d3d12c2d8f934aa8154037a609f4507.tar.bz2 qemu-6e19a1379d3d12c2d8f934aa8154037a609f4507.zip | |
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')
| -rw-r--r-- | target-arm/op_helper.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |