From patchwork Wed Apr 11 23:00:08 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: 151921 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 529E4B707E for ; Thu, 12 Apr 2012 09:01:14 +1000 (EST) Received: from localhost ([::1]:49789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI6XI-0000st-7z for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 19:01:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI6WS-0006x7-QQ for qemu-devel@nongnu.org; Wed, 11 Apr 2012 19:00:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI6WP-0003FT-FC for qemu-devel@nongnu.org; Wed, 11 Apr 2012 19:00:20 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36974 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI6WP-0003F7-6k for qemu-devel@nongnu.org; Wed, 11 Apr 2012 19:00:17 -0400 Received: from relay1.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 017458FFEB; Thu, 12 Apr 2012 01:00:16 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Thu, 12 Apr 2012 01:00:08 +0200 Message-Id: <1334185210-9934-2-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1334185210-9934-1-git-send-email-afaerber@suse.de> References: <1334185210-9934-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-cris: 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 CPUCRISState as first member of QOM CRISCPU. Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber --- Makefile.target | 1 + target-cris/cpu-qom.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++ target-cris/cpu.c | 60 +++++++++++++++++++++++++++++++++++++++ target-cris/cpu.h | 2 + target-cris/translate.c | 4 ++- 5 files changed, 137 insertions(+), 1 deletions(-) create mode 100644 target-cris/cpu-qom.h create mode 100644 target-cris/cpu.c diff --git a/Makefile.target b/Makefile.target index b82ebd0..35a7fcf 100644 --- a/Makefile.target +++ b/Makefile.target @@ -93,6 +93,7 @@ libobj-$(TARGET_SPARC64) += vis_helper.o libobj-$(CONFIG_NEED_MMU) += mmu.o 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_S390X) += cpu.o ifeq ($(TARGET_BASE_ARCH), sparc) diff --git a/target-cris/cpu-qom.h b/target-cris/cpu-qom.h new file mode 100644 index 0000000..e7dff11 --- /dev/null +++ b/target-cris/cpu-qom.h @@ -0,0 +1,71 @@ +/* + * QEMU CRIS 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_CRIS_CPU_QOM_H +#define QEMU_CRIS_CPU_QOM_H + +#include "qemu/cpu.h" +#include "cpu.h" + +#define TYPE_CRIS_CPU "cris-cpu" + +#define CRIS_CPU_CLASS(klass) \ + OBJECT_CLASS_CHECK(CRISCPUClass, (klass), TYPE_CRIS_CPU) +#define CRIS_CPU(obj) \ + OBJECT_CHECK(CRISCPU, (obj), TYPE_CRIS_CPU) +#define CRIS_CPU_GET_CLASS(obj) \ + OBJECT_GET_CLASS(CRISCPUClass, (obj), TYPE_CRIS_CPU) + +/** + * CRISCPUClass: + * @parent_reset: The parent class' reset handler. + * + * A CRIS CPU model. + */ +typedef struct CRISCPUClass { + /*< private >*/ + CPUClass parent_class; + /*< public >*/ + + void (*parent_reset)(CPUState *cpu); +} CRISCPUClass; + +/** + * CRISCPU: + * @env: #CPUCRISState + * + * A CRIS CPU. + */ +typedef struct CRISCPU { + /*< private >*/ + CPUState parent_obj; + /*< public >*/ + + CPUCRISState env; +} CRISCPU; + +static inline CRISCPU *cris_env_get_cpu(CPUCRISState *env) +{ + return CRIS_CPU(container_of(env, CRISCPU, env)); +} + +#define ENV_GET_CPU(e) CPU(cris_env_get_cpu(e)) + + +#endif diff --git a/target-cris/cpu.c b/target-cris/cpu.c new file mode 100644 index 0000000..e45a17f --- /dev/null +++ b/target-cris/cpu.c @@ -0,0 +1,60 @@ +/* + * QEMU CRIS 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 cris_cpu_reset(CPUState *s) +{ + CRISCPU *cpu = CRIS_CPU(s); + CRISCPUClass *ccc = CRIS_CPU_GET_CLASS(cpu); + CPUCRISState *env = &cpu->env; + + ccc->parent_reset(s); + + cpu_state_reset(env); +} + +static void cris_cpu_class_init(ObjectClass *oc, void *data) +{ + CPUClass *cc = CPU_CLASS(oc); + CRISCPUClass *ccc = CRIS_CPU_CLASS(oc); + + ccc->parent_reset = cc->reset; + cc->reset = cris_cpu_reset; +} + +static const TypeInfo cris_cpu_type_info = { + .name = TYPE_CRIS_CPU, + .parent = TYPE_CPU, + .instance_size = sizeof(CRISCPU), + .abstract = false, + .class_size = sizeof(CRISCPUClass), + .class_init = cris_cpu_class_init, +}; + +static void cris_cpu_register_types(void) +{ + type_register_static(&cris_cpu_type_info); +} + +type_init(cris_cpu_register_types) diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 31899c2..5449cc4 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -169,6 +169,8 @@ typedef struct CPUCRISState { void *load_info; } CPUCRISState; +#include "cpu-qom.h" + CPUCRISState *cpu_cris_init(const char *cpu_model); int cpu_cris_exec(CPUCRISState *s); void cpu_cris_close(CPUCRISState *s); diff --git a/target-cris/translate.c b/target-cris/translate.c index 7224f46..26c3f0b 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3505,11 +3505,13 @@ static uint32_t vr_by_name(const char *name) CPUCRISState *cpu_cris_init (const char *cpu_model) { + CRISCPU *cpu; CPUCRISState *env; static int tcg_initialized = 0; int i; - env = g_malloc0(sizeof(CPUCRISState)); + cpu = CRIS_CPU(object_new(TYPE_CRIS_CPU)); + env = &cpu->env; env->pregs[PR_VR] = vr_by_name(cpu_model); cpu_exec_init(env);