From patchwork Thu May 19 11:18:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9127481 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8EB839F1C3 for ; Thu, 19 May 2016 12:14:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDC0B2021B for ; Thu, 19 May 2016 12:14:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 04E8A2021A for ; Thu, 19 May 2016 12:14:16 +0000 (UTC) Received: from localhost ([::1]:49989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3MqF-0004Fy-5D for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 08:14:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lz5-0004Jp-L2 for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Lyv-00046t-Im for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:18 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyv-00046i-1d for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:09 -0400 Received: by mail-wm0-x242.google.com with SMTP id s63so5550943wme.2 for ; Thu, 19 May 2016 04:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=UZGXjYWwKtpj8Jtae0CxWVJZCqQkZbp2MzfJ2lqiuzA=; b=0BrwDUkWTCuhorPEDaPPwp1Yl4cf9UQ3+QKHKCSaOKT+FLEOlphwx5mkbc0pz31Y0Z u63S0lfUZM99kYpU5aBm3KzcoLtgxqmDHYdDRjQcp6MV+1vd3kpt0ASqy39HEZoEwgsz GknTSqThasc3SYxggrKqOkiylmBMV1P8JxlwfnMX+d1rJZHdVgCyj686K71Vc78tFMKf O5+BRBZaBbc7wq1A0ivHFGAZ7rUneboFRlhCzQ2ntj9ZCuPqpZk2WRu4/zNFeNo989S6 ySyX2nYwk0LyfGgRuIVYCV2MbBzCSd30RdR+yjKNJYkfiq4whoPy095fZgfGKCsEG1Mf NUPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=UZGXjYWwKtpj8Jtae0CxWVJZCqQkZbp2MzfJ2lqiuzA=; b=jgwTuz+lp/TuT9DFgcPn7yTe5EPc5xN/FkjVcLwEQMxVqk8EcFJoaBYzA916ofQ/uP avauN6VH1PLk7uH47Y4aO/vA6i2EYbBHTPQx3JmzbAzLoBvl2RSEQWGsqOVhzStvP/CN PSY7yHHZc1fNyMIXA84sljzNOI8zIKbIr1IsXNhXDPzTLH5lX0SACZl9oiIxQi9VFAm9 iuf66Doup1OORLCqaFkokKlYP24Q9RnBmFkq+pqrPdLDGpEFq5wrXAVzn3erxH6qd2Jr BSvdlfhHKjRAal+IP1Yh/KqWDIsfmzioSjLmN4vyqfLftwS/WmMilOSOjjgGDw+z6xfa 8T1A== X-Gm-Message-State: AOPr4FVk4BOIbUrkRgt9YBK+kq2tqYszowrAkvqyLGS9v1eOFfMygXaAxmqAemyVLueqcg== X-Received: by 10.194.139.104 with SMTP id qx8mr12548328wjb.14.1463656748512; Thu, 19 May 2016 04:19:08 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id c7sm8374317wji.38.2016.05.19.04.19.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:19:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 13:18:13 +0200 Message-Id: <1463656726-35952-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> References: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 19/52] target-sparc: make cpu-qom.h not target specific X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make SPARCCPU an opaque type within cpu-qom.h, and move all definitions of private methods, as well as all type definitions that require knowledge of the layout to cpu.h. This helps making files independent of NEED_CPU_H if they only need to pass around CPU pointers. Signed-off-by: Paolo Bonzini --- target-sparc/cpu-qom.h | 37 +------------------------------------ target-sparc/cpu.h | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/target-sparc/cpu-qom.h b/target-sparc/cpu-qom.h index 174dfd3..f63af72 100644 --- a/target-sparc/cpu-qom.h +++ b/target-sparc/cpu-qom.h @@ -51,41 +51,6 @@ typedef struct SPARCCPUClass { void (*parent_reset)(CPUState *cpu); } SPARCCPUClass; -/** - * SPARCCPU: - * @env: #CPUSPARCState - * - * A SPARC CPU. - */ -typedef struct SPARCCPU { - /*< private >*/ - CPUState parent_obj; - /*< public >*/ - - CPUSPARCState env; -} SPARCCPU; - -static inline SPARCCPU *sparc_env_get_cpu(CPUSPARCState *env) -{ - return container_of(env, SPARCCPU, env); -} - -#define ENV_GET_CPU(e) CPU(sparc_env_get_cpu(e)) - -#define ENV_OFFSET offsetof(SPARCCPU, env) - -#ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_sparc_cpu; -#endif - -void sparc_cpu_do_interrupt(CPUState *cpu); -void sparc_cpu_dump_state(CPUState *cpu, FILE *f, - fprintf_function cpu_fprintf, int flags); -hwaddr sparc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); -int sparc_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); -int sparc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); -void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cpu, - vaddr addr, int is_write, - int is_user, uintptr_t retaddr); +typedef struct SPARCCPU SPARCCPU; #endif diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 59ec7ca..0141994 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -3,6 +3,7 @@ #include "qemu-common.h" #include "qemu/bswap.h" +#include "cpu-qom.h" #define ALIGNED_ONLY @@ -506,7 +507,42 @@ struct CPUSPARCState { uint32_t cache_control; }; -#include "cpu-qom.h" +/** + * SPARCCPU: + * @env: #CPUSPARCState + * + * A SPARC CPU. + */ +struct SPARCCPU { + /*< private >*/ + CPUState parent_obj; + /*< public >*/ + + CPUSPARCState env; +}; + +static inline SPARCCPU *sparc_env_get_cpu(CPUSPARCState *env) +{ + return container_of(env, SPARCCPU, env); +} + +#define ENV_GET_CPU(e) CPU(sparc_env_get_cpu(e)) + +#define ENV_OFFSET offsetof(SPARCCPU, env) + +#ifndef CONFIG_USER_ONLY +extern const struct VMStateDescription vmstate_sparc_cpu; +#endif + +void sparc_cpu_do_interrupt(CPUState *cpu); +void sparc_cpu_dump_state(CPUState *cpu, FILE *f, + fprintf_function cpu_fprintf, int flags); +hwaddr sparc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); +int sparc_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); +int sparc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); +void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cpu, + vaddr addr, int is_write, + int is_user, uintptr_t retaddr); #ifndef NO_CPU_IO_DEFS /* cpu_init.c */