From patchwork Thu May 19 11:18:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9127061 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 CAEC19F37F for ; Thu, 19 May 2016 11:49:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14DB620218 for ; Thu, 19 May 2016 11:49:44 +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 5396C20212 for ; Thu, 19 May 2016 11:49:43 +0000 (UTC) Received: from localhost ([::1]:49834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3MSU-0006EW-Dp for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 07:49:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyy-0004C3-Fz for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Lyo-00044U-Em for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:11 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyo-00044K-48 for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:02 -0400 Received: by mail-wm0-x241.google.com with SMTP id r12so20127041wme.0 for ; Thu, 19 May 2016 04:19:02 -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=SCcndGHlWeABakz/W649OrlM67NdojTRMaL4TJ581oQ=; b=0aZ/5qYCBNG0KgvQyogUrAwnm15UzvMAUvvDijOfyfcRI+WfgzMuFKJX6kVAWatcrB NlM2EFe/AihtKzOkkfktY8ZeEGOu4VnyL2bIqdaHRyUVGKE7L9A+eDQCrPbNFty6rdTJ o0TtAqft+rdKSUCwYm1HF8ysPcM8Xum55OSegNbeKgOZwTpa8PhZFHtqSG83gOqbNjqp k44qA5W4IYHsydTTEH6zRTXEX5gHIEN2moQ8IFnX0nVVYmBtrEuyri3q3N6vPLhzsa2U mu49sglVUWJVJza5Tqib9XarM3GU5yg53166Ah/VgHhNWcnCZ3pTq28c/UfavuVTuT0g X7vg== 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=SCcndGHlWeABakz/W649OrlM67NdojTRMaL4TJ581oQ=; b=UzuCjG/sPo+kSrU0adcz7x9btjVehmTIgmy1O6gZc0WgWEX2LJwDH7QHhNlKg0QbNn 5Gxfam/Gr8muocFk4u7IoAImd28UESYBsomGRMMv6RxLKdYRu6Z2DOQHJsd37A2FV5+7 kIt0OB0cf9xVfQAFCKrxEmVqZGp8qMFeBxqrT26Y5kalVZDKSLrrEOL/T0200mAqko4p 22+PBNp4doOAnAAD2iokUaonF0g4wZgL208cBeRVRjG15v/vEqEpekBrPbfvHLCnuzNF V+1cDLDuBtTWEUzn/LWS0rFZycR3NkyMZhbe3k2H4p4SU7om7GuSOhzVRx0jOn+3pc46 r/Fg== X-Gm-Message-State: AOPr4FVwrQZNkvTYu7btY9e1U5RX+Mwshpq7/Jh+fuSFPnOHLcFtsKc+wDhMA9NEZ9qnkQ== X-Received: by 10.194.242.198 with SMTP id ws6mr13268747wjc.96.1463656741589; Thu, 19 May 2016 04:19:01 -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.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:19:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 13:18:06 +0200 Message-Id: <1463656726-35952-13-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::241 Subject: [Qemu-devel] [PULL 12/52] target-microblaze: 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 MicroBlazeCPU 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-microblaze/cpu-qom.h | 44 +------------------------------------------- target-microblaze/cpu.h | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/target-microblaze/cpu-qom.h b/target-microblaze/cpu-qom.h index 34f6273..1a61db7 100644 --- a/target-microblaze/cpu-qom.h +++ b/target-microblaze/cpu-qom.h @@ -47,48 +47,6 @@ typedef struct MicroBlazeCPUClass { void (*parent_reset)(CPUState *cpu); } MicroBlazeCPUClass; -/** - * MicroBlazeCPU: - * @env: #CPUMBState - * - * A MicroBlaze CPU. - */ -typedef struct MicroBlazeCPU { - /*< private >*/ - CPUState parent_obj; - - /*< public >*/ - - /* Microblaze Configuration Settings */ - struct { - bool stackprot; - uint32_t base_vectors; - uint8_t use_fpu; - bool use_mmu; - bool dcache_writeback; - bool endi; - char *version; - uint8_t pvr; - } cfg; - - CPUMBState env; -} MicroBlazeCPU; - -static inline MicroBlazeCPU *mb_env_get_cpu(CPUMBState *env) -{ - return container_of(env, MicroBlazeCPU, env); -} - -#define ENV_GET_CPU(e) CPU(mb_env_get_cpu(e)) - -#define ENV_OFFSET offsetof(MicroBlazeCPU, env) - -void mb_cpu_do_interrupt(CPUState *cs); -bool mb_cpu_exec_interrupt(CPUState *cs, int int_req); -void mb_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, - int flags); -hwaddr mb_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); -int mb_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); -int mb_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); +typedef struct MicroBlazeCPU MicroBlazeCPU; #endif diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index bf74e2c..98d9c4f 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -20,6 +20,7 @@ #define CPU_MICROBLAZE_H #include "qemu-common.h" +#include "cpu-qom.h" #define TARGET_LONG_BITS 32 @@ -274,7 +275,49 @@ struct CPUMBState { } pvr; }; -#include "cpu-qom.h" +/** + * MicroBlazeCPU: + * @env: #CPUMBState + * + * A MicroBlaze CPU. + */ +struct MicroBlazeCPU { + /*< private >*/ + CPUState parent_obj; + + /*< public >*/ + + /* Microblaze Configuration Settings */ + struct { + bool stackprot; + uint32_t base_vectors; + uint8_t use_fpu; + bool use_mmu; + bool dcache_writeback; + bool endi; + char *version; + uint8_t pvr; + } cfg; + + CPUMBState env; +}; + +static inline MicroBlazeCPU *mb_env_get_cpu(CPUMBState *env) +{ + return container_of(env, MicroBlazeCPU, env); +} + +#define ENV_GET_CPU(e) CPU(mb_env_get_cpu(e)) + +#define ENV_OFFSET offsetof(MicroBlazeCPU, env) + +void mb_cpu_do_interrupt(CPUState *cs); +bool mb_cpu_exec_interrupt(CPUState *cs, int int_req); +void mb_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, + int flags); +hwaddr mb_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); +int mb_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); +int mb_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void mb_tcg_init(void); MicroBlazeCPU *cpu_mb_init(const char *cpu_model);