Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Embed CPUMIPSState as first member of QOM MIPSCPU. Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber <afaerber@suse.de>
- Loading branch information
Showing
5 changed files
with
142 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/* | ||
* QEMU MIPS 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_MIPS_CPU_QOM_H | ||
#define QEMU_MIPS_CPU_QOM_H | ||
|
||
#include "qemu/cpu.h" | ||
|
||
#ifdef TARGET_MIPS64 | ||
#define TYPE_MIPS_CPU "mips64-cpu" | ||
#else | ||
#define TYPE_MIPS_CPU "mips-cpu" | ||
#endif | ||
|
||
#define MIPS_CPU_CLASS(klass) \ | ||
OBJECT_CLASS_CHECK(MIPSCPUClass, (klass), TYPE_MIPS_CPU) | ||
#define MIPS_CPU(obj) \ | ||
OBJECT_CHECK(MIPSCPU, (obj), TYPE_MIPS_CPU) | ||
#define MIPS_CPU_GET_CLASS(obj) \ | ||
OBJECT_GET_CLASS(MIPSCPUClass, (obj), TYPE_MIPS_CPU) | ||
|
||
/** | ||
* MIPSCPUClass: | ||
* @parent_reset: The parent class' reset handler. | ||
* | ||
* A MIPS CPU model. | ||
*/ | ||
typedef struct MIPSCPUClass { | ||
/*< private >*/ | ||
CPUClass parent_class; | ||
/*< public >*/ | ||
|
||
void (*parent_reset)(CPUState *cpu); | ||
} MIPSCPUClass; | ||
|
||
/** | ||
* MIPSCPU: | ||
* @env: #CPUMIPSState | ||
* | ||
* A MIPS CPU. | ||
*/ | ||
typedef struct MIPSCPU { | ||
/*< private >*/ | ||
CPUState parent_obj; | ||
/*< public >*/ | ||
|
||
CPUMIPSState env; | ||
} MIPSCPU; | ||
|
||
static inline MIPSCPU *mips_env_get_cpu(CPUMIPSState *env) | ||
{ | ||
return MIPS_CPU(container_of(env, MIPSCPU, env)); | ||
} | ||
|
||
#define ENV_GET_CPU(e) CPU(mips_env_get_cpu(e)) | ||
|
||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* QEMU MIPS 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 mips_cpu_reset(CPUState *s) | ||
{ | ||
MIPSCPU *cpu = MIPS_CPU(s); | ||
MIPSCPUClass *mcc = MIPS_CPU_GET_CLASS(cpu); | ||
CPUMIPSState *env = &cpu->env; | ||
|
||
mcc->parent_reset(s); | ||
|
||
cpu_state_reset(env); | ||
} | ||
|
||
static void mips_cpu_class_init(ObjectClass *c, void *data) | ||
{ | ||
MIPSCPUClass *mcc = MIPS_CPU_CLASS(c); | ||
CPUClass *cc = CPU_CLASS(c); | ||
|
||
mcc->parent_reset = cc->reset; | ||
cc->reset = mips_cpu_reset; | ||
} | ||
|
||
static const TypeInfo mips_cpu_type_info = { | ||
.name = TYPE_MIPS_CPU, | ||
.parent = TYPE_CPU, | ||
.instance_size = sizeof(MIPSCPU), | ||
.abstract = false, | ||
.class_size = sizeof(MIPSCPUClass), | ||
.class_init = mips_cpu_class_init, | ||
}; | ||
|
||
static void mips_cpu_register_types(void) | ||
{ | ||
type_register_static(&mips_cpu_type_info); | ||
} | ||
|
||
type_init(mips_cpu_register_types) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters