From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7sOT-0005Kr-Po for qemu-devel@nongnu.org; Wed, 14 Mar 2012 13:54:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7sON-0002cs-2w for qemu-devel@nongnu.org; Wed, 14 Mar 2012 13:53:49 -0400 Received: from cantor2.suse.de ([195.135.220.15]:51010 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7sOM-0002cP-Jr for qemu-devel@nongnu.org; Wed, 14 Mar 2012 13:53:43 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 14 Mar 2012 18:53:27 +0100 Message-Id: <1331747617-7837-4-git-send-email-afaerber@suse.de> In-Reply-To: <1331747617-7837-1-git-send-email-afaerber@suse.de> References: <1330893156-26569-1-git-send-email-afaerber@suse.de> <1331747617-7837-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC 03/12] target-m68k: QOM'ify CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Embed CPUM68KState in M68kCPU. Let cpu_state_reset() call cpu_reset(). Let m68k_cpu_list() enumerate CPU classes alphabetically, except for "any". Signed-off-by: Andreas F=C3=A4rber --- Makefile.target | 1 + target-m68k/cpu-qom.h | 75 +++++++++++++++++++++++ target-m68k/cpu.c | 161 +++++++++++++++++++++++++++++++++++++++++++= ++++++ target-m68k/cpu.h | 1 + target-m68k/helper.c | 158 ++++++++++++++++---------------------------= ----- 5 files changed, 289 insertions(+), 107 deletions(-) create mode 100644 target-m68k/cpu-qom.h create mode 100644 target-m68k/cpu.c diff --git a/Makefile.target b/Makefile.target index 878807b..47854a7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -88,6 +88,7 @@ libobj-$(TARGET_SPARC64) +=3D vis_helper.o libobj-$(CONFIG_NEED_MMU) +=3D mmu.o libobj-$(TARGET_ARM) +=3D neon_helper.o iwmmxt_helper.o libobj-$(TARGET_ARM) +=3D cpu.o +libobj-$(TARGET_M68K) +=3D cpu.o ifeq ($(TARGET_BASE_ARCH), mips) libobj-y +=3D cpu.o endif diff --git a/target-m68k/cpu-qom.h b/target-m68k/cpu-qom.h new file mode 100644 index 0000000..f115ab0 --- /dev/null +++ b/target-m68k/cpu-qom.h @@ -0,0 +1,75 @@ +/* + * QEMU Motorola 68k 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 Library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, see + * + */ +#ifndef QEMU_M68K_CPU_QOM_H +#define QEMU_M68K_CPU_QOM_H + +#include "qemu-common.h" +#include "qemu/cpu.h" +#include "cpu.h" + +#define TYPE_M68K_CPU "m68k-cpu" + +#define M68K_CPU_CLASS(klass) \ + OBJECT_CLASS_CHECK(M68kCPUClass, (klass), TYPE_M68K_CPU) +#define M68K_CPU(obj) \ + OBJECT_CHECK(M68kCPU, (obj), TYPE_M68K_CPU) +#define M68K_CPU_GET_CLASS(obj) \ + OBJECT_GET_CLASS(M68kCPUClass, (obj), TYPE_M68K_CPU) + +/** + * M68kCPUClass: + * @parent_reset: The parent class' reset handler. + * @features: CPU feature flags. + * + * A Motorola 68k CPU model. + */ +typedef struct M68kCPUClass { + /*< private >*/ + CPUClass parent_class; + /*< public >*/ + + void (*parent_reset)(CPUState *cpu); + + uint32_t features; +} M68kCPUClass; + +/** + * M68kCPU: + * @env: Legacy CPU state. + * + * A Motorola 68k CPU. + */ +typedef struct M68kCPU { + /*< private >*/ + CPUState parent_obj; + /*< public >*/ + + CPUM68KState env; +} M68kCPU; + +static inline M68kCPU *m68k_env_get_cpu(CPUM68KState *env) +{ + return M68K_CPU(container_of(env, M68kCPU, env)); +} + +#define ENV_GET_CPU(e) CPU(m68k_env_get_cpu(e)) + + +#endif diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c new file mode 100644 index 0000000..66d7564 --- /dev/null +++ b/target-m68k/cpu.c @@ -0,0 +1,161 @@ +/* + * QEMU Motorola 68k CPU + * + * Copyright (c) 2006-2007 CodeSourcery + * Written by Paul Brook + * + * 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 Library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, see + * + */ + +#include "cpu-qom.h" +#include "qemu-common.h" + +static void m68k_cpu_reset(CPUState *c) +{ + M68kCPU *cpu =3D M68K_CPU(c); + M68kCPUClass *klass =3D M68K_CPU_GET_CLASS(cpu); + CPUM68KState *env =3D &cpu->env; + + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + + klass->parent_reset(c); + + memset(env, 0, offsetof(CPUM68KState, breakpoints)); +#if !defined(CONFIG_USER_ONLY) + env->sr =3D 0x2700; +#endif + m68k_switch_sp(env); + /* ??? FP regs should be initialized to NaN. */ + env->cc_op =3D CC_OP_FLAGS; + /* TODO: We should set PC from the interrupt vector. */ + env->pc =3D 0; + tlb_flush(env, 1); +} + +/* CPU models */ + +typedef struct M68kCPUInfo { + const char *name; + uint32_t features; +} M68kCPUInfo; + +#define M68K_FEATURE(feature) (1u << M68K_FEATURE_ ## feature) + +static const M68kCPUInfo m68k_cpus[] =3D { + { + .name =3D "m5206", + .features =3D M68K_FEATURE(CF_ISA_A), + }, + { + .name =3D "m5208", + .features =3D M68K_FEATURE(CF_ISA_A) | + M68K_FEATURE(CF_ISA_APLUSC) | + M68K_FEATURE(BRAL) | + M68K_FEATURE(CF_EMAC) | + M68K_FEATURE(USP), + }, + { + .name =3D "cfv4e", + .features =3D M68K_FEATURE(CF_ISA_A) | + M68K_FEATURE(CF_ISA_B) | + M68K_FEATURE(BRAL) | + M68K_FEATURE(CF_FPU) | + M68K_FEATURE(CF_EMAC) | + M68K_FEATURE(USP), + }, + { + .name =3D "any", + .features =3D M68K_FEATURE(CF_ISA_A) | + M68K_FEATURE(CF_ISA_APLUSC) | + M68K_FEATURE(CF_ISA_B) | + M68K_FEATURE(BRAL) | + M68K_FEATURE(CF_FPU) | + /* MAC and EMAC are mututally exclusive, so pick EMA= C. + It's mostly backwards compatible. */ + M68K_FEATURE(CF_EMAC) | + M68K_FEATURE(CF_EMAC_B) | + M68K_FEATURE(USP) | + M68K_FEATURE(EXT_FULL) | + M68K_FEATURE(WORD_INDEX), + }, +}; + + +static void m68k_cpu_initfn(Object *obj) +{ + M68kCPU *cpu =3D M68K_CPU(obj); + M68kCPUClass *klass =3D M68K_CPU_GET_CLASS(cpu); + CPUM68KState *env =3D &cpu->env; + + memset(env, 0, sizeof(CPUM68KState)); + cpu_exec_init(env); + + env->cpu_model_str =3D object_get_typename(obj); + env->features =3D klass->features; + + cpu_reset(CPU(cpu)); +} + +static void m68k_cpu_class_init(ObjectClass *klass, void *data) +{ + CPUClass *cpu_class =3D CPU_CLASS(klass); + M68kCPUClass *k =3D M68K_CPU_CLASS(klass); + const M68kCPUInfo *info =3D data; + + k->parent_reset =3D cpu_class->reset; + cpu_class->reset =3D m68k_cpu_reset; + + k->features =3D info->features; +} + +static void cpu_register(const M68kCPUInfo *info) +{ + TypeInfo type =3D { + .name =3D info->name, + .parent =3D TYPE_M68K_CPU, + .instance_size =3D sizeof(M68kCPU), + .instance_init =3D m68k_cpu_initfn, + .class_size =3D sizeof(M68kCPUClass), + .class_init =3D m68k_cpu_class_init, + .class_data =3D (void *)info, + }; + + type_register_static(&type); +} + +static const TypeInfo m68k_cpu_type_info =3D { + .name =3D TYPE_M68K_CPU, + .parent =3D TYPE_CPU, + .instance_size =3D sizeof(M68kCPU), + .abstract =3D true, + .class_size =3D sizeof(M68kCPUClass), +}; + +static void m68k_cpu_register_types(void) +{ + int i; + + type_register_static(&m68k_cpu_type_info); + for (i =3D 0; i < ARRAY_SIZE(m68k_cpus); i++) { + cpu_register(&m68k_cpus[i]); + } +} + +type_init(m68k_cpu_register_types) diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 6696e30..77db787 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -245,6 +245,7 @@ static inline void cpu_clone_regs(CPUM68KState *env, = target_ulong newsp) #endif =20 #include "cpu-all.h" +#include "cpu-qom.h" =20 static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong = *pc, target_ulong *cs_base, int *flag= s) diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 1feed9b..b5f51dd 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -25,35 +25,50 @@ =20 #define SIGNBIT (1u << 31) =20 -enum m68k_cpuid { - M68K_CPUID_M5206, - M68K_CPUID_M5208, - M68K_CPUID_CFV4E, - M68K_CPUID_ANY, -}; +typedef struct M68kCPUListState { + fprintf_function cpu_fprintf; + FILE *file; +} M68kCPUListState; =20 -typedef struct m68k_def_t m68k_def_t; +/* Sort alphabetically, except for "any". */ +static gint m68k_cpu_list_compare(gconstpointer a, gconstpointer b) +{ + ObjectClass *class_a =3D (ObjectClass *)a; + ObjectClass *class_b =3D (ObjectClass *)b; + const char *name_a, *name_b; + + name_a =3D object_class_get_name(class_a); + name_b =3D object_class_get_name(class_b); + if (strcmp(name_a, "any") =3D=3D 0) { + return 1; + } else if (strcmp(name_b, "any") =3D=3D 0) { + return -1; + } else { + return strcasecmp(name_a, name_b); + } +} =20 -struct m68k_def_t { - const char * name; - enum m68k_cpuid id; -}; +static void m68k_cpu_list_entry(gpointer data, gpointer user_data) +{ + ObjectClass *klass =3D data; + M68kCPUListState *s =3D user_data; =20 -static m68k_def_t m68k_cpu_defs[] =3D { - {"m5206", M68K_CPUID_M5206}, - {"m5208", M68K_CPUID_M5208}, - {"cfv4e", M68K_CPUID_CFV4E}, - {"any", M68K_CPUID_ANY}, - {NULL, 0}, -}; + (*s->cpu_fprintf)(s->file, "%s\n", + object_class_get_name(klass)); +} =20 void m68k_cpu_list(FILE *f, fprintf_function cpu_fprintf) { - unsigned int i; + M68kCPUListState s =3D { + .file =3D f, + .cpu_fprintf =3D cpu_fprintf, + }; + GSList *list; =20 - for (i =3D 0; m68k_cpu_defs[i].name; i++) { - (*cpu_fprintf)(f, "%s\n", m68k_cpu_defs[i].name); - } + list =3D object_class_get_list(TYPE_M68K_CPU, false); + list =3D g_slist_sort(list, m68k_cpu_list_compare); + g_slist_foreach(list, m68k_cpu_list_entry, &s); + g_slist_free(list); } =20 static int fpu_gdb_get_reg(CPUM68KState *env, uint8_t *mem_buf, int n) @@ -83,112 +98,41 @@ static int fpu_gdb_set_reg(CPUM68KState *env, uint8_= t *mem_buf, int n) return 0; } =20 -static void m68k_set_feature(CPUM68KState *env, int feature) -{ - env->features |=3D (1u << feature); -} - -static int cpu_m68k_set_model(CPUM68KState *env, const char *name) -{ - m68k_def_t *def; - - for (def =3D m68k_cpu_defs; def->name; def++) { - if (strcmp(def->name, name) =3D=3D 0) - break; - } - if (!def->name) - return -1; - - switch (def->id) { - case M68K_CPUID_M5206: - m68k_set_feature(env, M68K_FEATURE_CF_ISA_A); - break; - case M68K_CPUID_M5208: - m68k_set_feature(env, M68K_FEATURE_CF_ISA_A); - m68k_set_feature(env, M68K_FEATURE_CF_ISA_APLUSC); - m68k_set_feature(env, M68K_FEATURE_BRAL); - m68k_set_feature(env, M68K_FEATURE_CF_EMAC); - m68k_set_feature(env, M68K_FEATURE_USP); - break; - case M68K_CPUID_CFV4E: - m68k_set_feature(env, M68K_FEATURE_CF_ISA_A); - m68k_set_feature(env, M68K_FEATURE_CF_ISA_B); - m68k_set_feature(env, M68K_FEATURE_BRAL); - m68k_set_feature(env, M68K_FEATURE_CF_FPU); - m68k_set_feature(env, M68K_FEATURE_CF_EMAC); - m68k_set_feature(env, M68K_FEATURE_USP); - break; - case M68K_CPUID_ANY: - m68k_set_feature(env, M68K_FEATURE_CF_ISA_A); - m68k_set_feature(env, M68K_FEATURE_CF_ISA_B); - m68k_set_feature(env, M68K_FEATURE_CF_ISA_APLUSC); - m68k_set_feature(env, M68K_FEATURE_BRAL); - m68k_set_feature(env, M68K_FEATURE_CF_FPU); - /* MAC and EMAC are mututally exclusive, so pick EMAC. - It's mostly backwards compatible. */ - m68k_set_feature(env, M68K_FEATURE_CF_EMAC); - m68k_set_feature(env, M68K_FEATURE_CF_EMAC_B); - m68k_set_feature(env, M68K_FEATURE_USP); - m68k_set_feature(env, M68K_FEATURE_EXT_FULL); - m68k_set_feature(env, M68K_FEATURE_WORD_INDEX); - break; - } - - register_m68k_insns(env); - if (m68k_feature (env, M68K_FEATURE_CF_FPU)) { - gdb_register_coprocessor(env, fpu_gdb_get_reg, fpu_gdb_set_reg, - 11, "cf-fp.xml", 18); - } - /* TODO: Add [E]MAC registers. */ - return 0; -} - void cpu_state_reset(CPUM68KState *env) { - if (qemu_loglevel_mask(CPU_LOG_RESET)) { - qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); - log_cpu_state(env, 0); - } - - memset(env, 0, offsetof(CPUM68KState, breakpoints)); -#if !defined (CONFIG_USER_ONLY) - env->sr =3D 0x2700; -#endif - m68k_switch_sp(env); - /* ??? FP regs should be initialized to NaN. */ - env->cc_op =3D CC_OP_FLAGS; - /* TODO: We should set PC from the interrupt vector. */ - env->pc =3D 0; - tlb_flush(env, 1); + cpu_reset(ENV_GET_CPU(env)); } =20 CPUM68KState *cpu_m68k_init(const char *cpu_model) { + M68kCPU *cpu; CPUM68KState *env; static int inited; =20 - env =3D g_malloc0(sizeof(CPUM68KState)); - cpu_exec_init(env); + if (object_class_by_name(cpu_model) =3D=3D NULL) { + return NULL; + } + cpu =3D M68K_CPU(object_new(cpu_model)); + env =3D &cpu->env; + if (!inited) { inited =3D 1; m68k_tcg_init(); } - - env->cpu_model_str =3D cpu_model; - - if (cpu_m68k_set_model(env, cpu_model) < 0) { - cpu_m68k_close(env); - return NULL; + register_m68k_insns(env); + if (m68k_feature(env, M68K_FEATURE_CF_FPU)) { + gdb_register_coprocessor(env, fpu_gdb_get_reg, fpu_gdb_set_reg, + 11, "cf-fp.xml", 18); } + /* TODO: Add [E]MAC registers. */ =20 - cpu_state_reset(env); qemu_init_vcpu(env); return env; } =20 void cpu_m68k_close(CPUM68KState *env) { - g_free(env); + object_delete(OBJECT(m68k_env_get_cpu(env))); } =20 void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op) --=20 1.7.7