mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 06:43:53 -06:00
cpu: tcg_ops: move to tcg-cpu-ops.h, keep a pointer in CPUClass
we cannot in principle make the TCG Operations field definitions conditional on CONFIG_TCG in code that is included by both common_ss and specific_ss modules. Therefore, what we can do safely to restrict the TCG fields to TCG-only builds, is to move all tcg cpu operations into a separate header file, which is only included by TCG, target-specific code. This leaves just a NULL pointer in the cpu.h for the non-TCG builds. This also tidies up the code in all targets a bit, having all TCG cpu operations neatly contained by a dedicated data struct. Signed-off-by: Claudio Fontana <cfontana@suse.de> Message-Id: <20210204163931.7358-16-cfontana@suse.de> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
c73bdb35a9
commit
7827168471
36 changed files with 582 additions and 306 deletions
|
@ -10827,6 +10827,23 @@ static Property ppc_cpu_properties[] = {
|
|||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
#ifdef CONFIG_TCG
|
||||
#include "hw/core/tcg-cpu-ops.h"
|
||||
|
||||
static struct TCGCPUOps ppc_tcg_ops = {
|
||||
.initialize = ppc_translate_init,
|
||||
.cpu_exec_interrupt = ppc_cpu_exec_interrupt,
|
||||
.tlb_fill = ppc_cpu_tlb_fill,
|
||||
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
.do_interrupt = ppc_cpu_do_interrupt,
|
||||
.cpu_exec_enter = ppc_cpu_exec_enter,
|
||||
.cpu_exec_exit = ppc_cpu_exec_exit,
|
||||
.do_unaligned_access = ppc_cpu_do_unaligned_access,
|
||||
#endif /* !CONFIG_USER_ONLY */
|
||||
};
|
||||
#endif /* CONFIG_TCG */
|
||||
|
||||
static void ppc_cpu_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
|
||||
|
@ -10878,21 +10895,13 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
|
|||
#ifndef CONFIG_USER_ONLY
|
||||
cc->virtio_is_big_endian = ppc_cpu_is_big_endian;
|
||||
#endif
|
||||
#ifdef CONFIG_TCG
|
||||
cc->tcg_ops.initialize = ppc_translate_init;
|
||||
cc->tcg_ops.cpu_exec_interrupt = ppc_cpu_exec_interrupt;
|
||||
cc->tcg_ops.do_interrupt = ppc_cpu_do_interrupt;
|
||||
cc->tcg_ops.tlb_fill = ppc_cpu_tlb_fill;
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
cc->tcg_ops.cpu_exec_enter = ppc_cpu_exec_enter;
|
||||
cc->tcg_ops.cpu_exec_exit = ppc_cpu_exec_exit;
|
||||
cc->tcg_ops.do_unaligned_access = ppc_cpu_do_unaligned_access;
|
||||
#endif /* !CONFIG_USER_ONLY */
|
||||
#endif /* CONFIG_TCG */
|
||||
|
||||
cc->disas_set_info = ppc_disas_set_info;
|
||||
|
||||
dc->fw_name = "PowerPC,UNKNOWN";
|
||||
|
||||
#ifdef CONFIG_TCG
|
||||
cc->tcg_ops = &ppc_tcg_ops;
|
||||
#endif /* CONFIG_TCG */
|
||||
}
|
||||
|
||||
static const TypeInfo ppc_cpu_type_info = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue