From bccd9ec5f098668576342c83d90d6d6833d61d33 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Mon, 4 Jul 2011 20:57:05 +0000 Subject: 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 --- target-m68k/op_helper.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'target-m68k') diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index c66fa0cf3..2f7fe6bc4 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) { -- cgit v1.2.3