From patchwork Thu Apr 12 01:08:42 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: 151957 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 DDBB3B707C for ; Thu, 12 Apr 2012 11:55:55 +1000 (EST) Received: from localhost ([::1]:57102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI8X0-0001Dh-Fb for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 21:09:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI8Ws-0001CO-1N for qemu-devel@nongnu.org; Wed, 11 Apr 2012 21:08:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI8Wo-000151-AN for qemu-devel@nongnu.org; Wed, 11 Apr 2012 21:08:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42247 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI8Wo-00014k-0o for qemu-devel@nongnu.org; Wed, 11 Apr 2012 21:08:50 -0400 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 EE5AC8FD0F; Thu, 12 Apr 2012 03:08:48 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 12 Apr 2012 03:08:42 +0200 Message-Id: <1334192924-18905-2-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1334192924-18905-1-git-send-email-afaerber@suse.de> References: <1334192924-18905-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: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v2 1/3] target-microblaze: QOM'ify CPU 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 Embed CPUMBState as first member of QOM MicroBlazeCPU. Signed-off-by: Andreas Färber --- Makefile.target | 1 + target-microblaze/cpu-qom.h | 71 +++++++++++++++++++++++++++++++++++++++++ target-microblaze/cpu.c | 59 ++++++++++++++++++++++++++++++++++ target-microblaze/cpu.h | 2 + target-microblaze/translate.c | 4 ++- 5 files changed, 136 insertions(+), 1 deletions(-) create mode 100644 target-microblaze/cpu-qom.h create mode 100644 target-microblaze/cpu.c diff --git a/Makefile.target b/Makefile.target index 35a7fcf..ae21f94 100644 --- a/Makefile.target +++ b/Makefile.target @@ -95,6 +95,7 @@ libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o libobj-$(TARGET_ARM) += cpu.o libobj-$(TARGET_CRIS) += cpu.o libobj-$(TARGET_LM32) += cpu.o +libobj-$(TARGET_MICROBLAZE) += cpu.o libobj-$(TARGET_S390X) += cpu.o ifeq ($(TARGET_BASE_ARCH), sparc) libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o diff --git a/target-microblaze/cpu-qom.h b/target-microblaze/cpu-qom.h new file mode 100644 index 0000000..97f6088 --- /dev/null +++ b/target-microblaze/cpu-qom.h @@ -0,0 +1,71 @@ +/* + * QEMU MicroBlaze CPU + * + * Copyright (c) 2012 SUSE LINUX Products GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + */ +#ifndef QEMU_MICROBLAZE_CPU_QOM_H +#define QEMU_MICROBLAZE_CPU_QOM_H + +#include "qemu/cpu.h" +#include "cpu.h" + +#define TYPE_MICROBLAZE_CPU "microblaze-cpu" + +#define MICROBLAZE_CPU_CLASS(klass) \ + OBJECT_CLASS_CHECK(MicroBlazeCPUClass, (klass), TYPE_MICROBLAZE_CPU) +#define MICROBLAZE_CPU(obj) \ + OBJECT_CHECK(MicroBlazeCPU, (obj), TYPE_MICROBLAZE_CPU) +#define MICROBLAZE_CPU_GET_CLASS(obj) \ + OBJECT_GET_CLASS(MicroBlazeCPUClass, (obj), TYPE_MICROBLAZE_CPU) + +/** + * MicroBlazeCPUClass: + * @parent_reset: The parent class' reset handler. + * + * A MicroBlaze CPU model. + */ +typedef struct MicroBlazeCPUClass { + /*< private >*/ + CPUClass parent_class; + /*< public >*/ + + void (*parent_reset)(CPUState *cpu); +} MicroBlazeCPUClass; + +/** + * MicroBlazeCPU: + * @env: #CPUMBState + * + * A MicroBlaze CPU. + */ +typedef struct MicroBlazeCPU { + /*< private >*/ + CPUState parent_obj; + /*< public >*/ + + CPUMBState env; +} MicroBlazeCPU; + +static inline MicroBlazeCPU *mb_env_get_cpu(CPUMBState *env) +{ + return MICROBLAZE_CPU(container_of(env, MicroBlazeCPU, env)); +} + +#define ENV_GET_CPU(e) CPU(mb_env_get_cpu(e)) + + +#endif diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c new file mode 100644 index 0000000..ea646fe --- /dev/null +++ b/target-microblaze/cpu.c @@ -0,0 +1,59 @@ +/* + * QEMU MicroBlaze CPU + * + * Copyright (c) 2012 SUSE LINUX Products GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + */ + +#include "cpu-qom.h" +#include "qemu-common.h" + + +/* CPUClass::reset() */ +static void mb_cpu_reset(CPUState *s) +{ + MicroBlazeCPU *cpu = MICROBLAZE_CPU(s); + MicroBlazeCPUClass *mcc = MICROBLAZE_CPU_GET_CLASS(cpu); + CPUMBState *env = &cpu->env; + + mcc->parent_reset(s); + + cpu_state_reset(env); +} + +static void mb_cpu_class_init(ObjectClass *oc, void *data) +{ + CPUClass *cc = CPU_CLASS(oc); + MicroBlazeCPUClass *mcc = MICROBLAZE_CPU_CLASS(oc); + + mcc->parent_reset = cc->reset; + cc->reset = mb_cpu_reset; +} + +static const TypeInfo mb_cpu_type_info = { + .name = TYPE_MICROBLAZE_CPU, + .parent = TYPE_CPU, + .instance_size = sizeof(MicroBlazeCPU), + .class_size = sizeof(MicroBlazeCPUClass), + .class_init = mb_cpu_class_init, +}; + +static void mb_cpu_register_types(void) +{ + type_register_static(&mb_cpu_type_info); +} + +type_init(mb_cpu_register_types) diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 33b23c2..718d5bb 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -266,6 +266,8 @@ struct CPUMBState { CPU_COMMON }; +#include "cpu-qom.h" + CPUMBState *cpu_mb_init(const char *cpu_model); int cpu_mb_exec(CPUMBState *s); void cpu_mb_close(CPUMBState *s); diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index 64cbfb8..580647e 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -1890,11 +1890,13 @@ void cpu_dump_state (CPUMBState *env, FILE *f, fprintf_function cpu_fprintf, CPUMBState *cpu_mb_init (const char *cpu_model) { + MicroBlazeCPU *cpu; CPUMBState *env; static int tcg_initialized = 0; int i; - env = g_malloc0(sizeof(CPUMBState)); + cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); + env = &cpu->env; cpu_exec_init(env); cpu_state_reset(env);