mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
rx: Rename QOM type check macros
Currently we have a RXCPU typedef and a RXCPU type checking macro, but OBJECT_DECLARE* would transform the RXCPU macro into a function, and the function name would conflict with the typedef name. Rename the RXCPU* QOM type check macros to RX_CPU*, so we will avoid the conflict and make the macro names consistent with the TYPE_RX_CPU constant name. This will make future conversion to OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20200825192110.3528606-53-ehabkost@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
37e3d65043
commit
38688fdbe9
6 changed files with 17 additions and 17 deletions
|
@ -28,14 +28,14 @@
|
|||
|
||||
static void rx_cpu_set_pc(CPUState *cs, vaddr value)
|
||||
{
|
||||
RXCPU *cpu = RXCPU(cs);
|
||||
RXCPU *cpu = RX_CPU(cs);
|
||||
|
||||
cpu->env.pc = value;
|
||||
}
|
||||
|
||||
static void rx_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb)
|
||||
{
|
||||
RXCPU *cpu = RXCPU(cs);
|
||||
RXCPU *cpu = RX_CPU(cs);
|
||||
|
||||
cpu->env.pc = tb->pc;
|
||||
}
|
||||
|
@ -48,8 +48,8 @@ static bool rx_cpu_has_work(CPUState *cs)
|
|||
|
||||
static void rx_cpu_reset(DeviceState *dev)
|
||||
{
|
||||
RXCPU *cpu = RXCPU(dev);
|
||||
RXCPUClass *rcc = RXCPU_GET_CLASS(cpu);
|
||||
RXCPU *cpu = RX_CPU(dev);
|
||||
RXCPUClass *rcc = RX_CPU_GET_CLASS(cpu);
|
||||
CPURXState *env = &cpu->env;
|
||||
uint32_t *resetvec;
|
||||
|
||||
|
@ -108,7 +108,7 @@ static ObjectClass *rx_cpu_class_by_name(const char *cpu_model)
|
|||
static void rx_cpu_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
CPUState *cs = CPU(dev);
|
||||
RXCPUClass *rcc = RXCPU_GET_CLASS(dev);
|
||||
RXCPUClass *rcc = RX_CPU_GET_CLASS(dev);
|
||||
Error *local_err = NULL;
|
||||
|
||||
cpu_exec_realizefn(cs, &local_err);
|
||||
|
@ -164,7 +164,7 @@ static bool rx_cpu_tlb_fill(CPUState *cs, vaddr addr, int size,
|
|||
static void rx_cpu_init(Object *obj)
|
||||
{
|
||||
CPUState *cs = CPU(obj);
|
||||
RXCPU *cpu = RXCPU(obj);
|
||||
RXCPU *cpu = RX_CPU(obj);
|
||||
CPURXState *env = &cpu->env;
|
||||
|
||||
cpu_set_cpustate_pointers(cpu);
|
||||
|
@ -176,7 +176,7 @@ static void rx_cpu_class_init(ObjectClass *klass, void *data)
|
|||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
CPUClass *cc = CPU_CLASS(klass);
|
||||
RXCPUClass *rcc = RXCPU_CLASS(klass);
|
||||
RXCPUClass *rcc = RX_CPU_CLASS(klass);
|
||||
|
||||
device_class_set_parent_realize(dc, rx_cpu_realize,
|
||||
&rcc->parent_realize);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue