OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target: Replace CPU_GET_CLASS(cpu -> obj) in cpu_reset_hold() handler

Browse Source 
Since CPU() macro is a simple cast, the following are equivalent:

  Object *obj;
  CPUState *cs = CPU(obj)

In order to ease static analysis when running
scripts/coccinelle/cpu_env.cocci from the previous commit,
replace:

 - CPU_GET_CLASS(cpu);
 + CPU_GET_CLASS(obj);

Most code use the 'cs' variable name for CPUState handle.
Replace few 's' -> 'cs' to unify cpu_reset_hold() style.

No logical change in this patch.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240129164514.73104-7-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-01-29 17:44:48 +01:00 committed by Thomas Huth
parent 94956d7b51
commit 348802b526
18 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/arm/cpu.c
View File

@ -214,9 +214,9 @@ static void cp_reg_check_reset(gpointer key, gpointer value, gpointer opaque)
static void arm_cpu_reset_hold(Object *obj) static void arm_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
ARMCPU *cpu = ARM_CPU(s); ARMCPU *cpu = ARM_CPU(cs);
ARMCPUClass *acc = ARM_CPU_GET_CLASS(cpu); ARMCPUClass *acc = ARM_CPU_GET_CLASS(obj);
CPUARMState *env = &cpu->env; CPUARMState *env = &cpu->env;
if (acc->parent_phases.hold) { if (acc->parent_phases.hold) {
@ -233,7 +233,7 @@ static void arm_cpu_reset_hold(Object *obj)
env->vfp.xregs[ARM_VFP_MVFR1] = cpu->isar.mvfr1; env->vfp.xregs[ARM_VFP_MVFR1] = cpu->isar.mvfr1;
env->vfp.xregs[ARM_VFP_MVFR2] = cpu->isar.mvfr2; env->vfp.xregs[ARM_VFP_MVFR2] = cpu->isar.mvfr2;
cpu->power_state = s->start_powered_off ? PSCI_OFF : PSCI_ON; cpu->power_state = cs->start_powered_off ? PSCI_OFF : PSCI_ON;
if (arm_feature(env, ARM_FEATURE_IWMMXT)) { if (arm_feature(env, ARM_FEATURE_IWMMXT)) {
env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q'; env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q';
@ -438,7 +438,7 @@ static void arm_cpu_reset_hold(Object *obj)
/* Load the initial SP and PC from offset 0 and 4 in the vector table */ /* Load the initial SP and PC from offset 0 and 4 in the vector table */
vecbase = env->v7m.vecbase[env->v7m.secure]; vecbase = env->v7m.vecbase[env->v7m.secure];
rom = rom_ptr_for_as(s->as, vecbase, 8); rom = rom_ptr_for_as(cs->as, vecbase, 8);
if (rom) { if (rom) {
/* Address zero is covered by ROM which hasn't yet been /* Address zero is covered by ROM which hasn't yet been
* copied into physical memory. * copied into physical memory.
@ -451,8 +451,8 @@ static void arm_cpu_reset_hold(Object *obj)
* it got copied into memory. In the latter case, rom_ptr * it got copied into memory. In the latter case, rom_ptr
* will return a NULL pointer and we should use ldl_phys instead. * will return a NULL pointer and we should use ldl_phys instead.
*/ */
initial_msp = ldl_phys(s->as, vecbase); initial_msp = ldl_phys(cs->as, vecbase);
initial_pc = ldl_phys(s->as, vecbase + 4); initial_pc = ldl_phys(cs->as, vecbase + 4);
} }
qemu_log_mask(CPU_LOG_INT, qemu_log_mask(CPU_LOG_INT,

2
target/avr/cpu.c
View File

@ -79,7 +79,7 @@ static void avr_cpu_reset_hold(Object *obj)
{ {
CPUState *cs = CPU(obj); CPUState *cs = CPU(obj);
AVRCPU *cpu = AVR_CPU(cs); AVRCPU *cpu = AVR_CPU(cs);
AVRCPUClass *mcc = AVR_CPU_GET_CLASS(cpu); AVRCPUClass *mcc = AVR_CPU_GET_CLASS(obj);
CPUAVRState *env = &cpu->env; CPUAVRState *env = &cpu->env;
if (mcc->parent_phases.hold) { if (mcc->parent_phases.hold) {

2
target/cris/cpu.c
View File

@ -65,7 +65,7 @@ static void cris_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *s = CPU(obj);
CRISCPU *cpu = CRIS_CPU(s); CRISCPU *cpu = CRIS_CPU(s);
CRISCPUClass *ccc = CRIS_CPU_GET_CLASS(cpu); CRISCPUClass *ccc = CRIS_CPU_GET_CLASS(obj);
CPUCRISState *env = &cpu->env; CPUCRISState *env = &cpu->env;
uint32_t vr; uint32_t vr;

2
target/hexagon/cpu.c
View File

@ -289,7 +289,7 @@ static void hexagon_cpu_reset_hold(Object *obj)
{ {
CPUState *cs = CPU(obj); CPUState *cs = CPU(obj);
HexagonCPU *cpu = HEXAGON_CPU(cs); HexagonCPU *cpu = HEXAGON_CPU(cs);
HexagonCPUClass *mcc = HEXAGON_CPU_GET_CLASS(cpu); HexagonCPUClass *mcc = HEXAGON_CPU_GET_CLASS(obj);
CPUHexagonState *env = &cpu->env; CPUHexagonState *env = &cpu->env;
if (mcc->parent_phases.hold) { if (mcc->parent_phases.hold) {

14
target/i386/cpu.c
View File

@ -6695,9 +6695,9 @@ static void x86_cpu_set_sgxlepubkeyhash(CPUX86State *env)
static void x86_cpu_reset_hold(Object *obj) static void x86_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
X86CPU *cpu = X86_CPU(s); X86CPU *cpu = X86_CPU(cs);
X86CPUClass *xcc = X86_CPU_GET_CLASS(cpu); X86CPUClass *xcc = X86_CPU_GET_CLASS(obj);
CPUX86State *env = &cpu->env; CPUX86State *env = &cpu->env;
target_ulong cr4; target_ulong cr4;
uint64_t xcr0; uint64_t xcr0;
@ -6785,8 +6785,8 @@ static void x86_cpu_reset_hold(Object *obj)
memset(env->dr, 0, sizeof(env->dr)); memset(env->dr, 0, sizeof(env->dr));
env->dr[6] = DR6_FIXED_1; env->dr[6] = DR6_FIXED_1;
env->dr[7] = DR7_FIXED_1; env->dr[7] = DR7_FIXED_1;
cpu_breakpoint_remove_all(s, BP_CPU); cpu_breakpoint_remove_all(cs, BP_CPU);
cpu_watchpoint_remove_all(s, BP_CPU); cpu_watchpoint_remove_all(cs, BP_CPU);
cr4 = 0; cr4 = 0;
xcr0 = XSTATE_FP_MASK; xcr0 = XSTATE_FP_MASK;
@ -6837,9 +6837,9 @@ static void x86_cpu_reset_hold(Object *obj)
env->triple_fault_pending = false; env->triple_fault_pending = false;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
/* We hard-wire the BSP to the first CPU. */ /* We hard-wire the BSP to the first CPU. */
apic_designate_bsp(cpu->apic_state, s->cpu_index == 0); apic_designate_bsp(cpu->apic_state, cs->cpu_index == 0);
s->halted = !cpu_is_bsp(cpu); cs->halted = !cpu_is_bsp(cpu);
if (kvm_enabled()) { if (kvm_enabled()) {
kvm_arch_reset_vcpu(cpu); kvm_arch_reset_vcpu(cpu);

2
target/loongarch/cpu.c
View File

@ -510,7 +510,7 @@ static void loongarch_cpu_reset_hold(Object *obj)
{ {
CPUState *cs = CPU(obj); CPUState *cs = CPU(obj);
LoongArchCPU *cpu = LOONGARCH_CPU(cs); LoongArchCPU *cpu = LOONGARCH_CPU(cs);
LoongArchCPUClass *lacc = LOONGARCH_CPU_GET_CLASS(cpu); LoongArchCPUClass *lacc = LOONGARCH_CPU_GET_CLASS(obj);
CPULoongArchState *env = &cpu->env; CPULoongArchState *env = &cpu->env;
if (lacc->parent_phases.hold) { if (lacc->parent_phases.hold) {

6
target/m68k/cpu.c
View File

@ -73,9 +73,9 @@ static void m68k_unset_feature(CPUM68KState *env, int feature)
static void m68k_cpu_reset_hold(Object *obj) static void m68k_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
M68kCPU *cpu = M68K_CPU(s); M68kCPU *cpu = M68K_CPU(cs);
M68kCPUClass *mcc = M68K_CPU_GET_CLASS(cpu); M68kCPUClass *mcc = M68K_CPU_GET_CLASS(obj);
CPUM68KState *env = &cpu->env; CPUM68KState *env = &cpu->env;
floatx80 nan = floatx80_default_nan(NULL); floatx80 nan = floatx80_default_nan(NULL);
int i; int i;

6
target/microblaze/cpu.c
View File

@ -183,9 +183,9 @@ static void microblaze_cpu_set_irq(void *opaque, int irq, int level)
static void mb_cpu_reset_hold(Object *obj) static void mb_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
MicroBlazeCPU *cpu = MICROBLAZE_CPU(s); MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs);
MicroBlazeCPUClass *mcc = MICROBLAZE_CPU_GET_CLASS(cpu); MicroBlazeCPUClass *mcc = MICROBLAZE_CPU_GET_CLASS(obj);
CPUMBState *env = &cpu->env; CPUMBState *env = &cpu->env;
if (mcc->parent_phases.hold) { if (mcc->parent_phases.hold) {

2
target/mips/cpu.c
View File

@ -193,7 +193,7 @@ static void mips_cpu_reset_hold(Object *obj)
{ {
CPUState *cs = CPU(obj); CPUState *cs = CPU(obj);
MIPSCPU *cpu = MIPS_CPU(cs); MIPSCPU *cpu = MIPS_CPU(cs);
MIPSCPUClass *mcc = MIPS_CPU_GET_CLASS(cpu); MIPSCPUClass *mcc = MIPS_CPU_GET_CLASS(obj);
CPUMIPSState *env = &cpu->env; CPUMIPSState *env = &cpu->env;
if (mcc->parent_phases.hold) { if (mcc->parent_phases.hold) {

2
target/nios2/cpu.c
View File

@ -67,7 +67,7 @@ static void nios2_cpu_reset_hold(Object *obj)
{ {
CPUState *cs = CPU(obj); CPUState *cs = CPU(obj);
Nios2CPU *cpu = NIOS2_CPU(cs); Nios2CPU *cpu = NIOS2_CPU(cs);
Nios2CPUClass *ncc = NIOS2_CPU_GET_CLASS(cpu); Nios2CPUClass *ncc = NIOS2_CPU_GET_CLASS(obj);
CPUNios2State *env = &cpu->env; CPUNios2State *env = &cpu->env;
if (ncc->parent_phases.hold) { if (ncc->parent_phases.hold) {

8
target/openrisc/cpu.c
View File

@ -87,9 +87,9 @@ static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info)
static void openrisc_cpu_reset_hold(Object *obj) static void openrisc_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
OpenRISCCPU *cpu = OPENRISC_CPU(s); OpenRISCCPU *cpu = OPENRISC_CPU(cs);
OpenRISCCPUClass *occ = OPENRISC_CPU_GET_CLASS(cpu); OpenRISCCPUClass *occ = OPENRISC_CPU_GET_CLASS(obj);
if (occ->parent_phases.hold) { if (occ->parent_phases.hold) {
occ->parent_phases.hold(obj); occ->parent_phases.hold(obj);
@ -100,7 +100,7 @@ static void openrisc_cpu_reset_hold(Object *obj)
cpu->env.pc = 0x100; cpu->env.pc = 0x100;
cpu->env.sr = SR_FO | SR_SM; cpu->env.sr = SR_FO | SR_SM;
cpu->env.lock_addr = -1; cpu->env.lock_addr = -1;
s->exception_index = -1; cs->exception_index = -1;
cpu_set_fpcsr(&cpu->env, 0); cpu_set_fpcsr(&cpu->env, 0);
set_float_detect_tininess(float_tininess_before_rounding, set_float_detect_tininess(float_tininess_before_rounding,

12
target/ppc/cpu_init.c
View File

@ -7108,9 +7108,9 @@ static int ppc_cpu_mmu_index(CPUState *cs, bool ifetch)
static void ppc_cpu_reset_hold(Object *obj) static void ppc_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
PowerPCCPU *cpu = POWERPC_CPU(s); PowerPCCPU *cpu = POWERPC_CPU(cs);
PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(obj);
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
target_ulong msr; target_ulong msr;
int i; int i;
@ -7159,8 +7159,8 @@ static void ppc_cpu_reset_hold(Object *obj)
env->nip = env->hreset_vector | env->excp_prefix; env->nip = env->hreset_vector | env->excp_prefix;
if (tcg_enabled()) { if (tcg_enabled()) {
cpu_breakpoint_remove_all(s, BP_CPU); cpu_breakpoint_remove_all(cs, BP_CPU);
cpu_watchpoint_remove_all(s, BP_CPU); cpu_watchpoint_remove_all(cs, BP_CPU);
if (env->mmu_model != POWERPC_MMU_REAL) { if (env->mmu_model != POWERPC_MMU_REAL) {
ppc_tlb_invalidate_all(env); ppc_tlb_invalidate_all(env);
} }
@ -7174,7 +7174,7 @@ static void ppc_cpu_reset_hold(Object *obj)
env->reserve_addr = (target_ulong)-1ULL; env->reserve_addr = (target_ulong)-1ULL;
/* Be sure no exception or interrupt is pending */ /* Be sure no exception or interrupt is pending */
env->pending_interrupts = 0; env->pending_interrupts = 0;
s->exception_index = POWERPC_EXCP_NONE; cs->exception_index = POWERPC_EXCP_NONE;
env->error_code = 0; env->error_code = 0;
ppc_irq_reset(cpu); ppc_irq_reset(cpu);

2
target/riscv/cpu.c
View File

@ -926,7 +926,7 @@ static void riscv_cpu_reset_hold(Object *obj)
#endif #endif
CPUState *cs = CPU(obj); CPUState *cs = CPU(obj);
RISCVCPU *cpu = RISCV_CPU(cs); RISCVCPU *cpu = RISCV_CPU(cs);
RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(cpu); RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(obj);
CPURISCVState *env = &cpu->env; CPURISCVState *env = &cpu->env;
if (mcc->parent_phases.hold) { if (mcc->parent_phases.hold) {

2
target/rx/cpu.c
View File

@ -72,7 +72,7 @@ static int riscv_cpu_mmu_index(CPUState *cs, bool ifunc)
static void rx_cpu_reset_hold(Object *obj) static void rx_cpu_reset_hold(Object *obj)
{ {
RXCPU *cpu = RX_CPU(obj); RXCPU *cpu = RX_CPU(obj);
RXCPUClass *rcc = RX_CPU_GET_CLASS(cpu); RXCPUClass *rcc = RX_CPU_GET_CLASS(obj);
CPURXState *env = &cpu->env; CPURXState *env = &cpu->env;
uint32_t *resetvec; uint32_t *resetvec;

6
target/sh4/cpu.c
View File

@ -106,9 +106,9 @@ static int sh4_cpu_mmu_index(CPUState *cs, bool ifetch)
static void superh_cpu_reset_hold(Object *obj) static void superh_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
SuperHCPU *cpu = SUPERH_CPU(s); SuperHCPU *cpu = SUPERH_CPU(cs);
SuperHCPUClass *scc = SUPERH_CPU_GET_CLASS(cpu); SuperHCPUClass *scc = SUPERH_CPU_GET_CLASS(obj);
CPUSH4State *env = &cpu->env; CPUSH4State *env = &cpu->env;
if (scc->parent_phases.hold) { if (scc->parent_phases.hold) {

6
target/sparc/cpu.c
View File

@ -31,9 +31,9 @@
static void sparc_cpu_reset_hold(Object *obj) static void sparc_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
SPARCCPU *cpu = SPARC_CPU(s); SPARCCPU *cpu = SPARC_CPU(cs);
SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(cpu); SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(obj);
CPUSPARCState *env = &cpu->env; CPUSPARCState *env = &cpu->env;
if (scc->parent_phases.hold) { if (scc->parent_phases.hold) {

6
target/tricore/cpu.c
View File

@ -72,9 +72,9 @@ static void tricore_restore_state_to_opc(CPUState *cs,
static void tricore_cpu_reset_hold(Object *obj) static void tricore_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
TriCoreCPU *cpu = TRICORE_CPU(s); TriCoreCPU *cpu = TRICORE_CPU(cs);
TriCoreCPUClass *tcc = TRICORE_CPU_GET_CLASS(cpu); TriCoreCPUClass *tcc = TRICORE_CPU_GET_CLASS(obj);
CPUTriCoreState *env = &cpu->env; CPUTriCoreState *env = &cpu->env;
if (tcc->parent_phases.hold) { if (tcc->parent_phases.hold) {

8
target/xtensa/cpu.c
View File

@ -95,9 +95,9 @@ bool xtensa_abi_call0(void)
static void xtensa_cpu_reset_hold(Object *obj) static void xtensa_cpu_reset_hold(Object *obj)
{ {
CPUState *s = CPU(obj); CPUState *cs = CPU(obj);
XtensaCPU *cpu = XTENSA_CPU(s); XtensaCPU *cpu = XTENSA_CPU(cs);
XtensaCPUClass *xcc = XTENSA_CPU_GET_CLASS(cpu); XtensaCPUClass *xcc = XTENSA_CPU_GET_CLASS(obj);
CPUXtensaState *env = &cpu->env; CPUXtensaState *env = &cpu->env;
bool dfpu = xtensa_option_enabled(env->config, bool dfpu = xtensa_option_enabled(env->config,
XTENSA_OPTION_DFP_COPROCESSOR); XTENSA_OPTION_DFP_COPROCESSOR);
@ -132,7 +132,7 @@ static void xtensa_cpu_reset_hold(Object *obj)
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
reset_mmu(env); reset_mmu(env);
s->halted = env->runstall; cs->halted = env->runstall;
#endif #endif
set_no_signaling_nans(!dfpu, &env->fp_status); set_no_signaling_nans(!dfpu, &env->fp_status);
set_use_first_nan(!dfpu, &env->fp_status); set_use_first_nan(!dfpu, &env->fp_status);