target-cris: QOM'ify CPU
Embed CPUCRISState as first member of QOM CRISCPU. Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
092dfc7714
commit
e739a48e58
|
@ -94,6 +94,7 @@ libobj-$(TARGET_SPARC64) += vis_helper.o
|
||||||
libobj-$(CONFIG_NEED_MMU) += mmu.o
|
libobj-$(CONFIG_NEED_MMU) += mmu.o
|
||||||
libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
|
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_LM32) += cpu.o
|
libobj-$(TARGET_LM32) += cpu.o
|
||||||
libobj-$(TARGET_S390X) += cpu.o
|
libobj-$(TARGET_S390X) += cpu.o
|
||||||
ifeq ($(TARGET_BASE_ARCH), sparc)
|
ifeq ($(TARGET_BASE_ARCH), sparc)
|
||||||
|
|
70
target-cris/cpu-qom.h
Normal file
70
target-cris/cpu-qom.h
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
/*
|
||||||
|
* 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
|
||||||
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
||||||
|
*/
|
||||||
|
#ifndef QEMU_CRIS_CPU_QOM_H
|
||||||
|
#define QEMU_CRIS_CPU_QOM_H
|
||||||
|
|
||||||
|
#include "qemu/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
|
60
target-cris/cpu.c
Normal file
60
target-cris/cpu.c
Normal file
|
@ -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
|
||||||
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "cpu.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)
|
|
@ -169,6 +169,8 @@ typedef struct CPUCRISState {
|
||||||
void *load_info;
|
void *load_info;
|
||||||
} CPUCRISState;
|
} CPUCRISState;
|
||||||
|
|
||||||
|
#include "cpu-qom.h"
|
||||||
|
|
||||||
CPUCRISState *cpu_cris_init(const char *cpu_model);
|
CPUCRISState *cpu_cris_init(const char *cpu_model);
|
||||||
int cpu_cris_exec(CPUCRISState *s);
|
int cpu_cris_exec(CPUCRISState *s);
|
||||||
void cpu_cris_close(CPUCRISState *s);
|
void cpu_cris_close(CPUCRISState *s);
|
||||||
|
|
|
@ -3505,11 +3505,13 @@ static uint32_t vr_by_name(const char *name)
|
||||||
|
|
||||||
CPUCRISState *cpu_cris_init (const char *cpu_model)
|
CPUCRISState *cpu_cris_init (const char *cpu_model)
|
||||||
{
|
{
|
||||||
|
CRISCPU *cpu;
|
||||||
CPUCRISState *env;
|
CPUCRISState *env;
|
||||||
static int tcg_initialized = 0;
|
static int tcg_initialized = 0;
|
||||||
int i;
|
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);
|
env->pregs[PR_VR] = vr_by_name(cpu_model);
|
||||||
cpu_exec_init(env);
|
cpu_exec_init(env);
|
||||||
|
|
Loading…
Reference in a new issue