From patchwork Sat Sep 24 18:15:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 116232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D86CCB6F65 for ; Sun, 25 Sep 2011 04:16:26 +1000 (EST) Received: from localhost ([::1]:43965 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7Wls-0001ER-7y for incoming@patchwork.ozlabs.org; Sat, 24 Sep 2011 14:16:16 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7Wll-0001EH-88 for qemu-devel@nongnu.org; Sat, 24 Sep 2011 14:16:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R7Wlj-0002Re-Iq for qemu-devel@nongnu.org; Sat, 24 Sep 2011 14:16:09 -0400 Received: from mail-qy0-f180.google.com ([209.85.216.180]:46031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7Wlj-0002RV-CN for qemu-devel@nongnu.org; Sat, 24 Sep 2011 14:16:07 -0400 Received: by qyc1 with SMTP id 1so4720605qyc.4 for ; Sat, 24 Sep 2011 11:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; bh=lBfrKmgP6Wii8AIs0F9dzwycCMjMQe+ZDDUYzIc5yfU=; b=pjTWGq4ECeUNjoItOMUc1353TftHz96dhYJBhDngedYJTNkwzCKcnsLu6LSUR2zTQS gm53Gr72bnPCd/IV94dz7goqXd1oEu2Wwr7uZW1uvtXTeMDYgIRgjR7M0eP6akwZ5SLE vvfSAR9xhmd2ZeHpJ21biVNIw3jPJ4D6uw/14= Received: by 10.224.26.205 with SMTP id f13mr3795800qac.259.1316888166153; Sat, 24 Sep 2011 11:16:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.6.129 with HTTP; Sat, 24 Sep 2011 11:15:46 -0700 (PDT) From: Blue Swirl Date: Sat, 24 Sep 2011 18:15:46 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.216.180 Subject: [Qemu-devel] [PATCH 02/26] softmmu_header: pass CPUState to tlb_fill X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Pass CPUState pointer to tlb_fill() instead of architecture local cpu_single_env hacks. Signed-off-by: Blue Swirl --- exec-all.h | 2 +- softmmu_template.h | 8 ++++---- target-alpha/op_helper.c | 7 +++---- target-arm/op_helper.c | 6 ++---- target-cris/op_helper.c | 7 +++---- target-i386/op_helper.c | 7 +++---- target-lm32/op_helper.c | 7 +++---- target-m68k/op_helper.c | 7 +++---- target-microblaze/op_helper.c | 7 +++---- target-mips/op_helper.c | 7 +++---- target-ppc/op_helper.c | 7 +++---- target-s390x/op_helper.c | 7 +++---- target-sh4/op_helper.c | 7 +++---- target-sparc/op_helper.c | 7 +++---- target-xtensa/op_helper.c | 5 +++-- 15 files changed, 43 insertions(+), 55 deletions(-) uint32_t page_size; diff --git a/exec-all.h b/exec-all.h index 9b8d62c..b1dfe10 100644 --- a/exec-all.h +++ b/exec-all.h @@ -273,7 +273,7 @@ extern CPUWriteMemoryFunc *io_mem_write[IO_MEM_NB_ENTRIES][4]; extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4]; extern void *io_mem_opaque[IO_MEM_NB_ENTRIES]; -void tlb_fill(target_ulong addr, int is_write, int mmu_idx, +void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx, void *retaddr); #include "softmmu_defs.h" diff --git a/softmmu_template.h b/softmmu_template.h index ae0ccf2..36eb2e8 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -136,7 +136,7 @@ DATA_TYPE REGPARM glue(glue(__ld, SUFFIX), MMUSUFFIX)(target_ulong addr, if ((addr & (DATA_SIZE - 1)) != 0) do_unaligned_access(addr, READ_ACCESS_TYPE, mmu_idx, retaddr); #endif - tlb_fill(addr, READ_ACCESS_TYPE, mmu_idx, retaddr); + tlb_fill(env, addr, READ_ACCESS_TYPE, mmu_idx, retaddr); goto redo; } return res; @@ -186,7 +186,7 @@ static DATA_TYPE glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(target_ulong addr, } } else { /* the page is not in the TLB : fill it */ - tlb_fill(addr, READ_ACCESS_TYPE, mmu_idx, retaddr); + tlb_fill(env, addr, READ_ACCESS_TYPE, mmu_idx, retaddr); goto redo; } return res; @@ -274,7 +274,7 @@ void REGPARM glue(glue(__st, SUFFIX), MMUSUFFIX)(target_ulong addr, if ((addr & (DATA_SIZE - 1)) != 0) do_unaligned_access(addr, 1, mmu_idx, retaddr); #endif - tlb_fill(addr, 1, mmu_idx, retaddr); + tlb_fill(env, addr, 1, mmu_idx, retaddr); goto redo; } } @@ -321,7 +321,7 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(target_ulong addr, } } else { /* the page is not in the TLB : fill it */ - tlb_fill(addr, 1, mmu_idx, retaddr); + tlb_fill(env, addr, 1, mmu_idx, retaddr); goto redo; } } diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index 38be234..d8945dc 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -1335,15 +1335,14 @@ void QEMU_NORETURN cpu_unassigned_access(CPUState *env1, 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) { CPUState *saved_env; 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_alpha_handle_mmu_fault(env, addr, is_write, mmu_idx); if (unlikely(ret != 0)) { do_restore_state(retaddr); diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 37b77e1..ab9c923 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -75,17 +75,15 @@ uint32_t HELPER(neon_tbl)(uint32_t ireg, uint32_t def, 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; ret = cpu_arm_handle_mmu_fault(env, addr, is_write, mmu_idx); if (unlikely(ret)) { if (retaddr) { diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index 0cfe1b1..1eacc5f 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -56,17 +56,16 @@ 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; D_LOG("%s pc=%x tpc=%x ra=%x\n", __func__, env->pc, env->debug1, retaddr); diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index 1fc248f..3bb5a91 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -4997,17 +4997,16 @@ void helper_boundl(target_ulong a0, int v) 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; int ret; unsigned long pc; CPUX86State *saved_env; - /* 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_x86_handle_mmu_fault(env, addr, is_write, mmu_idx); if (ret) { diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c index 557da6c..02be134 100644 --- a/target-lm32/op_helper.c +++ b/target-lm32/op_helper.c @@ -75,17 +75,16 @@ uint32_t helper_rcsr_jrx(void) 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_lm32_handle_mmu_fault(env, addr, is_write, mmu_idx); if (unlikely(ret)) { diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index c66fa0c..2f7fe6b 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) { diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c index 8a7deac..7433cec 100644 --- a/target-microblaze/op_helper.c +++ b/target-microblaze/op_helper.c @@ -42,17 +42,16 @@ 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_mb_handle_mmu_fault(env, addr, is_write, mmu_idx); if (unlikely(ret)) { diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index 96e40c6..c51b9cb 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -2316,17 +2316,16 @@ static void do_unaligned_access (target_ulong addr, int is_write, int is_user, v helper_raise_exception ((is_write == 1) ? EXCP_AdES : EXCP_AdEL); } -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_mips_handle_mmu_fault(env, addr, is_write, mmu_idx); if (ret) { if (retaddr) { diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index c5e0601..134b0c6 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -3714,17 +3714,16 @@ uint32_t helper_efdcmpeq (uint64_t op1, uint64_t op2) 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_ppc_handle_mmu_fault(env, addr, is_write, mmu_idx); if (unlikely(ret != 0)) { if (likely(retaddr)) { diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c index b3ac630..cd57678 100644 --- a/target-s390x/op_helper.c +++ b/target-s390x/op_helper.c @@ -52,17 +52,16 @@ 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_s390x_handle_mmu_fault(env, addr, is_write, mmu_idx); if (unlikely(ret != 0)) { if (likely(retaddr)) { diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index 163858f..b299576 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -55,15 +55,14 @@ static void cpu_restore_state_from_retaddr(void *retaddr) #define SHIFT 3 #include "softmmu_template.h" -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) { CPUState *saved_env; 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_sh4_handle_mmu_fault(env, addr, is_write, mmu_idx); if (ret) { /* now we have a real cpu fault */ diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index 48e1db8..1cb0636 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -4225,15 +4225,14 @@ static void do_unaligned_access(target_ulong addr, int is_write, int is_user, 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) { int ret; CPUState *saved_env; - /* 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_sparc_handle_mmu_fault(env, addr, is_write, mmu_idx); if (ret) { diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c index d02706d..64847fc 100644 --- a/target-xtensa/op_helper.c +++ b/target-xtensa/op_helper.c @@ -70,11 +70,12 @@ static void do_unaligned_access(target_ulong addr, int is_write, int is_user, } } -void tlb_fill(target_ulong vaddr, int is_write, int mmu_idx, void *retaddr) +void tlb_fill(CPUState *env1, target_ulong vaddr, int is_write, int mmu_idx, + void *retaddr) { CPUState *saved_env = env; - env = cpu_single_env; + env = env1; { uint32_t paddr;