diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-08-27 00:28:06 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-13 19:20:47 +0100 |
| commit | d5a11fefef1eeed86a8f06021067ba9990729a5a (patch) | |
| tree | 7a99e0676de042609104c21d98ff2a94be017c9a /target-m68k | |
| parent | f0c3c505a8ec1a948006b3a16a35864a2270a84b (diff) | |
| download | qemu-d5a11fefef1eeed86a8f06021067ba9990729a5a.tar.gz qemu-d5a11fefef1eeed86a8f06021067ba9990729a5a.tar.bz2 qemu-d5a11fefef1eeed86a8f06021067ba9990729a5a.zip | |
exec: Change tlb_fill() argument to CPUState
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-m68k')
| -rw-r--r-- | target-m68k/op_helper.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index 930d7c8d04..b1745b8796 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -53,14 +53,16 @@ extern int semihosting_enabled; /* Try to fill the TLB and return an exception if error. If retaddr is NULL, it means that the function was called in C code (i.e. not from generated code or from helper.c) */ -void tlb_fill(CPUM68KState *env, target_ulong addr, int is_write, int mmu_idx, +void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx, uintptr_t retaddr) { - M68kCPU *cpu = m68k_env_get_cpu(env); int ret; - ret = m68k_cpu_handle_mmu_fault(CPU(cpu), addr, is_write, mmu_idx); + ret = m68k_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx); if (unlikely(ret)) { + M68kCPU *cpu = M68K_CPU(cs); + CPUM68KState *env = &cpu->env; + if (retaddr) { /* now we have a real cpu fault */ cpu_restore_state(env, retaddr); |