[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/38] xtensa: cleanup cpu type name composition
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 22/38] xtensa: cleanup cpu type name composition |
Date: |
Mon, 2 Oct 2017 11:08:04 +0200 |
use new XTENSA_CPU_TYPE_NAME to compose CPU type name
to bring xtensa in line with all other targets that
will similar macro.
Signed-off-by: Igor Mammedov <address@hidden>
---
CC: address@hidden
---
target/xtensa/cpu.h | 4 ++++
target/xtensa/cpu.c | 2 +-
target/xtensa/helper.c | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index 4803331..b17d7d9 100644
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -469,11 +469,15 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr
addr,
#define cpu_signal_handler cpu_xtensa_signal_handler
#define cpu_list xtensa_cpu_list
+#define XTENSA_CPU_TYPE_SUFFIX "-" TYPE_XTENSA_CPU
+#define XTENSA_CPU_TYPE_NAME(model) model XTENSA_CPU_TYPE_SUFFIX
+
#ifdef TARGET_WORDS_BIGENDIAN
#define XTENSA_DEFAULT_CPU_MODEL "fsf"
#else
#define XTENSA_DEFAULT_CPU_MODEL "dc232b"
#endif
+#define XTENSA_DEFAULT_CPU_TYPE XTENSA_CPU_TYPE_NAME(XTENSA_DEFAULT_CPU_MODEL)
#define cpu_init(cpu_model) cpu_generic_init(TYPE_XTENSA_CPU, cpu_model)
diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index dcdc765..b5f7079 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -83,7 +83,7 @@ static ObjectClass *xtensa_cpu_class_by_name(const char
*cpu_model)
ObjectClass *oc;
char *typename;
- typename = g_strdup_printf("%s-" TYPE_XTENSA_CPU, cpu_model);
+ typename = g_strdup_printf(XTENSA_CPU_TYPE_NAME("%s"), cpu_model);
oc = object_class_by_name(typename);
g_free(typename);
if (oc == NULL || !object_class_dynamic_cast(oc, TYPE_XTENSA_CPU) ||
diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c
index e8fba20..216f198 100644
--- a/target/xtensa/helper.c
+++ b/target/xtensa/helper.c
@@ -76,7 +76,7 @@ void xtensa_register_core(XtensaConfigList *node)
node->next = xtensa_cores;
xtensa_cores = node;
- type.name = g_strdup_printf("%s-" TYPE_XTENSA_CPU, node->config->name);
+ type.name = g_strdup_printf(XTENSA_CPU_TYPE_NAME("%s"),
node->config->name);
type_register(&type);
g_free((gpointer)type.name);
}
--
2.7.4
- [Qemu-devel] [PATCH 16/38] openrisc: use generic cpu_model parsing, (continued)
- [Qemu-devel] [PATCH 16/38] openrisc: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 18/38] sh4: shix: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 15/38] openrisc: cleanup cpu type name composition, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 20/38] sh4: simplify superh_cpu_class_by_name(), Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 19/38] sh4: cleanup cpu type name composition, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 22/38] xtensa: cleanup cpu type name composition,
Igor Mammedov <=
- [Qemu-devel] [PATCH 21/38] sh4: remove SuperHCPUClass::name field, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 23/38] xtensa: sim: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 28/38] tricore: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 24/38] xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing, Igor Mammedov, 2017/10/02