target-xtensa: QOM'ify CPU
Embed CPUXtensaState as first member of XtensaCPU. Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Andreas Färber
Max Filippov
parent
7d6b9f0a38
commit
a4633e16d7
@ -102,6 +102,7 @@ endif
|
||||
libobj-$(TARGET_SPARC) += int32_helper.o
|
||||
libobj-$(TARGET_SPARC64) += int64_helper.o
|
||||
libobj-$(TARGET_UNICORE32) += cpu.o
|
||||
libobj-$(TARGET_XTENSA) += cpu.o
|
||||
libobj-$(TARGET_ALPHA) += int_helper.o fpu_helper.o sys_helper.o mem_helper.o
|
||||
|
||||
libobj-y += disas.o
|
||||
|
||||
80
target-xtensa/cpu-qom.h
Normal file
80
target-xtensa/cpu-qom.h
Normal file
@ -0,0 +1,80 @@
|
||||
/*
|
||||
* QEMU Xtensa CPU
|
||||
*
|
||||
* Copyright (c) 2012 SUSE LINUX Products GmbH
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the Open Source and Linux Lab nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef QEMU_XTENSA_CPU_QOM_H
|
||||
#define QEMU_XTENSA_CPU_QOM_H
|
||||
|
||||
#include "qemu/cpu.h"
|
||||
#include "cpu.h"
|
||||
|
||||
#define TYPE_XTENSA_CPU "xtensa-cpu"
|
||||
|
||||
#define XTENSA_CPU_CLASS(class) \
|
||||
OBJECT_CLASS_CHECK(XtensaCPUClass, (class), TYPE_XTENSA_CPU)
|
||||
#define XTENSA_CPU(obj) \
|
||||
OBJECT_CHECK(XtensaCPU, (obj), TYPE_XTENSA_CPU)
|
||||
#define XTENSA_CPU_GET_CLASS(obj) \
|
||||
OBJECT_GET_CLASS(XtensaCPUClass, (obj), TYPE_XTENSA_CPU)
|
||||
|
||||
/**
|
||||
* XtensaCPUClass:
|
||||
* @parent_reset: The parent class' reset handler.
|
||||
*
|
||||
* An Xtensa CPU model.
|
||||
*/
|
||||
typedef struct XtensaCPUClass {
|
||||
/*< private >*/
|
||||
CPUClass parent_class;
|
||||
/*< public >*/
|
||||
|
||||
void (*parent_reset)(CPUState *cpu);
|
||||
} XtensaCPUClass;
|
||||
|
||||
/**
|
||||
* XtensaCPU:
|
||||
* @env: #CPUXtensaState
|
||||
*
|
||||
* An Xtensa CPU.
|
||||
*/
|
||||
typedef struct XtensaCPU {
|
||||
/*< private >*/
|
||||
CPUState parent_obj;
|
||||
/*< public >*/
|
||||
|
||||
CPUXtensaState env;
|
||||
} XtensaCPU;
|
||||
|
||||
static inline XtensaCPU *xtensa_env_get_cpu(const CPUXtensaState *env)
|
||||
{
|
||||
return XTENSA_CPU(container_of(env, XtensaCPU, env));
|
||||
}
|
||||
|
||||
#define ENV_GET_CPU(e) CPU(xtensa_env_get_cpu(e))
|
||||
|
||||
|
||||
#endif
|
||||
69
target-xtensa/cpu.c
Normal file
69
target-xtensa/cpu.c
Normal file
@ -0,0 +1,69 @@
|
||||
/*
|
||||
* QEMU Xtensa CPU
|
||||
*
|
||||
* Copyright (c) 2012 SUSE LINUX Products GmbH
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the Open Source and Linux Lab nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "cpu-qom.h"
|
||||
#include "qemu-common.h"
|
||||
|
||||
|
||||
/* CPUClass::reset() */
|
||||
static void xtensa_cpu_reset(CPUState *s)
|
||||
{
|
||||
XtensaCPU *cpu = XTENSA_CPU(s);
|
||||
XtensaCPUClass *xcc = XTENSA_CPU_GET_CLASS(cpu);
|
||||
CPUXtensaState *env = &cpu->env;
|
||||
|
||||
xcc->parent_reset(s);
|
||||
|
||||
cpu_state_reset(env);
|
||||
}
|
||||
|
||||
static void xtensa_cpu_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
CPUClass *cc = CPU_CLASS(oc);
|
||||
XtensaCPUClass *xcc = XTENSA_CPU_CLASS(cc);
|
||||
|
||||
xcc->parent_reset = cc->reset;
|
||||
cc->reset = xtensa_cpu_reset;
|
||||
}
|
||||
|
||||
static const TypeInfo xtensa_cpu_type_info = {
|
||||
.name = TYPE_XTENSA_CPU,
|
||||
.parent = TYPE_CPU,
|
||||
.instance_size = sizeof(XtensaCPU),
|
||||
.abstract = false,
|
||||
.class_size = sizeof(XtensaCPUClass),
|
||||
.class_init = xtensa_cpu_class_init,
|
||||
};
|
||||
|
||||
static void xtensa_cpu_register_types(void)
|
||||
{
|
||||
type_register_static(&xtensa_cpu_type_info);
|
||||
}
|
||||
|
||||
type_init(xtensa_cpu_register_types)
|
||||
@ -470,6 +470,7 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc,
|
||||
}
|
||||
|
||||
#include "cpu-all.h"
|
||||
#include "cpu-qom.h"
|
||||
#include "exec-all.h"
|
||||
|
||||
static inline int cpu_has_work(CPUXtensaState *env)
|
||||
|
||||
@ -95,6 +95,7 @@ CPUXtensaState *cpu_xtensa_init(const char *cpu_model)
|
||||
{
|
||||
static int tcg_inited;
|
||||
static int debug_handler_inited;
|
||||
XtensaCPU *cpu;
|
||||
CPUXtensaState *env;
|
||||
const XtensaConfig *config = NULL;
|
||||
XtensaConfigList *core = xtensa_cores;
|
||||
@ -109,7 +110,8 @@ CPUXtensaState *cpu_xtensa_init(const char *cpu_model)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
env = g_malloc0(sizeof(*env));
|
||||
cpu = XTENSA_CPU(object_new(TYPE_XTENSA_CPU));
|
||||
env = &cpu->env;
|
||||
env->config = config;
|
||||
cpu_exec_init(env);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user