[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v13 15/80] target/arm: move cpu definitions to common cpu module
From: |
Claudio Fontana |
Subject: |
[RFC v13 15/80] target/arm: move cpu definitions to common cpu module |
Date: |
Wed, 14 Apr 2021 13:25:45 +0200 |
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/cpu-common.c | 41 +++++++++++++++++++++++++++++++++++++++++
target/arm/tcg/helper.c | 29 -----------------------------
target/arm/meson.build | 1 +
3 files changed, 42 insertions(+), 29 deletions(-)
create mode 100644 target/arm/cpu-common.c
diff --git a/target/arm/cpu-common.c b/target/arm/cpu-common.c
new file mode 100644
index 0000000000..0f8ca94815
--- /dev/null
+++ b/target/arm/cpu-common.c
@@ -0,0 +1,41 @@
+/*
+ * ARM CPU common definitions
+ *
+ * This code is licensed under the GNU GPL v2 or later.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qom/object.h"
+#include "qapi/qapi-commands-machine-target.h"
+#include "qapi/error.h"
+#include "cpu.h"
+
+static void arm_cpu_add_definition(gpointer data, gpointer user_data)
+{
+ ObjectClass *oc = data;
+ CpuDefinitionInfoList **cpu_list = user_data;
+ CpuDefinitionInfo *info;
+ const char *typename;
+
+ typename = object_class_get_name(oc);
+ info = g_malloc0(sizeof(*info));
+ info->name = g_strndup(typename,
+ strlen(typename) - strlen("-" TYPE_ARM_CPU));
+ info->q_typename = g_strdup(typename);
+
+ QAPI_LIST_PREPEND(*cpu_list, info);
+}
+
+CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
+{
+ CpuDefinitionInfoList *cpu_list = NULL;
+ GSList *list;
+
+ list = object_class_get_list(TYPE_ARM_CPU, false);
+ g_slist_foreach(list, arm_cpu_add_definition, &cpu_list);
+ g_slist_free(list);
+
+ return cpu_list;
+}
diff --git a/target/arm/tcg/helper.c b/target/arm/tcg/helper.c
index 8e976ceb6a..08456aa50a 100644
--- a/target/arm/tcg/helper.c
+++ b/target/arm/tcg/helper.c
@@ -28,7 +28,6 @@
#include "sysemu/kvm.h"
#include "sysemu/tcg.h"
#include "qemu/range.h"
-#include "qapi/qapi-commands-machine-target.h"
#include "qapi/error.h"
#include "qemu/guest-random.h"
#ifdef CONFIG_TCG
@@ -697,34 +696,6 @@ void arm_cpu_list(void)
g_slist_free(list);
}
-static void arm_cpu_add_definition(gpointer data, gpointer user_data)
-{
- ObjectClass *oc = data;
- CpuDefinitionInfoList **cpu_list = user_data;
- CpuDefinitionInfo *info;
- const char *typename;
-
- typename = object_class_get_name(oc);
- info = g_malloc0(sizeof(*info));
- info->name = g_strndup(typename,
- strlen(typename) - strlen("-" TYPE_ARM_CPU));
- info->q_typename = g_strdup(typename);
-
- QAPI_LIST_PREPEND(*cpu_list, info);
-}
-
-CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
-{
- CpuDefinitionInfoList *cpu_list = NULL;
- GSList *list;
-
- list = object_class_get_list(TYPE_ARM_CPU, false);
- g_slist_foreach(list, arm_cpu_add_definition, &cpu_list);
- g_slist_free(list);
-
- return cpu_list;
-}
-
static int bad_mode_switch(CPUARMState *env, int mode, CPSRWriteType
write_type)
{
/* Return true if it is not valid for us to switch to
diff --git a/target/arm/meson.build b/target/arm/meson.build
index 5fb34c1af1..8d6177c1fb 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -2,6 +2,7 @@ arm_ss = ss.source_set()
arm_ss.add(files(
'cpregs.c',
'cpu.c',
+ 'cpu-common.c',
'cpu-mmu.c',
'cpustate-list.c',
'gdbstub.c',
--
2.26.2
- [RFC v13 01/80] target/arm: move translate modules to tcg/, (continued)
- [RFC v13 01/80] target/arm: move translate modules to tcg/, Claudio Fontana, 2021/04/14
- [RFC v13 02/80] target/arm: move helpers to tcg/, Claudio Fontana, 2021/04/14
- [RFC v13 03/80] arm: tcg: only build under CONFIG_TCG, Claudio Fontana, 2021/04/14
- [RFC v13 06/80] target/arm: tcg: move sysemu-only parts of debug_helper, Claudio Fontana, 2021/04/14
- [RFC v13 04/80] target/arm: tcg: add sysemu and user subdirs, Claudio Fontana, 2021/04/14
- [RFC v13 07/80] target/arm: tcg: split tlb_helper user-only and sysemu-only parts, Claudio Fontana, 2021/04/14
- [RFC v13 05/80] target/arm: tcg: split mte_helper user-only and sysemu code, Claudio Fontana, 2021/04/14
- [RFC v13 10/80] target/arm: split off cpu-sysemu.c, Claudio Fontana, 2021/04/14
- [RFC v13 09/80] target/arm: only build psci for TCG, Claudio Fontana, 2021/04/14
- [RFC v13 08/80] target/arm: tcg: split m_helper user-only and sysemu-only parts, Claudio Fontana, 2021/04/14
- [RFC v13 15/80] target/arm: move cpu definitions to common cpu module,
Claudio Fontana <=
- [RFC v13 11/80] target/arm: tcg: fix comment style before move to cpu-mmu, Claudio Fontana, 2021/04/14
- [RFC v13 12/80] target/arm: move physical address translation to cpu-mmu, Claudio Fontana, 2021/04/14
- [RFC v13 17/80] target/arm: tcg: add stubs for some helpers for non-tcg builds, Claudio Fontana, 2021/04/14
- [RFC v13 13/80] target/arm: fix style in preparation of new cpregs module, Claudio Fontana, 2021/04/14
- [RFC v13 16/80] target/arm: only perform TCG cpu and machine inits if TCG enabled, Claudio Fontana, 2021/04/14
- [RFC v13 19/80] target/arm: add temporary stub for arm_rebuild_hflags, Claudio Fontana, 2021/04/14
- [RFC v13 18/80] target/arm: move cpsr_read, cpsr_write to cpu_common, Claudio Fontana, 2021/04/14
- [RFC v13 20/80] target/arm: move arm_hcr_el2_eff from tcg/ to common_cpu, Claudio Fontana, 2021/04/14
- [RFC v13 21/80] target/arm: split vfp state setting from tcg helpers, Claudio Fontana, 2021/04/14
- [RFC v13 22/80] target/arm: move arm_mmu_idx* to cpu-mmu, Claudio Fontana, 2021/04/14