diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-07-04 20:57:05 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-10-01 09:31:26 +0000 |
| commit | bccd9ec5f098668576342c83d90d6d6833d61d33 (patch) | |
| tree | fa1cc26e01bd423b626d28c9cd9c9a6a286337dd /target-m68k | |
| parent | efbf29b6816416731e5dc420901a90430b6ea92d (diff) | |
softmmu_header: pass CPUState to tlb_fill
Pass CPUState pointer to tlb_fill() instead of architecture local
cpu_single_env hacks.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-m68k')
| -rw-r--r-- | target-m68k/op_helper.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index c66fa0cf3d..2f7fe6bc4e 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -55,17 +55,16 @@ extern int semihosting_enabled; NULL, it means that the function was called in C code (i.e. not from generated code or from helper.c) */ /* XXX: fix it to restore all registers */ -void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) +void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx, + void *retaddr) { TranslationBlock *tb; CPUState *saved_env; unsigned long pc; int ret; - /* XXX: hack to restore env in all cases, even if not called from - generated code */ saved_env = env; - env = cpu_single_env; + env = env1; ret = cpu_m68k_handle_mmu_fault(env, addr, is_write, mmu_idx); if (unlikely(ret)) { if (retaddr) { |