target-m68k: QOM'ify CPU
Embed CPUM68KState as first member of QOM M68kCPU. Drop cpu_m68k_close() in favor of object_delete(). Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Laurent Vivier <Laurent@Vivier.EU> Tested-by: Laurent Vivier <Laurent@Vivier.EU>
This commit is contained in:
parent
2b4b490656
commit
b9e7a23434
|
@ -96,6 +96,7 @@ libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
|
||||||
libobj-$(TARGET_ARM) += cpu.o
|
libobj-$(TARGET_ARM) += cpu.o
|
||||||
libobj-$(TARGET_CRIS) += cpu.o
|
libobj-$(TARGET_CRIS) += cpu.o
|
||||||
libobj-$(TARGET_LM32) += cpu.o
|
libobj-$(TARGET_LM32) += cpu.o
|
||||||
|
libobj-$(TARGET_M68K) += cpu.o
|
||||||
libobj-$(TARGET_MICROBLAZE) += cpu.o
|
libobj-$(TARGET_MICROBLAZE) += cpu.o
|
||||||
libobj-$(TARGET_S390X) += cpu.o
|
libobj-$(TARGET_S390X) += cpu.o
|
||||||
libobj-$(TARGET_SH4) += cpu.o
|
libobj-$(TARGET_SH4) += cpu.o
|
||||||
|
|
70
target-m68k/cpu-qom.h
Normal file
70
target-m68k/cpu-qom.h
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
/*
|
||||||
|
* 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 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
|
||||||
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
||||||
|
*/
|
||||||
|
#ifndef QEMU_M68K_CPU_QOM_H
|
||||||
|
#define QEMU_M68K_CPU_QOM_H
|
||||||
|
|
||||||
|
#include "qemu/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.
|
||||||
|
*
|
||||||
|
* A Motorola 68k CPU model.
|
||||||
|
*/
|
||||||
|
typedef struct M68kCPUClass {
|
||||||
|
/*< private >*/
|
||||||
|
CPUClass parent_class;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
|
void (*parent_reset)(CPUState *cpu);
|
||||||
|
} M68kCPUClass;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* M68kCPU:
|
||||||
|
* @env: #CPUM68KState
|
||||||
|
*
|
||||||
|
* 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
|
60
target-m68k/cpu.c
Normal file
60
target-m68k/cpu.c
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
/*
|
||||||
|
* 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 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
|
||||||
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "cpu.h"
|
||||||
|
#include "qemu-common.h"
|
||||||
|
|
||||||
|
|
||||||
|
/* CPUClass::reset() */
|
||||||
|
static void m68k_cpu_reset(CPUState *s)
|
||||||
|
{
|
||||||
|
M68kCPU *cpu = M68K_CPU(s);
|
||||||
|
M68kCPUClass *mcc = M68K_CPU_GET_CLASS(cpu);
|
||||||
|
CPUM68KState *env = &cpu->env;
|
||||||
|
|
||||||
|
mcc->parent_reset(s);
|
||||||
|
|
||||||
|
cpu_state_reset(env);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void m68k_cpu_class_init(ObjectClass *c, void *data)
|
||||||
|
{
|
||||||
|
M68kCPUClass *mcc = M68K_CPU_CLASS(c);
|
||||||
|
CPUClass *cc = CPU_CLASS(c);
|
||||||
|
|
||||||
|
mcc->parent_reset = cc->reset;
|
||||||
|
cc->reset = m68k_cpu_reset;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const TypeInfo m68k_cpu_type_info = {
|
||||||
|
.name = TYPE_M68K_CPU,
|
||||||
|
.parent = TYPE_CPU,
|
||||||
|
.instance_size = sizeof(M68kCPU),
|
||||||
|
.abstract = false,
|
||||||
|
.class_size = sizeof(M68kCPUClass),
|
||||||
|
.class_init = m68k_cpu_class_init,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void m68k_cpu_register_types(void)
|
||||||
|
{
|
||||||
|
type_register_static(&m68k_cpu_type_info);
|
||||||
|
}
|
||||||
|
|
||||||
|
type_init(m68k_cpu_register_types)
|
|
@ -116,10 +116,11 @@ typedef struct CPUM68KState {
|
||||||
uint32_t features;
|
uint32_t features;
|
||||||
} CPUM68KState;
|
} CPUM68KState;
|
||||||
|
|
||||||
|
#include "cpu-qom.h"
|
||||||
|
|
||||||
void m68k_tcg_init(void);
|
void m68k_tcg_init(void);
|
||||||
CPUM68KState *cpu_m68k_init(const char *cpu_model);
|
CPUM68KState *cpu_m68k_init(const char *cpu_model);
|
||||||
int cpu_m68k_exec(CPUM68KState *s);
|
int cpu_m68k_exec(CPUM68KState *s);
|
||||||
void cpu_m68k_close(CPUM68KState *s);
|
|
||||||
void do_interrupt(CPUM68KState *env1);
|
void do_interrupt(CPUM68KState *env1);
|
||||||
void do_interrupt_m68k_hardirq(CPUM68KState *env1);
|
void do_interrupt_m68k_hardirq(CPUM68KState *env1);
|
||||||
/* you can call this signal handler from your SIGBUS and SIGSEGV
|
/* you can call this signal handler from your SIGBUS and SIGSEGV
|
||||||
|
|
|
@ -164,10 +164,12 @@ void cpu_state_reset(CPUM68KState *env)
|
||||||
|
|
||||||
CPUM68KState *cpu_m68k_init(const char *cpu_model)
|
CPUM68KState *cpu_m68k_init(const char *cpu_model)
|
||||||
{
|
{
|
||||||
|
M68kCPU *cpu;
|
||||||
CPUM68KState *env;
|
CPUM68KState *env;
|
||||||
static int inited;
|
static int inited;
|
||||||
|
|
||||||
env = g_malloc0(sizeof(CPUM68KState));
|
cpu = M68K_CPU(object_new(TYPE_M68K_CPU));
|
||||||
|
env = &cpu->env;
|
||||||
cpu_exec_init(env);
|
cpu_exec_init(env);
|
||||||
if (!inited) {
|
if (!inited) {
|
||||||
inited = 1;
|
inited = 1;
|
||||||
|
@ -177,7 +179,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model)
|
||||||
env->cpu_model_str = cpu_model;
|
env->cpu_model_str = cpu_model;
|
||||||
|
|
||||||
if (cpu_m68k_set_model(env, cpu_model) < 0) {
|
if (cpu_m68k_set_model(env, cpu_model) < 0) {
|
||||||
cpu_m68k_close(env);
|
object_delete(OBJECT(cpu));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -186,11 +188,6 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model)
|
||||||
return env;
|
return env;
|
||||||
}
|
}
|
||||||
|
|
||||||
void cpu_m68k_close(CPUM68KState *env)
|
|
||||||
{
|
|
||||||
g_free(env);
|
|
||||||
}
|
|
||||||
|
|
||||||
void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op)
|
void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op)
|
||||||
{
|
{
|
||||||
int flags;
|
int flags;
|
||||||
|
|
Loading…
Reference in a new issue