cpus: Constify @cpu in SysemuCPUOps::has_work() handler
cover cpus: Constify @cpu in SysemuCPUOps::has_work() handler
- Patches 1-8 trivially add const qualifier for various cpu_is/has() getters
- Patch 9 adds const-qualified variants of cpu_env() and env_archcpu(). Not sure if this is a good idea so marked as RFC.
- Patches 10-12 complete the cpu_is/has() getters const conversion using the new env_archcpu_const() variant
- Patch 13 finally convert the SysemuCPUOps::has_work hook and all target implementations.
No functional change; purely const-correctness improvment to enforce has_work() callees don't mutate CPUState.
Build-tested.
Based-on: <[email protected]>
"Make halt-to-exec transition explicit and remove cpu_exec_halt"
Philippe Mathieu-Daudé (13):
target/avr: Constify CPUAVRState for some cpu_*() getters target/i386: Constify CPU*State for cpu_*_interrupt() getters target/loongarch: Constify CPULoongArchState for various cpu_*()
getters
target/mips: Constify CPUMIPSState for various cpu_*() getters target/s390x: Constify S390CPU for cpu_has_*() getters target/riscv: Constify @iprio argument in riscv_cpu_pending_to_irq() target/riscv: Constify CPURISCVState for various cpu_*() getters target/sparc: Constify CPUSPARCState for various cpu_*() getters
cpus: Add const-qualified CPU environment accessors target/riscv: Constify CPURISCVState for various cpu_*() getters target/hexagon: Constify CPUHexagonState in
hexagon_thread_is_enabled()
target/mips: Constify CPUMIPSState in mips_vpe_active()
cpus: Constify @cpu in SysemuCPUOps::has_work() handler
include/exec/cpu-common.h | 11 +++++++++++ include/hw/core/cpu.h | 6 ++++++ include/hw/core/sysemu-cpu-ops.h | 4 ++-- target/avr/cpu.h | 6 +++--- target/hexagon/cpu.h | 2 +- target/i386/cpu.h | 4 ++-- target/loongarch/cpu.h | 6 +++--- target/loongarch/internals.h | 4 ++-- target/mips/cpu.h | 6 +++--- target/mips/internal.h | 10 +++++----- target/riscv/cpu.h | 31 ++++++++++++++++--------------- target/riscv/internals.h | 2 +- target/s390x/cpu.h | 2 +- target/s390x/s390x-internal.h | 14 +++++++------- target/sparc/cpu.h | 12 ++++++------ target/alpha/cpu.c | 2 +- target/arm/cpu.c | 4 ++-- target/avr/cpu.c | 5 +++-- target/hexagon/cpu.c | 8 ++++---- target/hppa/cpu.c | 2 +- target/i386/cpu.c | 8 ++++---- target/loongarch/cpu.c | 6 +++--- target/m68k/cpu.c | 2 +- target/microblaze/cpu.c | 2 +- target/mips/cpu.c | 4 ++-- target/or1k/cpu.c | 2 +- target/ppc/cpu_init.c | 2 +- target/riscv/cpu.c | 14 +++++++------- target/rx/cpu.c | 2 +- target/s390x/cpu-system.c | 2 +- target/s390x/interrupt.c | 22 +++++++++++----------- target/sh4/cpu.c | 2 +- target/sparc/cpu.c | 4 ++-- target/tricore/cpu.c | 4 ++-- target/xtensa/cpu.c | 4 ++-- 35 files changed, 120 insertions(+), 101 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/13 target/avr: Constify CPUAVRState for some cpu_*() getters
Add the const qualifier to CPUAVRState when the
argument is accessed without modification.
--- target/avr/cpu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
target/avr/cpu.h +3 -3
@@ -183,7 +183,7 @@ int avr_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);int avr_print_insn (bfd_vma addr,disassemble_info *info);vaddr avr_cpu_gdb_adjust_breakpoint (CPUState *cpu,vaddr addr); -static inline int avr_feature (CPUAVRState *env,AVRFeature feature) +static inline int avr_feature (const CPUAVRState *env,AVRFeature feature) {return (env->features & (1U << feature)) !=0 ; }
@@ -204,12 +204,12 @@ enum { TB_FLAGS_SKIP = 2, }; -static inline int cpu_interrupts_enabled (CPUAVRState *env) +static inline int cpu_interrupts_enabled (const CPUAVRState *env) {return env->sregI !=0 ; } -static inline uint8_t cpu_get_sreg (CPUAVRState *env) +static inline uint8_t cpu_get_sreg (const CPUAVRState *env) {return (env->sregC) <<0 | (env->sregZ) <<1
Signature · 1 line
2.53.0
Re: [PATCH 01/13] target/avr: Constify CPUAVRState for some cpu_*() getters
Quoted 2 lines · Philippe Mathieu-Daudé
Add the const qualifier to CPUAVRState when the
argument is accessed without modification.
Signature · 1 line
Marc-André Lureau <[email protected]>
PATCH 2/13 target/i386: Constify CPU*State for cpu_*_interrupt() getters
In reply to Philippe Mathieu-Daudéx86_cpu_pending_interrupt() and x86_cpu_interrupts_enabled() only read CPU state without modification, add the const qualifiers to CPUState and CPUX86State parameters.
--- target/i386/cpu.h | 4 ++-- target/i386/cpu.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
target/i386/cpu.h +2 -2
@@ -2584,7 +2584,7 @@ void x86_cpu_gdb_init(CPUState *cs);int cpu_x86_support_mca_broadcast (CPUX86State *env);#ifndef CONFIG_USER_ONLY -int x86_cpu_pending_interrupt (CPUState *cs,int interrupt_request); +int x86_cpu_pending_interrupt (const CPUState *cs,int interrupt_request);bool x86_cpu_translate_for_debug (CPUState *cpu,vaddr addr,TranslateForDebugResult *result);
@@ -3092,7 +3092,7 @@ static inline bool ctl_has_irq(CPUX86State *env)return (env->int_ctl &V_IRQ_MASK ) && (int_prio >= tpr); } -static inline bool x86_cpu_interrupts_enabled (CPUX86State *env) +static inline bool x86_cpu_interrupts_enabled (const CPUX86State *env) {return ((env->eflags &IF_MASK ) && !(env->hflags & HF_INHIBIT_IRQ_MASK)) ||
target/i386/cpu.c +3 -3
@@ -10601,10 +10601,10 @@ static vaddr x86_cpu_get_pc(CPUState *cs) }#if !defined(CONFIG_USER_ONLY ) -int x86_cpu_pending_interrupt (CPUState *cs,int interrupt_request) +int x86_cpu_pending_interrupt (const CPUState *cs,int interrupt_request) { -X86CPU *cpu =X86_CPU (cs); -CPUX86State *env = &cpu->env; +const X86CPU *cpu =X86_CPU (cs); +const CPUX86State *env = &cpu->env;if (interrupt_request &CPU_INTERRUPT_POLL ) {return CPU_INTERRUPT_POLL ;
Signature · 1 line
2.53.0
Re: [PATCH 02/13] target/i386: Constify CPU*State for cpu_*_interrupt() getters
Quoted 3 lines · Philippe Mathieu-Daudé
x86_cpu_pending_interrupt()andx86_cpu_interrupts_enabled()only read CPU state without modification, add the const qualifiers to CPUState and CPUX86State parameters.
Signature · 1 line
Marc-André Lureau <[email protected]>
PATCH 3/13 target/loongarch: Constify CPULoongArchState for various cpu_*() getters
In reply to Philippe Mathieu-DaudéAdd the const qualifier to CPULoongArchStatCPUMIPSStatee when the argument is accessed without modification.
--- target/loongarch/cpu.h | 6 +++--- target/loongarch/internals.h | 2 +- target/loongarch/cpu.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
target/loongarch/cpu.h +3 -3
@@ -485,7 +485,7 @@ struct LoongArchCPUClass {#define MMU_USER_IDX MMU_PLV_USER#define MMU_DA_IDX 4 -static inline CPUSysState *env_sys (CPULoongArchState *env) +static inline CPUSysState *env_sys (const CPULoongArchState *env) {return env->sys_state; }
@@ -495,12 +495,12 @@ static inline void set_sys_state(CPULoongArchState *env, CPUSysState *sys) env->sys_state = sys; } -static inline bool is_la64 (CPULoongArchState *env) +static inline bool is_la64 (const CPULoongArchState *env) {return FIELD_EX32 (env->cpucfg[1 ],CPUCFG1 ,ARCH ) ==CPUCFG1_ARCH_LA64 ; } -static inline bool is_va32 (CPULoongArchState *env) +static inline bool is_va32 (const CPULoongArchState *env) {/* VA32 if !LA64 or VA32L[1-3] */ bool va32 = !is_la64 (env);
target/loongarch/internals.h +1 -1
@@ -39,7 +39,7 @@ uint64_t cpu_loongarch_get_constant_timer_ticks(LoongArchCPU *cpu);void cpu_loongarch_store_constant_timer_config (LoongArchCPU *cpu,uint64_t value);bool loongarch_cpu_has_work (CPUState *cs); -bool cpu_loongarch_hw_interrupts_pending (CPULoongArchState *env); +bool cpu_loongarch_hw_interrupts_pending (const CPULoongArchState *env);#endif /* !CONFIG_USER_ONLY */ uint64_t read_fcc (CPULoongArchState *env);
target/loongarch/cpu.c +1 -1
@@ -82,7 +82,7 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level) }/* Check if there is pending and not masked out interrupt */ -bool cpu_loongarch_hw_interrupts_pending (CPULoongArchState *env) +bool cpu_loongarch_hw_interrupts_pending (const CPULoongArchState *env) {uint32_t pending;uint32_t status;
Signature · 1 line
2.53.0
Re: [PATCH 03/13] target/loongarch: Constify CPULoongArchState for various cpu_*() getters
Quoted 2 lines · Philippe Mathieu-Daudé
Add the const qualifier to CPULoongArchStatCPUMIPSStatee when the argument is accessed without modification.
Signature · 1 line
Marc-André Lureau <[email protected]>
PATCH 4/13 target/mips: Constify CPUMIPSState for various cpu_*() getters
In reply to Philippe Mathieu-DaudéAdd the const qualifier to CPUMIPSState when
the argument is accessed without modification.
--- target/mips/cpu.h | 6 +++--- target/mips/internal.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
target/mips/cpu.h +3 -3
@@ -1372,19 +1372,19 @@ static inline bool ase_3d_available(const CPUMIPSState *env) }/* Check presence of MSA implementation */ -static inline bool ase_msa_available (CPUMIPSState *env) +static inline bool ase_msa_available (const CPUMIPSState *env) {return env->CP0_Config3 & (1 <<CP0C3_MSAP ); }/* Check presence of Loongson CSR instructions */ -static inline bool ase_lcsr_available (CPUMIPSState *env) +static inline bool ase_lcsr_available (const CPUMIPSState *env) {return env->lcsr_cpucfg2 & (1 <<CPUCFG2_LCSRP ); }/* Check presence of multi-threading ASE implementation */ -static inline bool ase_mt_available (CPUMIPSState *env) +static inline bool ase_mt_available (const CPUMIPSState *env) {return env->CP0_Config3 & (1 <<CP0C3_MT ); }
target/mips/internal.h +3 -3
@@ -165,7 +165,7 @@ void cpu_mips_store_cause(CPUMIPSState *env, target_ulong val);extern const VMStateDescription vmstate_mips_cpu; -static inline bool cpu_mips_hw_interrupts_enabled (CPUMIPSState *env) +static inline bool cpu_mips_hw_interrupts_enabled (const CPUMIPSState *env) {return (env->CP0_Status & (1 << CP0St_IE)) && !(env->CP0_Status & (1 << CP0St_EXL)) &&
@@ -180,7 +180,7 @@ static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env) }/* Check if there is pending and not masked out interrupt */ -static inline bool cpu_mips_hw_interrupts_pending (CPUMIPSState *env) +static inline bool cpu_mips_hw_interrupts_pending (const CPUMIPSState *env) {int32_t pending;int32_t status;
@@ -281,7 +281,7 @@ static inline int mips_vpe_active(CPUMIPSState *env)return active; } -static inline int mips_vp_active (CPUMIPSState *env) +static inline int mips_vp_active (const CPUMIPSState *env) {CPUState *cs;
Signature · 1 line
2.53.0
Re: [PATCH 04/13] target/mips: Constify CPUMIPSState for various cpu_*() getters
Quoted 2 lines · Philippe Mathieu-Daudé
Add the const qualifier to CPUMIPSState when
the argument is accessed without modification.
Signature · 1 line
Marc-André Lureau <[email protected]>
PATCH 5/13 target/s390x: Constify S390CPU for cpu_has_*() getters
In reply to Philippe Mathieu-DaudéAdd the const qualifier to S390CPU when the argument is accessed without modification.
--- target/s390x/cpu.h | 2 +- target/s390x/s390x-internal.h | 12 ++++++------ target/s390x/interrupt.c | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-)
target/s390x/cpu.h +1 -1
@@ -854,7 +854,7 @@ static inline unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu) return 0; }#endif /* CONFIG_USER_ONLY */ -static inline uint8_t s390_cpu_get_state (S390CPU *cpu) +static inline uint8_t s390_cpu_get_state (const S390CPU *cpu) {return cpu->env.cpu_state; }
target/s390x/s390x-internal.h +6 -6
@@ -334,12 +334,12 @@ void cpu_inject_clock_comparator(S390CPU *cpu);void cpu_inject_cpu_timer (S390CPU *cpu);void cpu_inject_emergency_signal (S390CPU *cpu,uint16_t src_cpu_addr);int cpu_inject_external_call (S390CPU *cpu,uint16_t src_cpu_addr); -bool s390_cpu_has_io_int (S390CPU *cpu); -bool s390_cpu_has_ext_int (S390CPU *cpu); -bool s390_cpu_has_mcck_int (S390CPU *cpu); -bool s390_cpu_has_int (S390CPU *cpu); -bool s390_cpu_has_restart_int (S390CPU *cpu); -bool s390_cpu_has_stop_int (S390CPU *cpu); +bool s390_cpu_has_io_int (const S390CPU *cpu); +bool s390_cpu_has_ext_int (const S390CPU *cpu); +bool s390_cpu_has_mcck_int (const S390CPU *cpu); +bool s390_cpu_has_int (const S390CPU *cpu); +bool s390_cpu_has_restart_int (const S390CPU *cpu); +bool s390_cpu_has_stop_int (const S390CPU *cpu);void cpu_inject_restart (S390CPU *cpu);void cpu_inject_stop (S390CPU *cpu);#endif /* CONFIG_USER_ONLY */
target/s390x/interrupt.c +11 -11
@@ -139,10 +139,10 @@ void s390_crw_mchk(void) fsc->inject_crw_mchk (fs); } -bool s390_cpu_has_mcck_int (S390CPU *cpu) +bool s390_cpu_has_mcck_int (const S390CPU *cpu) {QEMUS390FLICState *flic =s390_get_qemu_flic (s390_get_flic ()); -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;if (!(env->psw.mask &PSW_MASK_MCHECK )) {return false;
@@ -157,10 +157,10 @@ bool s390_cpu_has_mcck_int(S390CPU *cpu)return false; } -bool s390_cpu_has_ext_int (S390CPU *cpu) +bool s390_cpu_has_ext_int (const S390CPU *cpu) {QEMUS390FLICState *flic =s390_get_qemu_flic (s390_get_flic ()); -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;if (!(env->psw.mask &PSW_MASK_EXT )) {return false;
@@ -199,10 +199,10 @@ bool s390_cpu_has_ext_int(S390CPU *cpu)return false; } -bool s390_cpu_has_io_int (S390CPU *cpu) +bool s390_cpu_has_io_int (const S390CPU *cpu) {QEMUS390FLICState *flic =s390_get_qemu_flic (s390_get_flic ()); -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;if (!(env->psw.mask &PSW_MASK_IO )) {return false;
@@ -211,21 +211,21 @@ bool s390_cpu_has_io_int(S390CPU *cpu)return qemu_s390_flic_has_io (flic, env->cregs[6 ]); } -bool s390_cpu_has_restart_int (S390CPU *cpu) +bool s390_cpu_has_restart_int (const S390CPU *cpu) { -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;return env->pending_int &INTERRUPT_RESTART ; } -bool s390_cpu_has_stop_int (S390CPU *cpu) +bool s390_cpu_has_stop_int (const S390CPU *cpu) { -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;return env->pending_int &INTERRUPT_STOP ; } -bool s390_cpu_has_int (S390CPU *cpu) +bool s390_cpu_has_int (const S390CPU *cpu) {if (!tcg_enabled ()) {return false;
Signature · 1 line
2.53.0
Re: [PATCH 05/13] target/s390x: Constify S390CPU for cpu_has_*() getters
Quoted 9 lines · Philippe Mathieu-Daudé
Add the const qualifier to S390CPU when the argument is accessed without modification.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/s390x/cpu.h | 2 +- target/s390x/s390x-internal.h | 12 ++++++------ target/s390x/interrupt.c | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-)
Re: [PATCH 05/13] target/s390x: Constify S390CPU for cpu_has_*() getters
In reply to Philippe Mathieu-DaudéQuoted 2 lines · Philippe Mathieu-Daudé
Add the const qualifier to S390CPU when the argument is accessed without modification.
Signature · 1 line
Marc-André Lureau <[email protected]>
Re: [PATCH 05/13] target/s390x: Constify S390CPU for cpu_has_*() getters
In reply to Philippe Mathieu-DaudéQuoted 9 lines · Philippe Mathieu-Daudé
Add the const qualifier to S390CPU when the argument is accessed without modification.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/s390x/cpu.h | 2 +- target/s390x/s390x-internal.h | 12 ++++++------ target/s390x/interrupt.c | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-)
Quoted 107 lines
target/s390x/cpu.h +1
-1@@ -854,7 +854,7 @@ static inline unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu) return 0; }#endif /* CONFIG_USER_ONLY */ -static inline uint8_t s390_cpu_get_state (S390CPU *cpu) +static inline uint8_t s390_cpu_get_state (const S390CPU *cpu) {return cpu->env.cpu_state; }target/s390x/s390x-internal.h +6
-6@@ -334,12 +334,12 @@ void cpu_inject_clock_comparator(S390CPU *cpu);void cpu_inject_cpu_timer (S390CPU *cpu);void cpu_inject_emergency_signal (S390CPU *cpu,uint16_t src_cpu_addr);int cpu_inject_external_call (S390CPU *cpu,uint16_t src_cpu_addr); -bool s390_cpu_has_io_int (S390CPU *cpu); -bool s390_cpu_has_ext_int (S390CPU *cpu); -bool s390_cpu_has_mcck_int (S390CPU *cpu); -bool s390_cpu_has_int (S390CPU *cpu); -bool s390_cpu_has_restart_int (S390CPU *cpu); -bool s390_cpu_has_stop_int (S390CPU *cpu); +bool s390_cpu_has_io_int (const S390CPU *cpu); +bool s390_cpu_has_ext_int (const S390CPU *cpu); +bool s390_cpu_has_mcck_int (const S390CPU *cpu); +bool s390_cpu_has_int (const S390CPU *cpu); +bool s390_cpu_has_restart_int (const S390CPU *cpu); +bool s390_cpu_has_stop_int (const S390CPU *cpu);void cpu_inject_restart (S390CPU *cpu);void cpu_inject_stop (S390CPU *cpu);#endif /* CONFIG_USER_ONLY */ target/s390x/interrupt.c +11
-11@@ -139,10 +139,10 @@ void s390_crw_mchk(void) fsc->inject_crw_mchk (fs); } -bool s390_cpu_has_mcck_int (S390CPU *cpu) +bool s390_cpu_has_mcck_int (const S390CPU *cpu) {QEMUS390FLICState *flic =s390_get_qemu_flic (s390_get_flic ()); -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;if (!(env->psw.mask &PSW_MASK_MCHECK )) {return false;@@ -157,10 +157,10 @@ bool s390_cpu_has_mcck_int(S390CPU *cpu)return false; } -bool s390_cpu_has_ext_int (S390CPU *cpu) +bool s390_cpu_has_ext_int (const S390CPU *cpu) {QEMUS390FLICState *flic =s390_get_qemu_flic (s390_get_flic ()); -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;if (!(env->psw.mask &PSW_MASK_EXT )) {return false;@@ -199,10 +199,10 @@ bool s390_cpu_has_ext_int(S390CPU *cpu)return false; } -bool s390_cpu_has_io_int (S390CPU *cpu) +bool s390_cpu_has_io_int (const S390CPU *cpu) {QEMUS390FLICState *flic =s390_get_qemu_flic (s390_get_flic ()); -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;if (!(env->psw.mask &PSW_MASK_IO )) {return false;@@ -211,21 +211,21 @@ bool s390_cpu_has_io_int(S390CPU *cpu)return qemu_s390_flic_has_io (flic, env->cregs[6 ]); } -bool s390_cpu_has_restart_int (S390CPU *cpu) +bool s390_cpu_has_restart_int (const S390CPU *cpu) { -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;return env->pending_int &INTERRUPT_RESTART ; } -bool s390_cpu_has_stop_int (S390CPU *cpu) +bool s390_cpu_has_stop_int (const S390CPU *cpu) { -CPUS390XState *env = &cpu->env; +const CPUS390XState *env = &cpu->env;return env->pending_int &INTERRUPT_STOP ; } -bool s390_cpu_has_int (S390CPU *cpu) +bool s390_cpu_has_int (const S390CPU *cpu) {if (!tcg_enabled ()) {return false;
PATCH 6/13 target/riscv: Constify @iprio argument in riscv_cpu_pending_to_irq()
In reply to Philippe Mathieu-Daudé@iprio[] is an array only accessed read-only.
--- target/riscv/cpu.h | 2 +- target/riscv/cpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
target/riscv/cpu.h +1 -1
@@ -642,7 +642,7 @@ int riscv_cpu_sirq_pending(CPURISCVState *env);int riscv_cpu_vsirq_pending (CPURISCVState *env);int riscv_cpu_pending_to_irq (CPURISCVState *env,int extirq,unsigned int extirq_def_prio, -uint64_t pending,uint8_t *iprio); +uint64_t pending,const uint8_t *iprio);bool riscv_cpu_fp_enabled (CPURISCVState *env);
target/riscv/cpu.c +1 -1
@@ -866,7 +866,7 @@ uint8_t riscv_cpu_default_priority(int irq)int riscv_cpu_pending_to_irq (CPURISCVState *env,int extirq,unsigned int extirq_def_prio, -uint64_t pending,uint8_t *iprio) +uint64_t pending,const uint8_t *iprio) {int irq, best_irq =RISCV_EXCP_NONE ;unsigned int prio, best_prio =UINT_MAX ;
Signature · 1 line
2.53.0
Re: [PATCH 06/13] target/riscv: Constify @iprio argument in riscv_cpu_pending_to_irq()
Quoted 1 line · Philippe Mathieu-Daudé
@iprio[] is an array only accessed read-only.
Signature · 1 line
Marc-André Lureau <[email protected]>
PATCH 7/13 target/riscv: Constify CPURISCVState for various cpu_*() getters
In reply to Philippe Mathieu-DaudéAdd the const qualifier to CPURISCVState when the
argument is accessed without modification.
--- target/riscv/cpu.h | 17 +++++++++-------- target/riscv/cpu.c | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-)
target/riscv/cpu.h +9 -8
@@ -636,7 +636,7 @@ int riscv_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);int riscv_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg);int riscv_cpu_hviprio_index2irq (int index,int *out_irq,int *out_rdzero);uint8_t riscv_cpu_default_priority (int irq); -uint64_t riscv_cpu_all_pending (CPURISCVState *env); +uint64_t riscv_cpu_all_pending (const CPURISCVState *env);int riscv_cpu_mirq_pending (CPURISCVState *env);int riscv_cpu_sirq_pending (CPURISCVState *env);int riscv_cpu_vsirq_pending (CPURISCVState *env);
@@ -746,7 +746,7 @@ FIELD(EXT_TB_FLAGS, BIG_ENDIAN, 33, 1)#ifdef TARGET_RISCV32 #define riscv_cpu_mxl (env) ((void)(env), MXL_RV32)#else -static inline RISCVMXL riscv_cpu_mxl (CPURISCVState *env) +static inline RISCVMXL riscv_cpu_mxl (const CPURISCVState *env) {return env->misa_mxl; }
@@ -759,7 +759,7 @@ static inline const RISCVCPUConfig *riscv_cpu_cfg(CPURISCVState *env) }#if !defined(CONFIG_USER_ONLY ) -static inline privilege_mode_t cpu_address_mode (CPURISCVState *env) +static inline privilege_mode_t cpu_address_mode (const CPURISCVState *env) {privilege_mode_t mode = env->priv;
@@ -769,7 +769,8 @@ static inline privilege_mode_t cpu_address_mode(CPURISCVState *env)return mode; } -static inline RISCVMXL cpu_get_xl (CPURISCVState *env,privilege_mode_t mode) +static inline RISCVMXL cpu_get_xl (const CPURISCVState *env, +privilege_mode_t mode) {RISCVMXL xl = env->misa_mxl;/*
@@ -797,7 +798,7 @@ static inline RISCVMXL cpu_get_xl(CPURISCVState *env, privilege_mode_t mode)#if defined(TARGET_RISCV32 )#define cpu_recompute_xl (env) ((void)(env), MXL_RV32)#else -static inline RISCVMXL cpu_recompute_xl (CPURISCVState *env) +static inline RISCVMXL cpu_recompute_xl (const CPURISCVState *env) {#if !defined(CONFIG_USER_ONLY )return cpu_get_xl (env, env->priv);
@@ -810,7 +811,7 @@ static inline RISCVMXL cpu_recompute_xl(CPURISCVState *env)#if defined(TARGET_RISCV32 )#define cpu_address_xl (env) ((void)(env), MXL_RV32)#else -static inline RISCVMXL cpu_address_xl (CPURISCVState *env) +static inline RISCVMXL cpu_address_xl (const CPURISCVState *env) {#ifdef CONFIG_USER_ONLY return env->xl;
@@ -822,7 +823,7 @@ static inline RISCVMXL cpu_address_xl(CPURISCVState *env) }#endif -static inline uint16_t riscv_cpu_xlen (CPURISCVState *env) +static inline uint16_t riscv_cpu_xlen (const CPURISCVState *env) {return 16 << env->xl; }
@@ -830,7 +831,7 @@ static inline uint16_t riscv_cpu_xlen(CPURISCVState *env)#ifdef TARGET_RISCV32 #define riscv_cpu_sxl (env) ((void)(env), MXL_RV32)#else -static inline RISCVMXL riscv_cpu_sxl (CPURISCVState *env) +static inline RISCVMXL riscv_cpu_sxl (const CPURISCVState *env) {#ifdef CONFIG_USER_ONLY return env->misa_mxl;
target/riscv/cpu.c +1 -1
@@ -908,7 +908,7 @@ int riscv_cpu_pending_to_irq(CPURISCVState *env,* using hvip bits 13:63 from HS-mode. Those are returned in * riscv_cpu_sirq_pending() and riscv_cpu_vsirq_pending(). */ -uint64_t riscv_cpu_all_pending (CPURISCVState *env) +uint64_t riscv_cpu_all_pending (const CPURISCVState *env) {uint32_t gein =get_field (env->hstatus,HSTATUS_VGEIN );uint64_t vsgein = (env->hgeip & (1ULL << gein)) ?MIP_VSEIP :0 ;
Signature · 1 line
2.53.0
Re: [PATCH 07/13] target/riscv: Constify CPURISCVState for various cpu_*() getters
Quoted 2 lines · Philippe Mathieu-Daudé
Add the const qualifier to CPURISCVState when the
argument is accessed without modification.
Signature · 1 line
Marc-André Lureau <[email protected]>
PATCH 8/13 target/sparc: Constify CPUSPARCState for various cpu_*() getters
In reply to Philippe Mathieu-DaudéAdd the const qualifier to CPUSPARCState when
the argument is accessed without modification.
--- target/sparc/cpu.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
target/sparc/cpu.h +6 -6
@@ -680,28 +680,28 @@ hwaddr cpu_get_phys_page_nofault(CPUSPARCState *env, target_ulong addr,#endif #if defined (TARGET_SPARC64 ) -static inline int cpu_has_hypervisor (CPUSPARCState *env1) +static inline int cpu_has_hypervisor (const CPUSPARCState *env1) {return env1->def.features &CPU_FEATURE_HYPV ; } -static inline int cpu_hypervisor_mode (CPUSPARCState *env1) +static inline int cpu_hypervisor_mode (const CPUSPARCState *env1) {return cpu_has_hypervisor (env1) && (env1->hpstate &HS_PRIV ); } -static inline int cpu_supervisor_mode (CPUSPARCState *env1) +static inline int cpu_supervisor_mode (const CPUSPARCState *env1) {return env1->pstate &PS_PRIV ; }#else -static inline int cpu_supervisor_mode (CPUSPARCState *env1) +static inline int cpu_supervisor_mode (const CPUSPARCState *env1) {return env1->psrs; }#endif -static inline int cpu_interrupts_enabled (CPUSPARCState *env1) +static inline int cpu_interrupts_enabled (const CPUSPARCState *env1) {#if !defined (TARGET_SPARC64 )if (env1->psret !=0 )
@@ -715,7 +715,7 @@ static inline int cpu_interrupts_enabled(CPUSPARCState *env1)return 0 ; } -static inline int cpu_pil_allowed (CPUSPARCState *env1,int pil) +static inline int cpu_pil_allowed (const CPUSPARCState *env1,int pil) {#if !defined(TARGET_SPARC64 )/* level 15 is non-maskable on sparc v8 */
Signature · 1 line
2.53.0
Re: [PATCH 08/13] target/sparc: Constify CPUSPARCState for various cpu_*() getters
Quoted 2 lines · Philippe Mathieu-Daudé
Add the const qualifier to CPUSPARCState when
the argument is accessed without modification.
Signature · 1 line
Marc-André Lureau <[email protected]>
RFC PATCH 9/13 cpus: Add const-qualified CPU environment accessors
In reply to Philippe Mathieu-DaudéIntroduce const-qualified variants of cpu_env() and env_archcpu(), to safely access CPU architecture state when it should not be modified.
--- include/exec/cpu-common.h | 11 +++++++++++ include/hw/core/cpu.h | 6 ++++++ 2 files changed, 17 insertions(+)
include/exec/cpu-common.h +11 -0
@@ -79,6 +79,17 @@ static inline bool cpu_loop_exit_requested(const CPUState *cpu) }#endif /* CONFIG_TCG */ +/** +* env_archcpu_const(env) +* @env: The architecture environment (const). +* +* Return the const ArchCPU associated with the environment. +*/ +static inline const ArchCPU *env_archcpu_const (const CPUArchState *env) +{ +return (const void *)env -sizeof (CPUState); +} +/** * env_archcpu(env) * @env: The architecture environment
include/hw/core/cpu.h +6 -0
@@ -594,6 +594,12 @@ struct CPUState {QEMU_BUILD_BUG_ON (offsetof(CPUState , neg) !=sizeof (CPUState) -sizeof (CPUNegativeOffsetState)); +static inline const CPUArchState *cpu_env_const (const CPUState *cpu) +{ +/* We validate that CPUArchState follows CPUState in cpu-target.c */ +return (const CPUArchState *)(cpu +1 ); +} +static inline CPUArchState *cpu_env (CPUState *cpu) {/* We validate that CPUArchState follows CPUState in cpu-target.c */
Signature · 1 line
2.53.0
Re: [RFC PATCH 09/13] cpus: Add const-qualified CPU environment accessors
Quoted 3 lines · Philippe Mathieu-Daudé
Introduce const-qualified variants of
cpu_env()andenv_archcpu(), to safely access CPU architecture state when it should not be modified.
Signature · 1 line
Marc-André Lureau <[email protected]>
Re: [RFC PATCH 09/13] cpus: Add const-qualified CPU environment accessors
In reply to Philippe Mathieu-DaudéQuoted 39 lines · Philippe Mathieu-Daudé
Introduce const-qualified variants of
cpu_env()andenv_archcpu(), to safely access CPU architecture state when it should not be modified.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/exec/cpu-common.h | 11 +++++++++++ include/hw/core/cpu.h | 6 ++++++ 2 files changed, 17 insertions(+)include/exec/cpu-common.h +11
-0@@ -79,6 +79,17 @@ static inline bool cpu_loop_exit_requested(const CPUState *cpu) }#endif /* CONFIG_TCG */ +/** +* env_archcpu_const(env) +* @env: The architecture environment (const). +* +* Return the const ArchCPU associated with the environment. +*/ +static inline const ArchCPU *env_archcpu_const (const CPUArchState *env) +{ +return (const void *)env -sizeof (CPUState); +} +/** * env_archcpu(env) * @env: The architecture environment include/hw/core/cpu.h +0
-0@@ -594,6 +594,12 @@ struct CPUState {QEMU_BUILD_BUG_ON (offsetof(CPUState , neg) !=sizeof (CPUState) -sizeof (CPUNegativeOffsetState));
include/hw/core/cpu.h struct CPUState { · line 605
Quoted 10 lines
include/hw/core/cpu.h +6
-0+static inline const CPUArchState *cpu_env_const (const CPUState *cpu) +{ +/* We validate that CPUArchState follows CPUState in cpu-target.c */ +return (const CPUArchState *)(cpu +1 ); +} +static inline CPUArchState *cpu_env (CPUState *cpu) {/* We validate that CPUArchState follows CPUState in cpu-target.c */
I wonder if we can use _Generic to make this automatic, rather than have to choose between two different function names.
r~
Re: [RFC PATCH 09/13] cpus: Add const-qualified CPU environment accessors
Quoted 43 lines · Richard Henderson
Quoted 42 lines · Philippe Mathieu-Daudé
Introduce const-qualified variants of
cpu_env()andenv_archcpu(), to safely access CPU architecture state when it should not be modified.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
include/exec/cpu-common.h| 11 +++++++++++
include/hw/core/cpu.h | 6 ++++++2 files changed, 17 insertions(+)include/exec/cpu-common.h +11
-0@@ -79,6 +79,17 @@ static inline bool cpu_loop_exit_requested(const CPUState *cpu) } #endif /* CONFIG_TCG */ +/** +* env_archcpu_const(env) +* @env: The architecture environment (const). +* +* Return the const ArchCPU associated with the environment. +*/ +static inline const ArchCPU *env_archcpu_const (const CPUArchState *env) +{ + return (const void *)env - sizeof(CPUState); +} + /*** env_archcpu(env) * @env: The architecture environment include/hw/core/cpu.h +0
-0@@ -594,6 +594,12 @@ struct CPUState {
QEMU_BUILD_BUG_ON(offsetof(CPUState, neg) != sizeof(CPUState) - sizeof(CPUNegativeOffsetState));include/hw/core/cpu.h +3
-0+static inline const CPUArchState *cpu_env_const (const CPUState *cpu) +{ + /* We validate that CPUArchState follows CPUState in cpu-target.c */
Quoted 8 lines
Quoted 6 lines
+ return (const CPUArchState *)(cpu + 1);
include/hw/core/cpu.h +2
-0+} +static inline CPUArchState *cpu_env(CPUState *cpu)
{
/* We validate that CPUArchState follows CPUState in cpu-target.c*/I wonder if we can use
_Genericto make this automatic, rather than have to choose between two different function names.
Eh clever :) This seems to work:
#define env_archcpu_(p) _Generic(*(p), \
CPUArchState: (void *)p, \
const CPUArchState: (const void *)p)Re: [RFC PATCH 09/13] cpus: Add const-qualified CPU environment accessors
Quoted 53 lines · Philippe Mathieu-Daudé
Quoted 44 lines · Richard Henderson
Quoted 43 lines · Philippe Mathieu-Daudé
Introduce const-qualified variants of
cpu_env()andenv_archcpu(), to safely access CPU architecture state when it should not be modified.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
include/exec/cpu-common.h| 11 +++++++++++
include/hw/core/cpu.h | 6 ++++++2 files changed, 17 insertions(+)include/exec/cpu-common.h +11
-0@@ -79,6 +79,17 @@ static inline bool cpu_loop_exit_requested(const CPUState *cpu) } #endif /* CONFIG_TCG */ +/** +* env_archcpu_const(env) +* @env: The architecture environment (const). +* +* Return the const ArchCPU associated with the environment. +*/ +static inline const ArchCPU *env_archcpu_const (const CPUArchState *env) +{ + return (const void *)env - sizeof(CPUState); +} + /*** env_archcpu(env) * @env: The architecture environment include/hw/core/cpu.h +0
-0@@ -594,6 +594,12 @@ struct CPUState {
QEMU_BUILD_BUG_ON(offsetof(CPUState, neg) != sizeof(CPUState) - sizeof(CPUNegativeOffsetState));include/hw/core/cpu.h +3
-0+static inline const CPUArchState *cpu_env_const (const CPUState *cpu) +{ + /* We validate that CPUArchState follows CPUState in cpu-
target.c*/Quoted 8 lines
Quoted 6 lines
+ return (const CPUArchState *)(cpu + 1);
include/hw/core/cpu.h +2
-0+} +static inline CPUArchState *cpu_env(CPUState *cpu)
{
/* We validate that CPUArchState follows CPUState in cpu-target.c*/I wonder if we can use
_Genericto make this automatic, rather than have to choose between two different function names.
Quoted 5 lines
Eh clever :) This seems to work:
#define
env_archcpu_(p)_Generic(*(p), \
CPUArchState: (void *)p, \
const CPUArchState: (const void *)p)
Actually simpler and even well readable:
-- >8 --
include/exec/cpu-common.h +10 -19
@@ -85,21 +85,11 @@ static inline bool cpu_loop_exit_requested(const CPUState *cpu)* * Return the ArchCPU associated with the environment. */ -static inline ArchCPU *env_archcpu (CPUArchState *env) -{ -return (void *)env -sizeof (CPUState); -} - -/** -* env_cpu_const(env) -* @env: The architecture environment -* -* Return the CPUState associated with the environment. -*/ -static inline const CPUState *env_cpu_const (const CPUArchState *env) -{ -return (void *)env -sizeof (CPUState); -} +#define env_archcpu (env) _Generic(*(env), \ + CPUArchState: \ + (ArchCPU *)((void *)env - sizeof(CPUState)), \ + const CPUArchState: \ + (const ArchCPU *)((const void *)env - sizeof(CPUState)))/** * env_cpu(env)
@@ -107,9 +97,10 @@ static inline const CPUState *env_cpu_const(const CPUArchState *env)* * Return the CPUState associated with the environment. */ -static inline CPUState *env_cpu (CPUArchState *env) -{ -return (CPUState *)env_cpu_const (env); -} +#define env_cpu (env) _Generic(*(env), \ + CPUArchState: \ + (CPUState *)((void *)env - sizeof(CPUState)), \ + const CPUArchState: \ + (const CPUState *)((const void *)env - sizeof(CPUState)))#endif /* CPU_COMMON_H */
---
Marc-André Lureau
Reviewed-byRe: [RFC PATCH 09/13] cpus: Add const-qualified CPU environment accessors
Quoted 113 lines · Philippe Mathieu-Daudé
Quoted 55 lines · Philippe Mathieu-Daudé
Quoted 46 lines · Richard Henderson
Quoted 45 lines · Philippe Mathieu-Daudé
Introduce const-qualified variants of
cpu_env()andenv_archcpu(), to safely access CPU architecture state when it should not be modified.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/exec/cpu-common.h | 11 +++++++++++ include/hw/core/cpu.h | 6 ++++++ 2 files changed, 17 insertions(+)include/exec/cpu-common.h +11
-0@@ -79,6 +79,17 @@ static inline bool cpu_loop_exit_requested(const CPUState *cpu) }#endif /* CONFIG_TCG */ +/** +* env_archcpu_const(env) +* @env: The architecture environment (const). +* +* Return the const ArchCPU associated with the environment. +*/ +static inline const ArchCPU *env_archcpu_const (const CPUArchState *env) +{ +return (const void *)env -sizeof (CPUState); +} +/** * env_archcpu(env) * @env: The architecture environment include/hw/core/cpu.h +3
-0@@ -594,6 +594,12 @@ struct CPUState {QEMU_BUILD_BUG_ON (offsetof(CPUState , neg) !=sizeof (CPUState) -sizeof (CPUNegativeOffsetState)); +static inline const CPUArchState *cpu_env_const (const CPUState *cpu) +{ +/* We validate that CPUArchState follows CPUState in cpu-
target.c*/include/hw/core/cpu.h +2
-0+return (const CPUArchState *)(cpu +1 ); +}Quoted 8 lines
Quoted 5 lines
+
static inline CPUArchState *cpu_env(CPUState *cpu){ /* We validate that CPUArchState follows CPUState in cpu-
target.c*/I wonder if we can use
_Genericto make this automatic, rather than have to choose between two different function names.Quoted 5 lines
Eh clever :) This seems to work:
#define env_archcpu_(p) _Generic(*(p), \ CPUArchState: (void *)p, \ const CPUArchState: (const void *)p)Actually simpler and even well readable:
-- >8 --
include/exec/cpu-common.h +5
-15@@ -85,21 +85,11 @@ static inline bool cpu_loop_exit_requested(constCPUState *cpu) * * Return the ArchCPU associated with the environment. */ -static inline ArchCPU *env_archcpu (CPUArchState *env) -{ -return (void *)env -sizeof (CPUState); -} - -/** -* env_cpu_const(env) -* @env: The architecture environment -* -* Return the CPUState associated with the environment. -*/ -static inline const CPUState *env_cpu_const (const CPUArchState *env) -{ -return (void *)env -sizeof (CPUState); -} +#define env_archcpu (env) _Generic(*(env), \ + CPUArchState: \ + (ArchCPU *)((void *)env - sizeof(CPUState)), \ + const CPUArchState: \ + (const ArchCPU *)((const void *)env - sizeof(CPUState)))/** *
env_cpu(env)include/exec/cpu-common.h +5
-4@@ -107,9 +97,10 @@ static inline const CPUState *env_cpu_const(constCPUArchState *env) * * Return the CPUState associated with the environment. */ -static inline CPUState *env_cpu (CPUArchState *env) -{ -return (CPUState *)env_cpu_const (env); -} +#define env_cpu (env) _Generic(*(env), \ + CPUArchState: \ + (CPUState *)((void *)env - sizeof(CPUState)), \ + const CPUArchState: \ + (const CPUState *)((const void *)env - sizeof(CPUState)))
Quoted 3 lines
#endif /*
CPU_COMMON_H*/
---
lgtm too
Signature · 1 line
Marc-André Lureau
Richard Henderson
Reviewed-byRe: [RFC PATCH 09/13] cpus: Add const-qualified CPU environment accessors
In reply to Philippe Mathieu-DaudéQuoted 40 lines · Philippe Mathieu-Daudé
Actually simpler and even well readable:
-- >8 --
include/exec/cpu-common.h +5
-17@@ -85,21 +85,11 @@ static inline bool cpu_loop_exit_requested(const CPUState *cpu)* * Return the ArchCPU associated with the environment. */ -static inline ArchCPU *env_archcpu (CPUArchState *env) -{ - return (void *)env - sizeof(CPUState); -} - -/** -* env_cpu_const(env) -* @env: The architecture environment -* -* Return the CPUState associated with the environment. -*/ -static inline const CPUState *env_cpu_const (const CPUArchState *env) -{ - return (void *)env - sizeof(CPUState); -} +#define env_archcpu (env) _Generic(*(env), \ + CPUArchState: \ + (ArchCPU *)((void *)env - sizeof(CPUState)), \ + const CPUArchState: \ + (const ArchCPU *)((const void *)env - sizeof(CPUState))) /*** env_cpu(env) @@ -107,9 +97,10 @@ static inline const CPUState *env_cpu_const(const CPUArchState *env)* * Return the CPUState associated with the environment. */ -static inline CPUState *env_cpu (CPUArchState *env) -{
include/exec/cpu-common.h static inline const CPUState *env_cpu_const(const CPUArchState *env)
Quoted 10 lines
include/exec/cpu-common.h +5
-3- return (CPUState *)env_cpu_const(env); -} +#define env_cpu (env) _Generic(*(env), \ + CPUArchState: \ + (CPUState *)((void *)env - sizeof(CPUState)), \ + const CPUArchState: \ + (const CPUState *)((const void *)env - sizeof(CPUState))) #endif /* CPU_COMMON_H */ ---
Exactly what I had in mind, thanks.
r~
RFC PATCH 10/13 target/riscv: Constify CPURISCVState for various cpu_*() getters
In reply to Philippe Mathieu-DaudéAdd the const qualifier to CPURISCVState when the
argument is accessed without modification.
Note we have to use the recently introducedenv_archcpu_const() helper in riscv_cpu_cfg().
--- target/riscv/cpu.h | 12 ++++++------ target/riscv/cpu.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-)
target/riscv/cpu.h +6 -6
@@ -637,10 +637,10 @@ int riscv_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);int riscv_cpu_hviprio_index2irq (int index,int *out_irq,int *out_rdzero);uint8_t riscv_cpu_default_priority (int irq);uint64_t riscv_cpu_all_pending (const CPURISCVState *env); -int riscv_cpu_mirq_pending (CPURISCVState *env); -int riscv_cpu_sirq_pending (CPURISCVState *env); -int riscv_cpu_vsirq_pending (CPURISCVState *env); -int riscv_cpu_pending_to_irq (CPURISCVState *env, +int riscv_cpu_mirq_pending (const CPURISCVState *env); +int riscv_cpu_sirq_pending (const CPURISCVState *env); +int riscv_cpu_vsirq_pending (const CPURISCVState *env); +int riscv_cpu_pending_to_irq (const CPURISCVState *env,int extirq,unsigned int extirq_def_prio,uint64_t pending,const uint8_t *iprio);
@@ -753,9 +753,9 @@ static inline RISCVMXL riscv_cpu_mxl(const CPURISCVState *env)#endif #define riscv_cpu_mxl_bits (env) (1UL << (4 + riscv_cpu_mxl(env))) -static inline const RISCVCPUConfig *riscv_cpu_cfg (CPURISCVState *env) +static inline const RISCVCPUConfig *riscv_cpu_cfg (const CPURISCVState *env) { -return &env_archcpu (env)->cfg; +return &env_archcpu_const (env)->cfg; }#if !defined(CONFIG_USER_ONLY )
target/riscv/cpu.c +4 -4
@@ -864,7 +864,7 @@ uint8_t riscv_cpu_default_priority(int irq)return default_iprio[irq] ? default_iprio[irq] :IPRIO_MMAXIPRIO ; }; -int riscv_cpu_pending_to_irq (CPURISCVState *env, +int riscv_cpu_pending_to_irq (const CPURISCVState *env,int extirq,unsigned int extirq_def_prio,uint64_t pending,const uint8_t *iprio) {
@@ -917,7 +917,7 @@ uint64_t riscv_cpu_all_pending(const CPURISCVState *env)return (env->mip | vsgein | vstip) & env->mie; } -int riscv_cpu_mirq_pending (CPURISCVState *env) +int riscv_cpu_mirq_pending (const CPURISCVState *env) {uint64_t irqs =riscv_cpu_all_pending (env) & ~env->mideleg & ~(MIP_SGEIP |MIP_VSSIP |MIP_VSTIP |MIP_VSEIP );
@@ -926,7 +926,7 @@ int riscv_cpu_mirq_pending(CPURISCVState *env) irqs, env->miprio); } -int riscv_cpu_sirq_pending (CPURISCVState *env) +int riscv_cpu_sirq_pending (const CPURISCVState *env) {uint64_t irqs =riscv_cpu_all_pending (env) & env->mideleg & ~env->hideleg;uint64_t irqs_f = env->mvip & env->mvien & ~env->mideleg & env->sie;
@@ -935,7 +935,7 @@ int riscv_cpu_sirq_pending(CPURISCVState *env) irqs | irqs_f, env->siprio); } -int riscv_cpu_vsirq_pending (CPURISCVState *env) +int riscv_cpu_vsirq_pending (const CPURISCVState *env) {uint64_t irqs =riscv_cpu_all_pending (env) & env->mideleg & env->hideleg;uint64_t irqs_f_vs = env->hvip & env->hvien & ~env->hideleg & env->vsie;
Signature · 1 line
2.53.0
Re: [RFC PATCH 10/13] target/riscv: Constify CPURISCVState for various cpu_*() getters
Quoted 8 lines · Philippe Mathieu-Daudé
Add the const qualifier to CPURISCVState when the
argument is accessed without modification.Note we have to use the recently introduced
env_archcpu_const()helper inriscv_cpu_cfg().[...]
Signature · 1 line
Marc-André Lureau <[email protected]>
RFC PATCH 11/13 target/hexagon: Constify CPUHexagonState in hexagon_thread_is_enabled()
In reply to Philippe Mathieu-DaudéUse the recently introduced env_archcpu_const() helper and qualify @env as being const in hexagon_thread_is_enabled().
--- target/hexagon/cpu.h | 2 +- target/hexagon/cpu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
target/hexagon/cpu.h +1 -1
@@ -216,7 +216,7 @@ G_NORETURN void hexagon_raise_exception_err(CPUHexagonState *env,* @return true if the @a thread_env hardware thread is * not stopped. */ -bool hexagon_thread_is_enabled (CPUHexagonState *thread_env); +bool hexagon_thread_is_enabled (const CPUHexagonState *thread_env);uint32_t hexagon_greg_read (CPUHexagonState *env,uint32_t reg);void hexagon_cpu_soft_reset (CPUHexagonState *env);#endif
target/hexagon/cpu.c +2 -2
@@ -345,9 +345,9 @@ static void hexagon_cpu_synchronize_from_tb(CPUState *cs, }#ifndef CONFIG_USER_ONLY -bool hexagon_thread_is_enabled (CPUHexagonState *env) +bool hexagon_thread_is_enabled (const CPUHexagonState *env) { -HexagonCPU *cpu =env_archcpu (env); +const HexagonCPU *cpu =env_archcpu_const (env);uint32_t modectl;uint32_t thread_enabled_mask;bool E_bit;
Signature · 1 line
2.53.0
Re: [RFC PATCH 11/13] target/hexagon: Constify CPUHexagonState in hexagon_thread_is_enabled()
Quoted 2 lines · Philippe Mathieu-Daudé
Use the recently introduced
env_archcpu_const()helper and qualify @env as being const inhexagon_thread_is_enabled().
Signature · 1 line
Marc-André Lureau <[email protected]>
Re: [RFC PATCH 11/13] target/hexagon: Constify CPUHexagonState in hexagon_thread_is_enabled()
In reply to Philippe Mathieu-DaudéQuoted 5 lines · Philippe Mathieu-Daudé
Use the recently introduced
env_archcpu_const()helper and qualify @env as being const inhexagon_thread_is_enabled().Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Quoted 33 lines
target/hexagon/cpu.h | 2 +- target/hexagon/cpu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)target/hexagon/cpu.h +1
-1@@ -216,7 +216,7 @@ G_NORETURN void hexagon_raise_exception_err(CPUHexagonState *env,* @return true if the @a thread_env hardware thread is * not stopped. */ -bool hexagon_thread_is_enabled (CPUHexagonState *thread_env); +bool hexagon_thread_is_enabled (const CPUHexagonState *thread_env);uint32_t hexagon_greg_read (CPUHexagonState *env,uint32_t reg);void hexagon_cpu_soft_reset (CPUHexagonState *env);#endif target/hexagon/cpu.c +2
-2@@ -345,9 +345,9 @@ static void hexagon_cpu_synchronize_from_tb(CPUState *cs, }#ifndef CONFIG_USER_ONLY -bool hexagon_thread_is_enabled (CPUHexagonState *env) +bool hexagon_thread_is_enabled (const CPUHexagonState *env) { -HexagonCPU *cpu =env_archcpu (env); +const HexagonCPU *cpu =env_archcpu_const (env);uint32_t modectl;uint32_t thread_enabled_mask;bool E_bit;
RFC PATCH 12/13 target/mips: Constify CPUMIPSState in mips_vpe_active()
In reply to Philippe Mathieu-DaudéUse the recently introduced env_archcpu_const() helper and qualify @env as being const in mips_vpe_active().
--- target/mips/internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/mips/internal.h +2 -2
@@ -247,9 +247,9 @@ static inline void restore_pamask(CPUMIPSState *env) } } -static inline int mips_vpe_active (CPUMIPSState *env) +static inline int mips_vpe_active (const CPUMIPSState *env) { -MIPSCPU *cpu =env_archcpu (env); +const MIPSCPU *cpu =env_archcpu_const (env);int active =1 ;/* Check that the VPE is enabled. */
Signature · 1 line
2.53.0
Re: [RFC PATCH 12/13] target/mips: Constify CPUMIPSState in mips_vpe_active()
Quoted 2 lines · Philippe Mathieu-Daudé
Use the recently introduced
env_archcpu_const()helper and qualify @env as being const inmips_vpe_active().
Signature · 1 line
Marc-André Lureau <[email protected]>
RFC PATCH 13/13 cpus: Constify @cpu in SysemuCPUOps::has_work() handler
In reply to Philippe Mathieu-DaudéAll functions called by target has_work() handler take a const @cpu argument. We can now fulfill the comment added in commit c2804566f6 ("target/arm: do not clear halting reason in has_work helper"), qualifying the handler const to denote its idempotency.
--- include/hw/core/sysemu-cpu-ops.h | 4 ++-- target/loongarch/internals.h | 2 +- target/riscv/internals.h | 2 +- target/s390x/s390x-internal.h | 2 +- target/alpha/cpu.c | 2 +- target/arm/cpu.c | 4 ++-- target/avr/cpu.c | 5 +++-- target/hexagon/cpu.c | 4 ++-- target/hppa/cpu.c | 2 +- target/i386/cpu.c | 2 +- target/loongarch/cpu.c | 4 ++-- target/m68k/cpu.c | 2 +- target/microblaze/cpu.c | 2 +- target/mips/cpu.c | 4 ++-- target/or1k/cpu.c | 2 +- target/ppc/cpu_init.c | 2 +- target/riscv/cpu.c | 2 +- target/rx/cpu.c | 2 +- target/s390x/cpu-system.c | 2 +- target/sh4/cpu.c | 2 +- target/sparc/cpu.c | 4 ++-- target/tricore/cpu.c | 4 ++-- target/xtensa/cpu.c | 4 ++-- 23 files changed, 33 insertions(+), 32 deletions(-)
include/hw/core/sysemu-cpu-ops.h +2 -2
@@ -19,10 +19,10 @@ typedef struct SysemuCPUOps {/** * @has_work: Callback for checking if there is work to do. * -* This function should be idempotent (i.e. not change state) as +* This function is idempotent (i.e. not change state) as * it will likely be queried multiple times before a CPU resumes. */ -bool (*has_work)(CPUState *cpu);/* MANDATORY NON-NULL */ +bool (*has_work)(const CPUState *cpu);/* MANDATORY NON-NULL */ /** * @get_memory_mapping: Callback for obtaining the memory mappings. */
target/loongarch/internals.h +1 -1
@@ -38,7 +38,7 @@ uint64_t cpu_loongarch_get_constant_timer_counter(LoongArchCPU *cpu);uint64_t cpu_loongarch_get_constant_timer_ticks (LoongArchCPU *cpu);void cpu_loongarch_store_constant_timer_config (LoongArchCPU *cpu,uint64_t value); -bool loongarch_cpu_has_work (CPUState *cs); +bool loongarch_cpu_has_work (const CPUState *cs);bool cpu_loongarch_hw_interrupts_pending (const CPULoongArchState *env);#endif /* !CONFIG_USER_ONLY */
target/riscv/internals.h +1 -1
@@ -203,7 +203,7 @@ static inline target_ulong get_xepc_mask(CPURISCVState *env)#ifndef CONFIG_USER_ONLY /* Our implementation of SysemuCPUOps::has_work */ -bool riscv_cpu_has_work (CPUState *cs); +bool riscv_cpu_has_work (const CPUState *cs);#endif /* Zjpm addr masking routine */
target/s390x/s390x-internal.h +1 -1
@@ -248,7 +248,7 @@ bool s390_cpu_system_realize(DeviceState *dev, Error **errp);void s390_cpu_finalize (Object *obj);void s390_cpu_system_class_init (CPUClass *cc);void s390_cpu_machine_reset_cb (void *opaque); -bool s390_cpu_has_work (CPUState *cs); +bool s390_cpu_has_work (const CPUState *cs);#endif /* CONFIG_USER_ONLY */
target/alpha/cpu.c +1 -1
@@ -77,7 +77,7 @@ static void alpha_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool alpha_cpu_has_work (CPUState *cs) +static bool alpha_cpu_has_work (const CPUState *cs) {/* Here we are checking to see if the CPU should wake up from HALT. We will have gotten into this state only for WTINT from PALmode. */
target/arm/cpu.c +2 -2
@@ -141,9 +141,9 @@ int arm_cpu_mmu_index(CPUState *cs, bool ifetch)* CPU_INTERRUPT_*NMI anyway. So we might as well accept NMI here * unconditionally. */ -static bool arm_cpu_has_work (CPUState *cs) +static bool arm_cpu_has_work (const CPUState *cs) { -ARMCPU *cpu =ARM_CPU (cs); +const ARMCPU *cpu =ARM_CPU (cs);/* * Only another PSCI call can wake the CPU up in which case the
target/avr/cpu.c +3 -2
@@ -23,6 +23,7 @@#include "qemu/qemu-print.h" #include "exec/translation-block.h" #include "system/address-spaces.h" +#include "hw/core/cpu.h" #include "cpu.h" #include "disas/dis-asm.h" #include "tcg/debug-assert.h"
@@ -43,10 +44,10 @@ static vaddr avr_cpu_get_pc(CPUState *cs)return cpu->env.pc_w *2 ; } -static bool avr_cpu_has_work (CPUState *cs) +static bool avr_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_RESET ) - &&cpu_interrupts_enabled (cpu_env (cs)); + &&cpu_interrupts_enabled (cpu_env_const (cs)); }static int avr_cpu_mmu_index (CPUState *cs,bool ifetch)
target/hexagon/cpu.c +2 -2
@@ -364,9 +364,9 @@ bool hexagon_thread_is_enabled(const CPUHexagonState *env)return E_bit; } -static bool hexagon_cpu_has_work (CPUState *cs) +static bool hexagon_cpu_has_work (const CPUState *cs) { -CPUHexagonState *env =cpu_env (cs); +const CPUHexagonState *env =cpu_env_const (cs); return hexagon_thread_is_enabled(env) && (cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_SWI
target/hppa/cpu.c +1 -1
@@ -134,7 +134,7 @@ static void hppa_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool hppa_cpu_has_work (CPUState *cs) +static bool hppa_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }
target/i386/cpu.c +1 -1
@@ -10639,7 +10639,7 @@ int x86_cpu_pending_interrupt(const CPUState *cs, int interrupt_request)return 0 ; } -static bool x86_cpu_has_work (CPUState *cs) +static bool x86_cpu_has_work (const CPUState *cs) {return x86_cpu_pending_interrupt (cs, cs->interrupt_request) !=0 ; }
target/loongarch/cpu.c +2 -2
@@ -96,12 +96,12 @@ bool cpu_loongarch_hw_interrupts_pending(const CPULoongArchState *env)#endif #ifndef CONFIG_USER_ONLY -bool loongarch_cpu_has_work (CPUState *cs) +bool loongarch_cpu_has_work (const CPUState *cs) {bool has_work = false;if (cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ) && -cpu_loongarch_hw_interrupts_pending (cpu_env (cs))) { +cpu_loongarch_hw_interrupts_pending (cpu_env_const (cs))) { has_work = true; }
target/m68k/cpu.c +1 -1
@@ -76,7 +76,7 @@ static void m68k_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool m68k_cpu_has_work (CPUState *cs) +static bool m68k_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ); }
target/microblaze/cpu.c +1 -1
@@ -127,7 +127,7 @@ static void mb_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool mb_cpu_has_work (CPUState *cs) +static bool mb_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }
target/mips/cpu.c +2 -2
@@ -134,9 +134,9 @@ static vaddr mips_cpu_get_pc(CPUState *cs) }#if !defined(CONFIG_USER_ONLY ) -static bool mips_cpu_has_work (CPUState *cs) +static bool mips_cpu_has_work (const CPUState *cs) { -CPUMIPSState *env =cpu_env (cs); +const CPUMIPSState *env =cpu_env_const (cs);bool has_work = false;/*
target/or1k/cpu.c +1 -1
@@ -76,7 +76,7 @@ static void openrisc_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool openrisc_cpu_has_work (CPUState *cs) +static bool openrisc_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_TIMER ); }
target/ppc/cpu_init.c +1 -1
@@ -7224,7 +7224,7 @@ static int ppc_cpu_mmu_index(CPUState *cs, bool ifetch)#endif /* CONFIG_TCG */ #ifndef CONFIG_USER_ONLY -static bool ppc_cpu_has_work (CPUState *cs) +static bool ppc_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ); }
target/riscv/cpu.c +1 -1
@@ -950,7 +950,7 @@ int riscv_cpu_vsirq_pending(const CPURISCVState *env) (irqs | irqs_f_vs), env->hviprio); } -bool riscv_cpu_has_work (CPUState *cs) +bool riscv_cpu_has_work (const CPUState *cs) {RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env;
target/rx/cpu.c +1 -1
@@ -73,7 +73,7 @@ static void rx_restore_state_to_opc(CPUState *cs, cpu->env.pc = data[0 ]; } -static bool rx_cpu_has_work (CPUState *cs) +static bool rx_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_FIR ); }
target/s390x/cpu-system.c +1 -1
@@ -39,7 +39,7 @@#include "system/tcg.h" #include "hw/core/sysemu-cpu-ops.h" -bool s390_cpu_has_work (CPUState *cs) +bool s390_cpu_has_work (const CPUState *cs) {S390CPU *cpu =S390_CPU (cs);
target/sh4/cpu.c +1 -1
@@ -107,7 +107,7 @@ static bool superh_io_recompile_replay_branch(CPUState *cs,return false; } -static bool superh_cpu_has_work (CPUState *cs) +static bool superh_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ); }
target/sparc/cpu.c +2 -2
@@ -783,10 +783,10 @@ static void sparc_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool sparc_cpu_has_work (CPUState *cs) +static bool sparc_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ) && -cpu_interrupts_enabled (cpu_env (cs)); +cpu_interrupts_enabled (cpu_env_const (cs)); }#endif /* !CONFIG_USER_ONLY */
target/tricore/cpu.c +2 -2
@@ -111,9 +111,9 @@ static void tricore_cpu_reset_hold(Object *obj, ResetType type)cpu_state_reset (cpu_env (cs)); } -static bool tricore_cpu_has_work (CPUState *cs) +static bool tricore_cpu_has_work (const CPUState *cs) { -return true; +return true;/* XXX */ }static int tricore_cpu_mmu_index (CPUState *cs,bool ifetch)
target/xtensa/cpu.c +2 -2
@@ -140,9 +140,9 @@ static void xtensa_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool xtensa_cpu_has_work (CPUState *cs) +static bool xtensa_cpu_has_work (const CPUState *cs) { -CPUXtensaState *env =cpu_env (cs); +const CPUXtensaState *env =cpu_env_const (cs);return !env->runstall && env->pending_irq_level; }
Signature · 1 line
2.53.0
Quoted 38 lines · Philippe Mathieu-Daudé
All functions called by target
has_work()handler take a const @cpu argument. We can now fulfill the comment added in commitc2804566f6("target/arm: do not clear halting reason inhas_workhelper"), qualifying the handler const to denote its idempotency.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/hw/core/sysemu-cpu-ops.h | 4 ++-- target/loongarch/internals.h | 2 +- target/riscv/internals.h | 2 +- target/s390x/s390x-internal.h | 2 +- target/alpha/cpu.c | 2 +- target/arm/cpu.c | 4 ++-- target/avr/cpu.c | 5 +++-- target/hexagon/cpu.c | 4 ++-- target/hppa/cpu.c | 2 +- target/i386/cpu.c | 2 +- target/loongarch/cpu.c | 4 ++-- target/m68k/cpu.c | 2 +- target/microblaze/cpu.c | 2 +- target/mips/cpu.c | 4 ++-- target/or1k/cpu.c | 2 +- target/ppc/cpu_init.c | 2 +- target/riscv/cpu.c | 2 +- target/rx/cpu.c | 2 +- target/s390x/cpu-system.c | 2 +- target/sh4/cpu.c | 2 +- target/sparc/cpu.c | 4 ++-- target/tricore/cpu.c | 4 ++-- target/xtensa/cpu.c | 4 ++-- 23 files changed, 33 insertions(+), 32 deletions(-)target/arm/cpu.c +0
-0
target/arm/cpu.c int arm_cpu_mmu_index(CPUState *cs, bool ifetch) · line 146
Quoted 8 lines
target/arm/cpu.c +2
-2@@ -141,9 +141,9 @@ int arm_cpu_mmu_index(CPUState *cs, bool ifetch)* CPU_INTERRUPT_*NMI anyway. So we might as well accept NMI here * unconditionally. */ -static bool arm_cpu_has_work (CPUState *cs) +static bool arm_cpu_has_work (const CPUState *cs) { -ARMCPU *cpu =ARM_CPU (cs); +const ARMCPU *cpu =ARM_CPU (cs);
BTW this is why I said "Not sure if this is a good idea so marked as RFC" in the cover letter. While the left assignment is correct, the right QOM-generated macros happily cast without checking const-ness. We can see that as a pre-existing risk.
Still overall enforcing const-ness on has_work() is a long-term win. Maybe a simple comment here is sufficient to warn.
Quoted 226 lines
All functions called by target
has_work()handler take a const @cpu argument. We can now fulfill the comment added in commitc2804566f6("target/arm: do not clear halting reason inhas_workhelper"), qualifying the handler const to denote its idempotency.Signed-off-by Philippe Mathieu-Daudé <[email protected]>Message-ID: <[email protected]>
include/hw/core/sysemu-cpu-ops.h +2
-2@@ -19,10 +19,10 @@ typedef struct SysemuCPUOps {/** * @has_work: Callback for checking if there is work to do. * -* This function should be idempotent (i.e. not change state) as +* This function is idempotent (i.e. not change state) as * it will likely be queried multiple times before a CPU resumes. */ -bool (*has_work)(CPUState *cpu);/* MANDATORY NON-NULL */ +bool (*has_work)(const CPUState *cpu);/* MANDATORY NON-NULL */ /** * @get_memory_mapping: Callback for obtaining the memory mappings. */ target/alpha/cpu.c +1
-1@@ -77,7 +77,7 @@ static void alpha_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool alpha_cpu_has_work (CPUState *cs) +static bool alpha_cpu_has_work (const CPUState *cs) {/* Here we are checking to see if the CPU should wake up from HALT. We will have gotten into this state only for WTINT from PALmode. */ target/arm/cpu.c +2
-2@@ -141,9 +141,9 @@ int arm_cpu_mmu_index(CPUState *cs, bool ifetch)* CPU_INTERRUPT_*NMI anyway. So we might as well accept NMI here * unconditionally. */ -static bool arm_cpu_has_work (CPUState *cs) +static bool arm_cpu_has_work (const CPUState *cs) { -ARMCPU *cpu =ARM_CPU (cs); +const ARMCPU *cpu =ARM_CPU (cs);/* * Only another PSCI call can wake the CPU up in which case the target/avr/cpu.c +3
-2@@ -23,6 +23,7 @@#include "qemu/qemu-print.h" #include "exec/translation-block.h" #include "system/address-spaces.h" +#include "hw/core/cpu.h" #include "cpu.h" #include "disas/dis-asm.h" #include "tcg/debug-assert.h" @@ -43,10 +44,10 @@ static vaddr avr_cpu_get_pc(CPUState *cs)return cpu->env.pc_w *2 ; } -static bool avr_cpu_has_work (CPUState *cs) +static bool avr_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_RESET ) - &&cpu_interrupts_enabled (cpu_env (cs)); + &&cpu_interrupts_enabled (cpu_env_const (cs)); }static int avr_cpu_mmu_index (CPUState *cs,bool ifetch)target/hexagon/cpu.c +2
-2@@ -364,9 +364,9 @@ bool hexagon_thread_is_enabled(const CPUHexagonState *env)return E_bit; } -static bool hexagon_cpu_has_work (CPUState *cs) +static bool hexagon_cpu_has_work (const CPUState *cs) { -CPUHexagonState *env =cpu_env (cs); +const CPUHexagonState *env =cpu_env_const (cs); return hexagon_thread_is_enabled(env) && (cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_SWItarget/hppa/cpu.c +1
-1@@ -134,7 +134,7 @@ static void hppa_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool hppa_cpu_has_work (CPUState *cs) +static bool hppa_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }target/i386/cpu.c +1
-1@@ -10639,7 +10639,7 @@ int x86_cpu_pending_interrupt(const CPUState *cs, int interrupt_request)return 0 ; } -static bool x86_cpu_has_work (CPUState *cs) +static bool x86_cpu_has_work (const CPUState *cs) {return x86_cpu_pending_interrupt (cs, cs->interrupt_request) !=0 ; }target/loongarch/cpu.c +2
-2@@ -96,12 +96,12 @@ bool cpu_loongarch_hw_interrupts_pending(const CPULoongArchState *env)#endif #ifndef CONFIG_USER_ONLY -bool loongarch_cpu_has_work (CPUState *cs) +bool loongarch_cpu_has_work (const CPUState *cs) {bool has_work = false;if (cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ) && -cpu_loongarch_hw_interrupts_pending (cpu_env (cs))) { +cpu_loongarch_hw_interrupts_pending (cpu_env_const (cs))) { has_work = true; }target/loongarch/internals.h +1
-1@@ -38,7 +38,7 @@ uint64_t cpu_loongarch_get_constant_timer_counter(LoongArchCPU *cpu);uint64_t cpu_loongarch_get_constant_timer_ticks (LoongArchCPU *cpu);void cpu_loongarch_store_constant_timer_config (LoongArchCPU *cpu,uint64_t value); -bool loongarch_cpu_has_work (CPUState *cs); +bool loongarch_cpu_has_work (const CPUState *cs);bool cpu_loongarch_hw_interrupts_pending (const CPULoongArchState *env);#endif /* !CONFIG_USER_ONLY */ target/m68k/cpu.c +1
-1@@ -76,7 +76,7 @@ static void m68k_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool m68k_cpu_has_work (CPUState *cs) +static bool m68k_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ); }target/microblaze/cpu.c +1
-1@@ -127,7 +127,7 @@ static void mb_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool mb_cpu_has_work (CPUState *cs) +static bool mb_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }target/mips/cpu.c +2
-2@@ -134,9 +134,9 @@ static vaddr mips_cpu_get_pc(CPUState *cs) }#if !defined(CONFIG_USER_ONLY ) -static bool mips_cpu_has_work (CPUState *cs) +static bool mips_cpu_has_work (const CPUState *cs) { -CPUMIPSState *env =cpu_env (cs); +const CPUMIPSState *env =cpu_env_const (cs);bool has_work = false;/* target/or1k/cpu.c +1
-1@@ -76,7 +76,7 @@ static void openrisc_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool openrisc_cpu_has_work (CPUState *cs) +static bool openrisc_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_TIMER ); }target/ppc/cpu_init.c +1
-1@@ -7224,7 +7224,7 @@ static int ppc_cpu_mmu_index(CPUState *cs, bool ifetch)#endif /* CONFIG_TCG */ #ifndef CONFIG_USER_ONLY -static bool ppc_cpu_has_work (CPUState *cs) +static bool ppc_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ); }target/riscv/cpu.c +0
-0
target/riscv/cpu.c int riscv_cpu_vsirq_pending(const CPURISCVState *env) · line 956
Quoted 8 lines
target/riscv/cpu.c +1
-1@@ -950,7 +950,7 @@ int riscv_cpu_vsirq_pending(const CPURISCVState *env) (irqs | irqs_f_vs), env->hviprio); } -bool riscv_cpu_has_work (CPUState *cs) +bool riscv_cpu_has_work (const CPUState *cs) {RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env;
I guess you should make them const
Quoted 31 lines
target/riscv/internals.h +1
-1@@ -203,7 +203,7 @@ static inline target_ulong get_xepc_mask(CPURISCVState *env)#ifndef CONFIG_USER_ONLY /* Our implementation of SysemuCPUOps::has_work */ -bool riscv_cpu_has_work (CPUState *cs); +bool riscv_cpu_has_work (const CPUState *cs);#endif /* Zjpm addr masking routine */ target/rx/cpu.c +1
-1@@ -73,7 +73,7 @@ static void rx_restore_state_to_opc(CPUState *cs, cpu->env.pc = data[0 ]; } -static bool rx_cpu_has_work (CPUState *cs) +static bool rx_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_FIR ); }target/s390x/cpu-system.c +0
-0
target/s390x/cpu-system.c line 44
Quoted 7 lines
target/s390x/cpu-system.c +1
-1@@ -39,7 +39,7 @@#include "system/tcg.h" #include "hw/core/sysemu-cpu-ops.h" -bool s390_cpu_has_work (CPUState *cs) +bool s390_cpu_has_work (const CPUState *cs) {S390CPU *cpu =S390_CPU (cs);
same
Quoted 49 lines
target/s390x/s390x-internal.h +1
-1@@ -248,7 +248,7 @@ bool s390_cpu_system_realize(DeviceState *dev, Error **errp);void s390_cpu_finalize (Object *obj);void s390_cpu_system_class_init (CPUClass *cc);void s390_cpu_machine_reset_cb (void *opaque); -bool s390_cpu_has_work (CPUState *cs); +bool s390_cpu_has_work (const CPUState *cs);#endif /* CONFIG_USER_ONLY */ target/sh4/cpu.c +1
-1@@ -107,7 +107,7 @@ static bool superh_io_recompile_replay_branch(CPUState *cs,return false; } -static bool superh_cpu_has_work (CPUState *cs) +static bool superh_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ); }target/sparc/cpu.c +2
-2@@ -783,10 +783,10 @@ static void sparc_restore_state_to_opc(CPUState *cs, }#ifndef CONFIG_USER_ONLY -static bool sparc_cpu_has_work (CPUState *cs) +static bool sparc_cpu_has_work (const CPUState *cs) {return cpu_test_interrupt (cs,CPU_INTERRUPT_HARD ) && -cpu_interrupts_enabled (cpu_env (cs)); +cpu_interrupts_enabled (cpu_env_const (cs)); }#endif /* !CONFIG_USER_ONLY */ target/tricore/cpu.c +0
-0
target/tricore/cpu.c static void tricore_cpu_reset_hold(Object *obj, ResetType type) · line 117
Quoted 9 lines
target/tricore/cpu.c +2
-2@@ -111,9 +111,9 @@ static void tricore_cpu_reset_hold(Object *obj, ResetType type)cpu_state_reset (cpu_env (cs)); } -static bool tricore_cpu_has_work (CPUState *cs) +static bool tricore_cpu_has_work (const CPUState *cs) { -return true; +return true;/* XXX */ }
Add more explicit FIXME?
Signature · 1 line
Marc-André Lureau <[email protected]>
Quoted 17 lines · On 20/8/26 15:22, [email protected] wrote:
Quoted 17 lines
All functions called by target
has_work()handler take a const @cpu argument. We can now fulfill the comment added in commitc2804566f6("target/arm: do not clear halting reason inhas_workhelper"), qualifying the handler const to denote its idempotency.Signed-off-by Philippe Mathieu-Daudé <[email protected]>Message-ID: <[email protected]>
target/tricore/cpu.c +0
-0@@ -111,9 +111,9 @@ static void tricore_cpu_reset_hold(Object *obj, ResetType type)cpu_state_reset (cpu_env (cs)); }
Quoted 8 lines
target/tricore/cpu.c static void tricore_cpu_reset_hold(Object *obj, ResetType type) · line 117
Quoted 6 lines
target/tricore/cpu.c +2
-2-static bool tricore_cpu_has_work (CPUState *cs) +static bool tricore_cpu_has_work (const CPUState *cs) { -return true; +return true;/* XXX */ }Add more explicit FIXME?
Oops this was a dev comment for myself ("this is dubious, better review"), I forgot about it :/ As mentioned Peter in commit de680286b52 ("accel/tcg: Make cpu_exec_interrupt hook mandatory") "Tricore doesn't currently implement the architectural interrupt handling" so here I'll simply add:
/* Interrupts are not implemented */
Thanks for the reviews!