Skip to content

Commit

Permalink
target/riscv: Rename tcg_cpu_FOO() to include 'riscv'
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20240111120221.35072-6-philmd@linaro.org>
  • Loading branch information
philmd committed Jan 19, 2024
1 parent e129593 commit 7ebbd9d
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions target/riscv/tcg/tcg-cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -1386,38 +1386,38 @@ 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.
*/
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);

0 comments on commit 7ebbd9d

Please sign in to comment.