motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/mips: Rename cpu_supports_FEAT() as cpu_type_supports_FEAT()

Browse source 
As cpu_supports_isa() / cpu_supports_cps_smp() take a 'cpu_type'
name argument, rename them cpu_type_supports_FEAT().

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201207215257.4004222-2-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-12-07 22:32:49 +01:00
parent 1ab3a0de2f
commit ac70f9767c
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/mips/boston.c
View file

@ -459,12 +459,12 @@ static void boston_mach_init(MachineState *machine)
s = BOSTON(dev); s = BOSTON(dev);
s->mach = machine; s->mach = machine;
if (!cpu_supports_cps_smp(machine->cpu_type)) { if (!cpu_type_supports_cps_smp(machine->cpu_type)) {
error_report("Boston requires CPUs which support CPS"); error_report("Boston requires CPUs which support CPS");
exit(1); exit(1);
} }
is_64b = cpu_supports_isa(machine->cpu_type, ISA_MIPS64); is_64b = cpu_type_supports_isa(machine->cpu_type, ISA_MIPS64);
object_initialize_child(OBJECT(machine), "cps", &s->cps, TYPE_MIPS_CPS); object_initialize_child(OBJECT(machine), "cps", &s->cps, TYPE_MIPS_CPS);
object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type, object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type,

4
hw/mips/malta.c
View file

@ -1205,7 +1205,7 @@ static void create_cps(MachineState *ms, MaltaState *s,
static void mips_create_cpu(MachineState *ms, MaltaState *s, static void mips_create_cpu(MachineState *ms, MaltaState *s,
qemu_irq *cbus_irq, qemu_irq *i8259_irq) qemu_irq *cbus_irq, qemu_irq *i8259_irq)
{ {
if ((ms->smp.cpus > 1) && cpu_supports_cps_smp(ms->cpu_type)) { if ((ms->smp.cpus > 1) && cpu_type_supports_cps_smp(ms->cpu_type)) {
create_cps(ms, s, cbus_irq, i8259_irq); create_cps(ms, s, cbus_irq, i8259_irq);
} else { } else {
create_cpu_without_cps(ms, s, cbus_irq, i8259_irq); create_cpu_without_cps(ms, s, cbus_irq, i8259_irq);
@ -1309,7 +1309,7 @@ void mips_malta_init(MachineState *machine)
loaderparams.initrd_filename = initrd_filename; loaderparams.initrd_filename = initrd_filename;
kernel_entry = load_kernel(); kernel_entry = load_kernel();
if (!cpu_supports_isa(machine->cpu_type, ISA_NANOMIPS32)) { if (!cpu_type_supports_isa(machine->cpu_type, ISA_NANOMIPS32)) {
write_bootloader(memory_region_get_ram_ptr(bios), write_bootloader(memory_region_get_ram_ptr(bios),
bootloader_run_addr, kernel_entry); bootloader_run_addr, kernel_entry);
} else { } else {

4
target/mips/cpu.h
View file

@ -1286,8 +1286,8 @@ int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);
#define MIPS_CPU_TYPE_NAME(model) model MIPS_CPU_TYPE_SUFFIX #define MIPS_CPU_TYPE_NAME(model) model MIPS_CPU_TYPE_SUFFIX
#define CPU_RESOLVING_TYPE TYPE_MIPS_CPU #define CPU_RESOLVING_TYPE TYPE_MIPS_CPU
bool cpu_supports_cps_smp(const char *cpu_type); bool cpu_type_supports_cps_smp(const char *cpu_type);
bool cpu_supports_isa(const char *cpu_type, uint64_t isa); bool cpu_type_supports_isa(const char *cpu_type, uint64_t isa);
void cpu_set_exception_base(int vp_index, target_ulong address); void cpu_set_exception_base(int vp_index, target_ulong address);
/* mips_int.c */ /* mips_int.c */

4
target/mips/translate.c
View file

@ -31770,13 +31770,13 @@ void cpu_mips_realize_env(CPUMIPSState *env)
mvp_init(env, env->cpu_model); mvp_init(env, env->cpu_model);
} }
bool cpu_supports_cps_smp(const char *cpu_type) bool cpu_type_supports_cps_smp(const char *cpu_type)
{ {
const MIPSCPUClass *mcc = MIPS_CPU_CLASS(object_class_by_name(cpu_type)); const MIPSCPUClass *mcc = MIPS_CPU_CLASS(object_class_by_name(cpu_type));
return (mcc->cpu_def->CP0_Config3 & (1 << CP0C3_CMGCR)) != 0; return (mcc->cpu_def->CP0_Config3 & (1 << CP0C3_CMGCR)) != 0;
} }
bool cpu_supports_isa(const char *cpu_type, uint64_t isa) bool cpu_type_supports_isa(const char *cpu_type, uint64_t isa)
{ {
const MIPSCPUClass *mcc = MIPS_CPU_CLASS(object_class_by_name(cpu_type)); const MIPSCPUClass *mcc = MIPS_CPU_CLASS(object_class_by_name(cpu_type));
return (mcc->cpu_def->insn_flags & isa) != 0; return (mcc->cpu_def->insn_flags & isa) != 0;