[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v18 04/29] !fixup target/rx: CPU definition
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v18 04/29] !fixup target/rx: CPU definition |
Date: |
Fri, 7 Jun 2019 17:37:00 +0200 |
Rename macros.
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
target/rx/cpu.c | 22 ++++++++++++++--------
target/rx/cpu.h | 12 ++++++------
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/target/rx/cpu.c b/target/rx/cpu.c
index 4b96f2e463..3c43467534 100644
--- a/target/rx/cpu.c
+++ b/target/rx/cpu.c
@@ -153,7 +153,7 @@ static void rx_cpu_init(Object *obj)
qdev_init_gpio_in(DEVICE(cpu), rx_cpu_set_irq, 2);
}
-static void rxcpu_class_init(ObjectClass *klass, void *data)
+static void rx_cpu_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
CPUClass *cc = CPU_CLASS(klass);
@@ -181,22 +181,28 @@ static void rxcpu_class_init(ObjectClass *klass, void
*data)
cc->gdb_num_core_regs = 26;
}
-static const TypeInfo rxcpu_info = {
- .name = TYPE_RXCPU,
+static const TypeInfo rx_cpu_info = {
+ .name = TYPE_RX_CPU,
.parent = TYPE_CPU,
.instance_size = sizeof(RXCPU),
.instance_init = rx_cpu_init,
- .abstract = false,
+ .abstract = true,
.class_size = sizeof(RXCPUClass),
- .class_init = rxcpu_class_init,
+ .class_init = rx_cpu_class_init,
};
-static void rxcpu_register_types(void)
+static const TypeInfo rx62n_rx_cpu_info = {
+ .name = RX_CPU_TYPE_NAME("rx62n"),
+ .parent = TYPE_RX_CPU,
+};
+
+static void rx_cpu_register_types(void)
{
- type_register_static(&rxcpu_info);
+ type_register_static(&rx_cpu_info);
+ type_register_static(&rx62n_rx_cpu_info);
}
-type_init(rxcpu_register_types)
+type_init(rx_cpu_register_types)
static uint32_t extable[32];
diff --git a/target/rx/cpu.h b/target/rx/cpu.h
index 8c1a4e448d..a0b6975963 100644
--- a/target/rx/cpu.h
+++ b/target/rx/cpu.h
@@ -24,14 +24,14 @@
#include "hw/registerfields.h"
#include "qom/cpu.h"
-#define TYPE_RXCPU "rxcpu"
+#define TYPE_RX_CPU "rx-cpu"
#define RXCPU_CLASS(klass) \
- OBJECT_CLASS_CHECK(RXCPUClass, (klass), TYPE_RXCPU)
+ OBJECT_CLASS_CHECK(RXCPUClass, (klass), TYPE_RX_CPU)
#define RXCPU(obj) \
- OBJECT_CHECK(RXCPU, (obj), TYPE_RXCPU)
+ OBJECT_CHECK(RXCPU, (obj), TYPE_RX_CPU)
#define RXCPU_GET_CLASS(obj) \
- OBJECT_GET_CLASS(RXCPUClass, (obj), TYPE_RXCPU)
+ OBJECT_GET_CLASS(RXCPUClass, (obj), TYPE_RX_CPU)
/*
* RXCPUClass:
@@ -164,9 +164,9 @@ static inline RXCPU *rx_env_get_cpu(CPURXState *env)
#define ENV_OFFSET offsetof(RXCPU, env)
-#define RX_CPU_TYPE_SUFFIX "-" TYPE_RXCPU
+#define RX_CPU_TYPE_SUFFIX "-" TYPE_RX_CPU
#define RX_CPU_TYPE_NAME(model) model RX_CPU_TYPE_SUFFIX
-#define CPU_RESOLVING_TYPE TYPE_RXCPU
+#define CPU_RESOLVING_TYPE TYPE_RX_CPU
extern const char rx_crname[][6];
--
2.20.1
- [Qemu-devel] [PATCH v18 27/29] hw/rx: Restrict the RX62N microcontroller to the RX62N CPU core, (continued)
- [Qemu-devel] [PATCH v18 27/29] hw/rx: Restrict the RX62N microcontroller to the RX62N CPU core, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 25/29] target/rx: Dump bytes for each insn during disassembly, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 29/29] BootLinuxConsoleTest: Test the RX-Virt machine, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 24/29] target/rx: Collect all bytes during disassembly, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 23/29] target/rx: Emit all disassembly in one prt(), Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 22/29] target/rx: Use prt_ldmi for XCHG_mr disassembly, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 21/29] target/rx: Replace operand with prt_ldmi in disassembler, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 18/29] Add rx-softmmu, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 20/29] target/rx: Disassemble rx_index_addr into a string, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 11/29] !fixup hw/rx: RX Target hardware definition, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 04/29] !fixup target/rx: CPU definition,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v18 15/29] target/rx: Add RX to SysEmuTarget, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 19/29] MAINTAINERS: Add RX, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 17/29] hw/rx: Honor -accel qtest, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 16/29] tests: Add rx to machine-none-test.c, Philippe Mathieu-Daudé, 2019/06/07
- [Qemu-devel] [PATCH v18 14/29] target/rx: Convert to CPUClass::tlb_fill, Philippe Mathieu-Daudé, 2019/06/07