diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-07-27 16:56:32 +1000 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-09-07 12:40:03 +1000 |
| commit | bd6fefe71cec5a0c7d2be4ac96307f25db56abf9 (patch) | |
| tree | 624480f50538a44a1268cfc69835a2c72e195aa6 /target-ppc/mmu_helper.c | |
| parent | af6d376ea18db87287a9e0de08fe23c68f2464a6 (diff) | |
| download | qemu-bd6fefe71cec5a0c7d2be4ac96307f25db56abf9.tar.gz qemu-bd6fefe71cec5a0c7d2be4ac96307f25db56abf9.tar.bz2 qemu-bd6fefe71cec5a0c7d2be4ac96307f25db56abf9.zip | |
ppc: Make tlb_fill() use new exception helper
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'target-ppc/mmu_helper.c')
| -rw-r--r-- | target-ppc/mmu_helper.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c index 737f338fb9..692398c3f0 100644 --- a/target-ppc/mmu_helper.c +++ b/target-ppc/mmu_helper.c @@ -2892,10 +2892,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type, ret = cpu_ppc_handle_mmu_fault(env, addr, access_type, mmu_idx); } if (unlikely(ret != 0)) { - if (likely(retaddr)) { - /* now we have a real cpu fault */ - cpu_restore_state(cs, retaddr); - } - helper_raise_exception_err(env, cs->exception_index, env->error_code); + raise_exception_err_ra(env, cs->exception_index, env->error_code, + retaddr); } } |