| Message ID | 20240111120221.35072-6-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | misc: Trivial code rename cleanup | expand |
On 1/11/24 09:02, Philippe Mathieu-Daudé wrote: > The tcg_cpu_FOO() names are riscv specific, so rename > them as riscv_tcg_cpu_FOO() (as other names in this file) > to ease navigating the code. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > target/riscv/tcg/tcg-cpu.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c > index 14133ff665..994ca1cdf9 100644 > --- a/target/riscv/tcg/tcg-cpu.c > +++ b/target/riscv/tcg/tcg-cpu.c > @@ -929,7 +929,7 @@ static bool riscv_cpu_is_vendor(Object *cpu_obj) > * -> cpu_exec_realizefn() > * -> tcg_cpu_realize() (via accel_cpu_common_realize()) > */ > -static bool tcg_cpu_realize(CPUState *cs, Error **errp) > +static bool riscv_tcg_cpu_realize(CPUState *cs, Error **errp) > { > RISCVCPU *cpu = RISCV_CPU(cs); > Error *local_err = NULL; > @@ -1372,7 +1372,7 @@ static bool riscv_cpu_has_max_extensions(Object *cpu_obj) > return object_dynamic_cast(cpu_obj, TYPE_RISCV_CPU_MAX) != NULL; > } > > -static void tcg_cpu_instance_init(CPUState *cs) > +static void riscv_tcg_cpu_instance_init(CPUState *cs) > { > RISCVCPU *cpu = RISCV_CPU(cs); > Object *obj = OBJECT(cpu); > @@ -1386,7 +1386,7 @@ static void tcg_cpu_instance_init(CPUState *cs) > } > } > > -static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) > +static void riscv_tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) > { > /* > * All cpus use the same set of operations. > @@ -1394,30 +1394,30 @@ static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) > cc->tcg_ops = &riscv_tcg_ops; > } > > -static void tcg_cpu_class_init(CPUClass *cc) > +static void riscv_tcg_cpu_class_init(CPUClass *cc) > { > - cc->init_accel_cpu = tcg_cpu_init_ops; > + cc->init_accel_cpu = riscv_tcg_cpu_init_ops; > } > > -static void tcg_cpu_accel_class_init(ObjectClass *oc, void *data) > +static void riscv_tcg_cpu_accel_class_init(ObjectClass *oc, void *data) > { > AccelCPUClass *acc = ACCEL_CPU_CLASS(oc); > > - acc->cpu_class_init = tcg_cpu_class_init; > - acc->cpu_instance_init = tcg_cpu_instance_init; > - acc->cpu_target_realize = tcg_cpu_realize; > + acc->cpu_class_init = riscv_tcg_cpu_class_init; > + acc->cpu_instance_init = riscv_tcg_cpu_instance_init; > + acc->cpu_target_realize = riscv_tcg_cpu_realize; > } > > -static const TypeInfo tcg_cpu_accel_type_info = { > +static const TypeInfo riscv_tcg_cpu_accel_type_info = { > .name = ACCEL_CPU_NAME("tcg"), > > .parent = TYPE_ACCEL_CPU, > - .class_init = tcg_cpu_accel_class_init, > + .class_init = riscv_tcg_cpu_accel_class_init, > .abstract = true, > }; > > -static void tcg_cpu_accel_register_types(void) > +static void riscv_tcg_cpu_accel_register_types(void) > { > - type_register_static(&tcg_cpu_accel_type_info); > + type_register_static(&riscv_tcg_cpu_accel_type_info); > } > -type_init(tcg_cpu_accel_register_types); > +type_init(riscv_tcg_cpu_accel_register_types);
On Thu, Jan 11, 2024 at 11:05 PM Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > The tcg_cpu_FOO() names are riscv specific, so rename > them as riscv_tcg_cpu_FOO() (as other names in this file) > to ease navigating the code. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/riscv/tcg/tcg-cpu.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c > index 14133ff665..994ca1cdf9 100644 > --- a/target/riscv/tcg/tcg-cpu.c > +++ b/target/riscv/tcg/tcg-cpu.c > @@ -929,7 +929,7 @@ static bool riscv_cpu_is_vendor(Object *cpu_obj) > * -> cpu_exec_realizefn() > * -> tcg_cpu_realize() (via accel_cpu_common_realize()) > */ > -static bool tcg_cpu_realize(CPUState *cs, Error **errp) > +static bool riscv_tcg_cpu_realize(CPUState *cs, Error **errp) > { > RISCVCPU *cpu = RISCV_CPU(cs); > Error *local_err = NULL; > @@ -1372,7 +1372,7 @@ static bool riscv_cpu_has_max_extensions(Object *cpu_obj) > return object_dynamic_cast(cpu_obj, TYPE_RISCV_CPU_MAX) != NULL; > } > > -static void tcg_cpu_instance_init(CPUState *cs) > +static void riscv_tcg_cpu_instance_init(CPUState *cs) > { > RISCVCPU *cpu = RISCV_CPU(cs); > Object *obj = OBJECT(cpu); > @@ -1386,7 +1386,7 @@ static void tcg_cpu_instance_init(CPUState *cs) > } > } > > -static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) > +static void riscv_tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) > { > /* > * All cpus use the same set of operations. > @@ -1394,30 +1394,30 @@ static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) > cc->tcg_ops = &riscv_tcg_ops; > } > > -static void tcg_cpu_class_init(CPUClass *cc) > +static void riscv_tcg_cpu_class_init(CPUClass *cc) > { > - cc->init_accel_cpu = tcg_cpu_init_ops; > + cc->init_accel_cpu = riscv_tcg_cpu_init_ops; > } > > -static void tcg_cpu_accel_class_init(ObjectClass *oc, void *data) > +static void riscv_tcg_cpu_accel_class_init(ObjectClass *oc, void *data) > { > AccelCPUClass *acc = ACCEL_CPU_CLASS(oc); > > - acc->cpu_class_init = tcg_cpu_class_init; > - acc->cpu_instance_init = tcg_cpu_instance_init; > - acc->cpu_target_realize = tcg_cpu_realize; > + acc->cpu_class_init = riscv_tcg_cpu_class_init; > + acc->cpu_instance_init = riscv_tcg_cpu_instance_init; > + acc->cpu_target_realize = riscv_tcg_cpu_realize; > } > > -static const TypeInfo tcg_cpu_accel_type_info = { > +static const TypeInfo riscv_tcg_cpu_accel_type_info = { > .name = ACCEL_CPU_NAME("tcg"), > > .parent = TYPE_ACCEL_CPU, > - .class_init = tcg_cpu_accel_class_init, > + .class_init = riscv_tcg_cpu_accel_class_init, > .abstract = true, > }; > > -static void tcg_cpu_accel_register_types(void) > +static void riscv_tcg_cpu_accel_register_types(void) > { > - type_register_static(&tcg_cpu_accel_type_info); > + type_register_static(&riscv_tcg_cpu_accel_type_info); > } > -type_init(tcg_cpu_accel_register_types); > +type_init(riscv_tcg_cpu_accel_register_types); > -- > 2.41.0 > >
diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 14133ff665..994ca1cdf9 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -929,7 +929,7 @@ static bool riscv_cpu_is_vendor(Object *cpu_obj) * -> cpu_exec_realizefn() * -> tcg_cpu_realize() (via accel_cpu_common_realize()) */ -static bool tcg_cpu_realize(CPUState *cs, Error **errp) +static bool riscv_tcg_cpu_realize(CPUState *cs, Error **errp) { RISCVCPU *cpu = RISCV_CPU(cs); Error *local_err = NULL; @@ -1372,7 +1372,7 @@ static bool riscv_cpu_has_max_extensions(Object *cpu_obj) return object_dynamic_cast(cpu_obj, TYPE_RISCV_CPU_MAX) != NULL; } -static void tcg_cpu_instance_init(CPUState *cs) +static void riscv_tcg_cpu_instance_init(CPUState *cs) { RISCVCPU *cpu = RISCV_CPU(cs); Object *obj = OBJECT(cpu); @@ -1386,7 +1386,7 @@ static void tcg_cpu_instance_init(CPUState *cs) } } -static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) +static void riscv_tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) { /* * All cpus use the same set of operations. @@ -1394,30 +1394,30 @@ static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) cc->tcg_ops = &riscv_tcg_ops; } -static void tcg_cpu_class_init(CPUClass *cc) +static void riscv_tcg_cpu_class_init(CPUClass *cc) { - cc->init_accel_cpu = tcg_cpu_init_ops; + cc->init_accel_cpu = riscv_tcg_cpu_init_ops; } -static void tcg_cpu_accel_class_init(ObjectClass *oc, void *data) +static void riscv_tcg_cpu_accel_class_init(ObjectClass *oc, void *data) { AccelCPUClass *acc = ACCEL_CPU_CLASS(oc); - acc->cpu_class_init = tcg_cpu_class_init; - acc->cpu_instance_init = tcg_cpu_instance_init; - acc->cpu_target_realize = tcg_cpu_realize; + acc->cpu_class_init = riscv_tcg_cpu_class_init; + acc->cpu_instance_init = riscv_tcg_cpu_instance_init; + acc->cpu_target_realize = riscv_tcg_cpu_realize; } -static const TypeInfo tcg_cpu_accel_type_info = { +static const TypeInfo riscv_tcg_cpu_accel_type_info = { .name = ACCEL_CPU_NAME("tcg"), .parent = TYPE_ACCEL_CPU, - .class_init = tcg_cpu_accel_class_init, + .class_init = riscv_tcg_cpu_accel_class_init, .abstract = true, }; -static void tcg_cpu_accel_register_types(void) +static void riscv_tcg_cpu_accel_register_types(void) { - type_register_static(&tcg_cpu_accel_type_info); + type_register_static(&riscv_tcg_cpu_accel_type_info); } -type_init(tcg_cpu_accel_register_types); +type_init(riscv_tcg_cpu_accel_register_types);
The tcg_cpu_FOO() names are riscv specific, so rename them as riscv_tcg_cpu_FOO() (as other names in this file) to ease navigating the code. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/riscv/tcg/tcg-cpu.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)