mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
target-microblaze: QOM'ify CPU
Embed CPUMBState as first member of QOM MicroBlazeCPU. Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber <afaerber@suse.de> Tested-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> [AF: Updated cpu.c to include cpu-qom.h indirectly via cpu.h]
This commit is contained in:
parent
aa0d1267b3
commit
b77f98cada
|
@ -96,6 +96,7 @@ 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_MICROBLAZE) += cpu.o
|
||||
libobj-$(TARGET_S390X) += cpu.o
|
||||
ifeq ($(TARGET_BASE_ARCH), sparc)
|
||||
libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
|
||||
|
|
70
target-microblaze/cpu-qom.h
Normal file
70
target-microblaze/cpu-qom.h
Normal file
|
@ -0,0 +1,70 @@
|
|||
/*
|
||||
* QEMU MicroBlaze 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_MICROBLAZE_CPU_QOM_H
|
||||
#define QEMU_MICROBLAZE_CPU_QOM_H
|
||||
|
||||
#include "qemu/cpu.h"
|
||||
|
||||
#define TYPE_MICROBLAZE_CPU "microblaze-cpu"
|
||||
|
||||
#define MICROBLAZE_CPU_CLASS(klass) \
|
||||
OBJECT_CLASS_CHECK(MicroBlazeCPUClass, (klass), TYPE_MICROBLAZE_CPU)
|
||||
#define MICROBLAZE_CPU(obj) \
|
||||
OBJECT_CHECK(MicroBlazeCPU, (obj), TYPE_MICROBLAZE_CPU)
|
||||
#define MICROBLAZE_CPU_GET_CLASS(obj) \
|
||||
OBJECT_GET_CLASS(MicroBlazeCPUClass, (obj), TYPE_MICROBLAZE_CPU)
|
||||
|
||||
/**
|
||||
* MicroBlazeCPUClass:
|
||||
* @parent_reset: The parent class' reset handler.
|
||||
*
|
||||
* A MicroBlaze CPU model.
|
||||
*/
|
||||
typedef struct MicroBlazeCPUClass {
|
||||
/*< private >*/
|
||||
CPUClass parent_class;
|
||||
/*< public >*/
|
||||
|
||||
void (*parent_reset)(CPUState *cpu);
|
||||
} MicroBlazeCPUClass;
|
||||
|
||||
/**
|
||||
* MicroBlazeCPU:
|
||||
* @env: #CPUMBState
|
||||
*
|
||||
* A MicroBlaze CPU.
|
||||
*/
|
||||
typedef struct MicroBlazeCPU {
|
||||
/*< private >*/
|
||||
CPUState parent_obj;
|
||||
/*< public >*/
|
||||
|
||||
CPUMBState env;
|
||||
} MicroBlazeCPU;
|
||||
|
||||
static inline MicroBlazeCPU *mb_env_get_cpu(CPUMBState *env)
|
||||
{
|
||||
return MICROBLAZE_CPU(container_of(env, MicroBlazeCPU, env));
|
||||
}
|
||||
|
||||
#define ENV_GET_CPU(e) CPU(mb_env_get_cpu(e))
|
||||
|
||||
|
||||
#endif
|
59
target-microblaze/cpu.c
Normal file
59
target-microblaze/cpu.c
Normal file
|
@ -0,0 +1,59 @@
|
|||
/*
|
||||
* QEMU MicroBlaze 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 mb_cpu_reset(CPUState *s)
|
||||
{
|
||||
MicroBlazeCPU *cpu = MICROBLAZE_CPU(s);
|
||||
MicroBlazeCPUClass *mcc = MICROBLAZE_CPU_GET_CLASS(cpu);
|
||||
CPUMBState *env = &cpu->env;
|
||||
|
||||
mcc->parent_reset(s);
|
||||
|
||||
cpu_state_reset(env);
|
||||
}
|
||||
|
||||
static void mb_cpu_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
CPUClass *cc = CPU_CLASS(oc);
|
||||
MicroBlazeCPUClass *mcc = MICROBLAZE_CPU_CLASS(oc);
|
||||
|
||||
mcc->parent_reset = cc->reset;
|
||||
cc->reset = mb_cpu_reset;
|
||||
}
|
||||
|
||||
static const TypeInfo mb_cpu_type_info = {
|
||||
.name = TYPE_MICROBLAZE_CPU,
|
||||
.parent = TYPE_CPU,
|
||||
.instance_size = sizeof(MicroBlazeCPU),
|
||||
.class_size = sizeof(MicroBlazeCPUClass),
|
||||
.class_init = mb_cpu_class_init,
|
||||
};
|
||||
|
||||
static void mb_cpu_register_types(void)
|
||||
{
|
||||
type_register_static(&mb_cpu_type_info);
|
||||
}
|
||||
|
||||
type_init(mb_cpu_register_types)
|
|
@ -266,6 +266,8 @@ struct CPUMBState {
|
|||
CPU_COMMON
|
||||
};
|
||||
|
||||
#include "cpu-qom.h"
|
||||
|
||||
CPUMBState *cpu_mb_init(const char *cpu_model);
|
||||
int cpu_mb_exec(CPUMBState *s);
|
||||
void cpu_mb_close(CPUMBState *s);
|
||||
|
|
|
@ -1891,11 +1891,13 @@ void cpu_dump_state (CPUMBState *env, FILE *f, fprintf_function cpu_fprintf,
|
|||
|
||||
CPUMBState *cpu_mb_init (const char *cpu_model)
|
||||
{
|
||||
MicroBlazeCPU *cpu;
|
||||
CPUMBState *env;
|
||||
static int tcg_initialized = 0;
|
||||
int i;
|
||||
|
||||
env = g_malloc0(sizeof(CPUMBState));
|
||||
cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU));
|
||||
env = &cpu->env;
|
||||
|
||||
cpu_exec_init(env);
|
||||
cpu_state_reset(env);
|
||||
|
|
Loading…
Reference in a new issue