From patchwork Sat Mar 10 02:27:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 145805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5D07EB6F9F for ; Sat, 10 Mar 2012 14:40:09 +1100 (EST) Received: from localhost ([::1]:46507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C4x-0001ua-SI for incoming@patchwork.ozlabs.org; Fri, 09 Mar 2012 21:30:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C3m-0007zl-BW for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6C3k-0001QQ-B4 for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:29 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39830 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6C3k-0001Q0-2J for qemu-devel@nongnu.org; Fri, 09 Mar 2012 21:29:28 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id F22828FC92 for ; Sat, 10 Mar 2012 03:29:26 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 10 Mar 2012 03:27:43 +0100 Message-Id: <1331346496-10736-12-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1331346496-10736-1-git-send-email-afaerber@suse.de> References: <1330893156-26569-1-git-send-email-afaerber@suse.de> <1331346496-10736-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH RFC v4 11/44] darwin-user: Don't overuse CPUState 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 Use CPU*State where applicable. Signed-off-by: Andreas Färber --- darwin-user/main.c | 14 +++++++------- darwin-user/signal.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/darwin-user/main.c b/darwin-user/main.c index 13c1f05..f5cadc7 100644 --- a/darwin-user/main.c +++ b/darwin-user/main.c @@ -77,38 +77,38 @@ int cpu_get_pic_interrupt(CPUState *env) } #ifdef TARGET_PPC -static inline uint64_t cpu_ppc_get_tb (CPUState *env) +static inline uint64_t cpu_ppc_get_tb(CPUPPCState *env) { /* TO FIX */ return 0; } -uint64_t cpu_ppc_load_tbl (CPUState *env) +uint64_t cpu_ppc_load_tbl(CPUPPCState *env) { return cpu_ppc_get_tb(env); } -uint32_t cpu_ppc_load_tbu (CPUState *env) +uint32_t cpu_ppc_load_tbu(CPUPPCState *env) { return cpu_ppc_get_tb(env) >> 32; } -uint64_t cpu_ppc_load_atbl (CPUState *env) +uint64_t cpu_ppc_load_atbl(CPUPPCState *env) { return cpu_ppc_get_tb(env); } -uint32_t cpu_ppc_load_atbu (CPUState *env) +uint32_t cpu_ppc_load_atbu(CPUPPCState *env) { return cpu_ppc_get_tb(env) >> 32; } -uint32_t cpu_ppc601_load_rtcu (CPUState *env) +uint32_t cpu_ppc601_load_rtcu(CPUPPCState *env) { cpu_ppc_load_tbu(env); } -uint32_t cpu_ppc601_load_rtcl (CPUState *env) +uint32_t cpu_ppc601_load_rtcl(CPUPPCState *env) { return cpu_ppc_load_tbl(env) & 0x3FFFFF80; } diff --git a/darwin-user/signal.c b/darwin-user/signal.c index 317ef92..8f9705d 100644 --- a/darwin-user/signal.c +++ b/darwin-user/signal.c @@ -315,7 +315,7 @@ get_sigframe(struct emulated_sigaction *ka, CPUX86State *env, size_t frame_size) } static void setup_frame(int sig, struct emulated_sigaction *ka, - void *set, CPUState *env) + void *set, CPUX86State *env) { void *frame; @@ -336,7 +336,7 @@ give_sigsegv: force_sig(SIGSEGV /* , current */); } -long do_sigreturn(CPUState *env, int num) +long do_sigreturn(CPUX86State *env, int num) { int i = 0; struct target_sigcontext *scp = get_int_arg(&i, env);