target/arm: Constify helpers taking CPUARMState arg
cover target/arm: Constify helpers taking CPUARMState arg
Hi,
I'd like to enforce some CpuClass handlers to take a const CPUState* argument, but before I need to clean each target. RFC starting with ARM, mostly to get feedback on const_cpu_env() and const_env_archcpu().
Thanks,
Phil.
Based-on: <[email protected]>
"softfloat: Constify helpers returning float_status field"
Philippe Mathieu-Daudé (2):
cpus: Introduce const_cpu_env() and const_env_archcpu() target/arm: Constify lot of helpers taking CPUARMState argument
include/exec/cpu-common.h | 5 +++ include/hw/core/cpu.h | 6 ++++ target/arm/cpu-features.h | 2 +- target/arm/cpu.h | 71 ++++++++++++++++++++------------------- target/arm/internals.h | 10 +++--- target/arm/helper.c | 25 +++++++------- target/arm/ptw.c | 2 +- target/arm/tcg/m_helper.c | 8 ++--- target/arm/vfp_helper.c | 6 ++-- 9 files changed, 74 insertions(+), 61 deletions(-)
Signature · 1 line
2.47.1
RFC PATCH 1/2 cpus: Introduce const_cpu_env() and const_env_archcpu()
const_cpu_env() is similar to cpu_env() but return a const CPU 'env' state.
Same for const_env_archcpu() w.r.t. env_archcpu().
--- include/exec/cpu-common.h | 5 +++++ include/hw/core/cpu.h | 6 ++++++ 2 files changed, 11 insertions(+)
include/exec/cpu-common.h +5 -0
@@ -250,6 +250,11 @@ static inline ArchCPU *env_archcpu(CPUArchState *env)return (void *)env -sizeof (CPUState); } +static inline const ArchCPU *const_env_archcpu (const CPUArchState *env) +{ +return (const void *)env -sizeof (CPUState); +} +/** * env_cpu_const(env) * @env: The architecture environment
include/hw/core/cpu.h +6 -0
@@ -588,6 +588,12 @@ static inline CPUArchState *cpu_env(CPUState *cpu)return (CPUArchState *)(cpu +1 ); } +static inline const CPUArchState *const_cpu_env (const CPUState *cpu) +{ +/* We validate that CPUArchState follows CPUState in cpu-all.h. */ +return (const CPUArchState *)(cpu +1 ); +} + typedef QTAILQ_HEAD(CPUTailQ, CPUState) CPUTailQ;extern CPUTailQ cpus_queue;
Signature · 1 line
2.47.1
Re: [RFC PATCH 1/2] cpus: Introduce const_cpu_env() and const_env_archcpu()
Quoted 15 lines · Philippe Mathieu-Daudé
const_cpu_env()is similar tocpu_env()but return a const CPU 'env' state.
Same forconst_env_archcpu()w.r.t.env_archcpu().Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/exec/cpu-common.h | 5 +++++ include/hw/core/cpu.h | 6 ++++++ 2 files changed, 11 insertions(+)include/exec/cpu-common.h +0
-0
include/exec/cpu-common.h static inline ArchCPU *env_archcpu(CPUArchState *env) · line 257
Quoted 8 lines
include/exec/cpu-common.h +5
-0@@ -250,6 +250,11 @@ static inline ArchCPU *env_archcpu(CPUArchState *env)return (void *)env -sizeof (CPUState); } +static inline const ArchCPU *const_env_archcpu (const CPUArchState *env) +{ +return (const void *)env -sizeof (CPUState); +} +
Can't we get away with something like:
+static inline const ArchCPU *const_env_archcpu(CPUArchState *env) +{
+ return env_archcpu(env);
+}
+
We're just adding a 'const' to a pointer that env_archcpu() already retrieves, so might as well use env_archcpu(). The 'const' will be added by the compiler. This code builds without warnings in gcc and clang in my env (Fedora 41).
If we want to be a bit more explicit I suggest:
+static inline const ArchCPU *const_env_archcpu(CPUArchState *env) +{
+ return (const ArchCPU *)env_archcpu(env);
+}
+
Same observation with const_cpu_env() and cpu_env(). Thanks,
Daniel
Quoted 20 lines
include/exec/cpu-common.h +0
-0/** * env_cpu_const(env) * @env: The architecture environment include/hw/core/cpu.h +6
-0@@ -588,6 +588,12 @@ static inline CPUArchState *cpu_env(CPUState *cpu)return (CPUArchState *)(cpu +1 ); } +static inline const CPUArchState *const_cpu_env (const CPUState *cpu) +{ +/* We validate that CPUArchState follows CPUState in cpu-all.h. */ +return (const CPUArchState *)(cpu +1 ); +} + typedef QTAILQ_HEAD(CPUTailQ, CPUState) CPUTailQ;extern CPUTailQ cpus_queue;
RFC PATCH 2/2 target/arm: Constify lot of helpers taking CPUARMState argument
In reply to Philippe Mathieu-DaudéWhen methods don't modify the CPUARMState* argument, we can mark it const. This allow enforcing places where the CPU env shouldn't be modified at all,
---
I went via the "modify one and fix until it builds" path, and the result seemed trivial enough, but can try to split if requested.
--- target/arm/cpu-features.h | 2 +- target/arm/cpu.h | 71 ++++++++++++++++++++------------------- target/arm/internals.h | 10 +++--- target/arm/helper.c | 25 +++++++------- target/arm/ptw.c | 2 +- target/arm/tcg/m_helper.c | 8 ++--- target/arm/vfp_helper.c | 6 ++-- 7 files changed, 63 insertions(+), 61 deletions(-)
target/arm/cpu-features.h +1 -1
@@ -1091,6 +1091,6 @@ static inline uint64_t make_ccsidr(CCSIDRFormat format, unsigned assoc,* Forward to the above feature tests given an ARMCPU pointer. */ #define cpu_isar_feature (name, cpu) \ - ({ ARMCPU *cpu_ = (cpu); isar_feature_##name(&cpu_->isar); }) + ({ const ARMCPU *cpu_ = (cpu); isar_feature_##name(&cpu_->isar); })#endif
target/arm/cpu.h +36 -35
250 lines not on this page · raw message
target/arm/internals.h +5 -5
@@ -832,7 +832,7 @@ static inline ARMMMUIdx core_to_aa64_mmu_idx(int mmu_idx)int arm_mmu_idx_to_el (ARMMMUIdx mmu_idx);/* Return the MMU index for a v7M CPU in the specified security state */ -ARMMMUIdx arm_v7m_mmu_idx_for_secstate (CPUARMState *env,bool secstate); +ARMMMUIdx arm_v7m_mmu_idx_for_secstate (const CPUARMState *env,bool secstate);/* * Return true if the stage 1 translation regime is using LPAE
@@ -1189,7 +1189,7 @@ void arm_cpu_update_vserr(ARMCPU *cpu);* * Return the full ARMMMUIdx for the translation regime for EL. */ -ARMMMUIdx arm_mmu_idx_el (CPUARMState *env,int el); +ARMMMUIdx arm_mmu_idx_el (const CPUARMState *env,int el);/** * arm_mmu_idx:
@@ -1197,7 +1197,7 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el);* * Return the full ARMMMUIdx for the current translation regime. */ -ARMMMUIdx arm_mmu_idx (CPUARMState *env); +ARMMMUIdx arm_mmu_idx (const CPUARMState *env);/** * arm_stage1_mmu_idx:
@@ -1210,13 +1210,13 @@ static inline ARMMMUIdx stage_1_mmu_idx(ARMMMUIdx mmu_idx) {return ARMMMUIdx_Stage1_E0; } -static inline ARMMMUIdx arm_stage1_mmu_idx (CPUARMState *env) +static inline ARMMMUIdx arm_stage1_mmu_idx (const CPUARMState *env) {return ARMMMUIdx_Stage1_E0; }#else ARMMMUIdx stage_1_mmu_idx (ARMMMUIdx mmu_idx); -ARMMMUIdx arm_stage1_mmu_idx (CPUARMState *env); +ARMMMUIdx arm_stage1_mmu_idx (const CPUARMState *env);#endif /**
target/arm/helper.c +13 -12
@@ -264,7 +264,7 @@ void init_cpreg_list(ARMCPU *cpu)g_list_free (keys); } -static bool arm_pan_enabled (CPUARMState *env) +static bool arm_pan_enabled (const CPUARMState *env) {if (is_a64 (env)) {if ((arm_hcr_el2_eff (env) & (HCR_NV |HCR_NV1 )) == (HCR_NV |HCR_NV1 )) {
@@ -5229,7 +5229,8 @@ static void hcr_writelow(CPUARMState *env, const ARMCPRegInfo *ri,* Bits that are not included here: * RW (read from SCR_EL3.RW as needed) */ -uint64_t arm_hcr_el2_eff_secstate (CPUARMState *env,ARMSecuritySpace space) +uint64_t arm_hcr_el2_eff_secstate (const CPUARMState *env, +ARMSecuritySpace space) {uint64_t ret = env->cp15.hcr_el2;
@@ -5294,7 +5295,7 @@ uint64_t arm_hcr_el2_eff_secstate(CPUARMState *env, ARMSecuritySpace space)return ret; } -uint64_t arm_hcr_el2_eff (CPUARMState *env) +uint64_t arm_hcr_el2_eff (const CPUARMState *env) {if (arm_feature (env,ARM_FEATURE_M )) {return 0 ;
@@ -5396,7 +5397,7 @@ static const ARMCPRegInfo hcrx_el2_reginfo = { };/* Return the effective value of HCRX_EL2. */ -uint64_t arm_hcrx_el2_eff (CPUARMState *env) +uint64_t arm_hcrx_el2_eff (const CPUARMState *env) {/* * The bits in this register behave as 0 for all purposes other than
@@ -5411,7 +5412,7 @@ uint64_t arm_hcrx_el2_eff(CPUARMState *env)*/ if (!arm_is_el2_enabled (env)) {uint64_t hcrx =0 ; -if (cpu_isar_feature (aa64_mops,env_archcpu (env))) { +if (cpu_isar_feature (aa64_mops,const_env_archcpu (env))) {/* MSCEn behaves as 1 if EL2 is not enabled */ hcrx |=HCRX_MSCEN ; }
@@ -9333,7 +9334,7 @@ static int bad_mode_switch(CPUARMState *env, int mode, CPSRWriteType write_type) } } -uint32_t cpsr_read (CPUARMState *env) +uint32_t cpsr_read (const CPUARMState *env) {int ZF ;ZF = (env->ZF ==0 );
@@ -10703,7 +10704,7 @@ void arm_cpu_do_interrupt(CPUState *cs) }#endif /* !CONFIG_USER_ONLY */ -uint64_t arm_sctlr (CPUARMState *env,int el) +uint64_t arm_sctlr (const CPUARMState *env,int el) {/* Only EL0 needs to be adjusted for EL1&0 or EL2&0 or EL3&0 */ if (el ==0 ) {
@@ -11127,7 +11128,7 @@ ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) }#endif -ARMMMUIdx arm_mmu_idx_el (CPUARMState *env,int el) +ARMMMUIdx arm_mmu_idx_el (const CPUARMState *env,int el) {ARMMMUIdx idx;uint64_t hcr;
@@ -11180,7 +11181,7 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el)return idx; } -ARMMMUIdx arm_mmu_idx (CPUARMState *env) +ARMMMUIdx arm_mmu_idx (const CPUARMState *env) {return arm_mmu_idx_el (env,arm_current_el (env)); }
@@ -11412,7 +11413,7 @@ void aarch64_sve_change_el(CPUARMState *env, int old_el,#endif #ifndef CONFIG_USER_ONLY -ARMSecuritySpace arm_security_space (CPUARMState *env) +ARMSecuritySpace arm_security_space (const CPUARMState *env) {if (arm_feature (env,ARM_FEATURE_M )) {return arm_secure_to_space (env->v7m.secure);
@@ -11429,7 +11430,7 @@ ARMSecuritySpace arm_security_space(CPUARMState *env)/* Check for AArch64 EL3 or AArch32 Mon. */ if (is_a64 (env)) {if (extract32 (env->pstate,2 ,2 ) ==3 ) { -if (cpu_isar_feature (aa64_rme,env_archcpu (env))) { +if (cpu_isar_feature (aa64_rme,const_env_archcpu (env))) {return ARMSS_Root; }else {return ARMSS_Secure;
@@ -11444,7 +11445,7 @@ ARMSecuritySpace arm_security_space(CPUARMState *env)return arm_security_space_below_el3 (env); } -ARMSecuritySpace arm_security_space_below_el3 (CPUARMState *env) +ARMSecuritySpace arm_security_space_below_el3 (const CPUARMState *env) {assert (!arm_feature (env,ARM_FEATURE_M ));
target/arm/ptw.c +1 -1
@@ -158,7 +158,7 @@ ARMMMUIdx stage_1_mmu_idx(ARMMMUIdx mmu_idx) } } -ARMMMUIdx arm_stage1_mmu_idx (CPUARMState *env) +ARMMMUIdx arm_stage1_mmu_idx (const CPUARMState *env) {return stage_1_mmu_idx (arm_mmu_idx (env)); }
target/arm/tcg/m_helper.c +4 -4
@@ -156,14 +156,14 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) return 0; } -ARMMMUIdx arm_v7m_mmu_idx_for_secstate (CPUARMState *env,bool secstate) +ARMMMUIdx arm_v7m_mmu_idx_for_secstate (const CPUARMState *env,bool secstate) {return ARMMMUIdx_MUser; }#else /* !CONFIG_USER_ONLY */ -static ARMMMUIdx arm_v7m_mmu_idx_all (CPUARMState *env, +static ARMMMUIdx arm_v7m_mmu_idx_all (const CPUARMState *env,bool secstate,bool priv,bool negpri) {ARMMMUIdx mmu_idx =ARM_MMU_IDX_M ;
@@ -183,7 +183,7 @@ static ARMMMUIdx arm_v7m_mmu_idx_all(CPUARMState *env,return mmu_idx; } -static ARMMMUIdx arm_v7m_mmu_idx_for_secstate_and_priv (CPUARMState *env, +static ARMMMUIdx arm_v7m_mmu_idx_for_secstate_and_priv (const CPUARMState *env,bool secstate,bool priv) {bool negpri =armv7m_nvic_neg_prio_requested (env->nvic, secstate);
@@ -192,7 +192,7 @@ static ARMMMUIdx arm_v7m_mmu_idx_for_secstate_and_priv(CPUARMState *env, }/* Return the MMU index for a v7M CPU in the specified security state */ -ARMMMUIdx arm_v7m_mmu_idx_for_secstate (CPUARMState *env,bool secstate) +ARMMMUIdx arm_v7m_mmu_idx_for_secstate (const CPUARMState *env,bool secstate) {bool priv =arm_v7m_is_handler_mode (env) || !(env->v7m.control[secstate] &1 );
target/arm/vfp_helper.c +3 -3
@@ -59,7 +59,7 @@ static inline int vfp_exceptbits_from_host(int host_bits)return target_bits; } -static uint32_t vfp_get_fpsr_from_host (CPUARMState *env) +static uint32_t vfp_get_fpsr_from_host (const CPUARMState *env) {uint32_t i;
@@ -132,7 +132,7 @@ static void vfp_set_fpcr_to_host(CPUARMState *env, uint32_t val, uint32_t mask)#else -static uint32_t vfp_get_fpsr_from_host (CPUARMState *env) +static uint32_t vfp_get_fpsr_from_host (const CPUARMState *env) {return 0 ; }
@@ -162,7 +162,7 @@ uint32_t vfp_get_fpcr(CPUARMState *env)return fpcr; } -uint32_t vfp_get_fpsr (CPUARMState *env) +uint32_t vfp_get_fpsr (const CPUARMState *env) {uint32_t fpsr = env->vfp.fpsr;uint32_t i;
Signature · 1 line
2.47.1
Re: [RFC PATCH 2/2] target/arm: Constify lot of helpers taking CPUARMState argument
Quoted 6 lines · Philippe Mathieu-Daudé
When methods don't modify the CPUARMState* argument, we can mark it const. This allow enforcing places where the CPU env shouldn't be modified at all,
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
We should use 'const' more often in general IMO. It forces a better usage and understanding of our own APIs.
Quoted 546 lines
I went via the "modify one and fix until it builds" path, and the result seemed trivial enough, but can try to split if requested.
--- target/arm/cpu-features.h | 2 +- target/arm/cpu.h | 71 ++++++++++++++++++++------------------- target/arm/internals.h | 10 +++--- target/arm/helper.c | 25 +++++++------- target/arm/ptw.c | 2 +- target/arm/tcg/m_helper.c | 8 ++--- target/arm/vfp_helper.c | 6 ++-- 7 files changed, 63 insertions(+), 61 deletions(-)target/arm/cpu-features.h +1
-1@@ -1091,6 +1091,6 @@ static inline uint64_t make_ccsidr(CCSIDRFormat format, unsigned assoc,* Forward to the above feature tests given an ARMCPU pointer. */ #define cpu_isar_feature (name, cpu) \ - ({ ARMCPU *cpu_ = (cpu); isar_feature_##name(&cpu_->isar); }) + ({ const ARMCPU *cpu_ = (cpu); isar_feature_##name(&cpu_->isar); })#endif target/arm/cpu.h +36
-35@@ -1267,7 +1267,7 @@ uint32_t sve_vqm1_for_el_sm(CPUARMState *env, int el, bool sm);/* Likewise, but using @sm = PSTATE.SM. */ uint32_t sve_vqm1_for_el (CPUARMState *env,int el); -static inline bool is_a64 (CPUARMState *env) +static inline bool is_a64 (const CPUARMState *env) {return env->aarch64; }@@ -1503,7 +1503,7 @@ static inline unsigned int aarch64_pstate_mode(unsigned int el, bool handler)* interprocessing, so we don't attempt to sync with the cpsr state used by * the 32 bit decoder. */ -static inline uint32_t pstate_read (CPUARMState *env) +static inline uint32_t pstate_read (const CPUARMState *env) {int ZF ;@@ -1525,7 +1525,7 @@ static inline void pstate_write(CPUARMState *env, uint32_t val) }/* Return the current CPSR value. */ -uint32_t cpsr_read (CPUARMState *env); +uint32_t cpsr_read (const CPUARMState *env); typedef enum CPSRWriteType { CPSRWriteByInstr = 0, /* from guest MSR or CPS */@@ -1545,7 +1545,7 @@ void cpsr_write(CPUARMState *env, uint32_t val, uint32_t mask, CPSRWriteType write_type);/* Return the current xPSR value. */ -static inline uint32_t xpsr_read (CPUARMState *env) +static inline uint32_t xpsr_read (const CPUARMState *env) {int ZF ;ZF = (env->ZF ==0 );@@ -1765,7 +1765,7 @@ QEMU_BUILD_BUG_ON(FPSCR_FPSR_MASK & FPSCR_FPCR_MASK);* * Return the current AArch64 FPSR value */ -uint32_t vfp_get_fpsr (CPUARMState *env); +uint32_t vfp_get_fpsr (const CPUARMState *env);/** * vfp_get_fpcr: read the AArch64 FPCR @@ -2445,7 +2445,7 @@ enum arm_features { ARM_FEATURE_BACKCOMPAT_CNTFRQ, /* 62.5MHz timer default */ }; -static inline int arm_feature (CPUARMState *env,int feature) +static inline int arm_feature (const CPUARMState *env,int feature) {return (env->features & (1ULL << feature)) !=0 ; }@@ -2486,7 +2486,7 @@ static inline ARMSecuritySpace arm_secure_to_space(bool secure)* an exception return to those levels. Unlike arm_security_space, * this doesn't care about the current EL. */ -ARMSecuritySpace arm_security_space_below_el3 (CPUARMState *env); +ARMSecuritySpace arm_security_space_below_el3 (const CPUARMState *env);/** * arm_is_secure_below_el3: @@ -2495,14 +2495,14 @@ ARMSecuritySpace arm_security_space_below_el3(CPUARMState *env);* Return true if exception levels below EL3 are in secure state, * or would be following an exception return to those levels. */ -static inline bool arm_is_secure_below_el3 (CPUARMState *env) +static inline bool arm_is_secure_below_el3 (const CPUARMState *env) {ARMSecuritySpace ss =arm_security_space_below_el3 (env);return ss == ARMSS_Secure; }/* Return true if the CPU is AArch64 EL3 or AArch32 Mon */ -static inline bool arm_is_el3_or_mon (CPUARMState *env) +static inline bool arm_is_el3_or_mon (const CPUARMState *env) {assert (!arm_feature (env,ARM_FEATURE_M ));if (arm_feature (env,ARM_FEATURE_EL3 )) {@@ -2524,7 +2524,7 @@ static inline bool arm_is_el3_or_mon(CPUARMState *env)* * Return the current security space of the cpu. */ -ARMSecuritySpace arm_security_space (CPUARMState *env); +ARMSecuritySpace arm_security_space (const CPUARMState *env);/** * arm_is_secure: @@ -2532,7 +2532,7 @@ ARMSecuritySpace arm_security_space(CPUARMState *env);* * Return true if the processor is in secure state. */ -static inline bool arm_is_secure (CPUARMState *env) +static inline bool arm_is_secure (const CPUARMState *env) {return arm_space_is_secure (arm_security_space (env)); }@@ -2541,7 +2541,7 @@ static inline bool arm_is_secure(CPUARMState *env)* Return true if the current security state has AArch64 EL2 or AArch32 Hyp. * This corresponds to the pseudocode EL2Enabled(). */ -static inline bool arm_is_el2_enabled_secstate (CPUARMState *env, +static inline bool arm_is_el2_enabled_secstate (const CPUARMState *env,ARMSecuritySpace space) {assert (space != ARMSS_Root);@@ -2549,39 +2549,39 @@ static inline bool arm_is_el2_enabled_secstate(CPUARMState *env, && (space != ARMSS_Secure || (env->cp15.scr_el3 &SCR_EEL2 )); } -static inline bool arm_is_el2_enabled (CPUARMState *env) +static inline bool arm_is_el2_enabled (const CPUARMState *env) {return arm_is_el2_enabled_secstate (env,arm_security_space_below_el3 (env)); }#else -static inline ARMSecuritySpace arm_security_space_below_el3 (CPUARMState *env) +static inline ARMSecuritySpace arm_security_space_below_el3 (const CPUARMState *env) {return ARMSS_NonSecure; } -static inline bool arm_is_secure_below_el3 (CPUARMState *env) +static inline bool arm_is_secure_below_el3 (const CPUARMState *env) {return false; } -static inline ARMSecuritySpace arm_security_space (CPUARMState *env) +static inline ARMSecuritySpace arm_security_space (const CPUARMState *env) {return ARMSS_NonSecure; } -static inline bool arm_is_secure (CPUARMState *env) +static inline bool arm_is_secure (const CPUARMState *env) {return false; } -static inline bool arm_is_el2_enabled_secstate (CPUARMState *env, +static inline bool arm_is_el2_enabled_secstate (const CPUARMState *env,ARMSecuritySpace space) {return false; } -static inline bool arm_is_el2_enabled (CPUARMState *env) +static inline bool arm_is_el2_enabled (const CPUARMState *env) {return false; }@@ -2593,12 +2593,13 @@ static inline bool arm_is_el2_enabled(CPUARMState *env)* "for all purposes other than a direct read or write access of HCR_EL2." * Not included here is HCR_RW. */ -uint64_t arm_hcr_el2_eff_secstate (CPUARMState *env,ARMSecuritySpace space); -uint64_t arm_hcr_el2_eff (CPUARMState *env); -uint64_t arm_hcrx_el2_eff (CPUARMState *env); +uint64_t arm_hcr_el2_eff_secstate (const CPUARMState *env, +ARMSecuritySpace space); +uint64_t arm_hcr_el2_eff (const CPUARMState *env); +uint64_t arm_hcrx_el2_eff (const CPUARMState *env);/* Return true if the specified exception level is running in AArch64 state. */ -static inline bool arm_el_is_aa64 (CPUARMState *env,int el) +static inline bool arm_el_is_aa64 (const CPUARMState *env,int el) {/* This isn't valid for EL0 (if we're in EL0, is_a64() is what you want, * and if we're not in EL0 then the state of EL0 isn't well defined.) @@ -2637,7 +2638,7 @@ static inline bool arm_el_is_aa64(CPUARMState *env, int el)* it doesn't exist at all) then there is no register banking, and all * accesses are to the non-secure version. */ -static inline bool access_secure_reg (CPUARMState *env) +static inline bool access_secure_reg (const CPUARMState *env) { bool ret = (arm_feature(env, ARM_FEATURE_EL3) && !arm_el_is_aa64(env, 3) &&@@ -2677,7 +2678,7 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx, uint32_t cur_el, bool secure);/* Return the highest implemented Exception Level */ -static inline int arm_highest_el (CPUARMState *env) +static inline int arm_highest_el (const CPUARMState *env) {if (arm_feature (env,ARM_FEATURE_EL3 )) {return 3 ;@@ -2689,7 +2690,7 @@ static inline int arm_highest_el(CPUARMState *env) }/* Return true if a v7M CPU is in Handler mode */ -static inline bool arm_v7m_is_handler_mode (CPUARMState *env) +static inline bool arm_v7m_is_handler_mode (const CPUARMState *env) {return env->v7m.exception !=0 ; }@@ -2697,7 +2698,7 @@ static inline bool arm_v7m_is_handler_mode(CPUARMState *env)/* Return the current Exception Level (as per ARMv8; note that this differs * from the ARMv7 Privilege Level). */ -static inline int arm_current_el (CPUARMState *env) +static inline int arm_current_el (const CPUARMState *env) {if (arm_feature (env,ARM_FEATURE_M )) { return arm_v7m_is_handler_mode(env) ||@@ -3004,7 +3005,7 @@ static inline ARMSecuritySpace arm_phys_to_space(ARMMMUIdx idx)return idx - ARMMMUIdx_Phys_S; } -static inline bool arm_v7m_csselr_razwi (ARMCPU *cpu) +static inline bool arm_v7m_csselr_razwi (const ARMCPU *cpu) {/* If all the CLIDR.Ctypem bits are 0 there are no caches, and * CSSELR is RAZ/WI. @@ -3012,7 +3013,7 @@ static inline bool arm_v7m_csselr_razwi(ARMCPU *cpu)return (cpu->clidr &R_V7M_CLIDR_CTYPE_ALL_MASK ) !=0 ; } -static inline bool arm_sctlr_b (CPUARMState *env) +static inline bool arm_sctlr_b (const CPUARMState *env) {return /* We need not implement SCTLR.ITD in user-mode emulation, so @@ -3025,9 +3026,9 @@ static inline bool arm_sctlr_b(CPUARMState *env) (env->cp15.sctlr_el[1 ] &SCTLR_B ) !=0 ; } -uint64_t arm_sctlr (CPUARMState *env,int el); +uint64_t arm_sctlr (const CPUARMState *env,int el); -static inline bool arm_cpu_data_is_big_endian_a32 (CPUARMState *env, +static inline bool arm_cpu_data_is_big_endian_a32 (const CPUARMState *env,bool sctlr_b) {#ifdef CONFIG_USER_ONLY @@ -3057,7 +3058,7 @@ static inline bool arm_cpu_data_is_big_endian_a64(int el, uint64_t sctlr) }/* Return true if the processor is in big-endian mode. */ -static inline bool arm_cpu_data_is_big_endian (CPUARMState *env) +static inline bool arm_cpu_data_is_big_endian (const CPUARMState *env) {if (!is_a64 (env)) {return arm_cpu_data_is_big_endian_a32 (env,arm_sctlr_b (env));@@ -3219,7 +3220,7 @@ FIELD(TBFLAG_A64, NV2_MEM_BE, 36, 1)* * Return the VL cached within env->hflags, in units of quadwords. */ -static inline int sve_vq (CPUARMState *env) +static inline int sve_vq (const CPUARMState *env) {return EX_TBFLAG_A64 (env->hflags,VL ) +1 ; }@@ -3230,7 +3231,7 @@ static inline int sve_vq(CPUARMState *env)* * Return the SVL cached within env->hflags, in units of quadwords. */ -static inline int sme_vq (CPUARMState *env) +static inline int sme_vq (const CPUARMState *env) {return EX_TBFLAG_A64 (env->hflags,SVL ) +1 ; }@@ -3252,7 +3253,7 @@ static inline bool bswap_code(bool sctlr_b) }#ifdef CONFIG_USER_ONLY -static inline bool arm_cpu_bswap_data (CPUARMState *env) +static inline bool arm_cpu_bswap_data (const CPUARMState *env) {return TARGET_BIG_ENDIAN ^arm_cpu_data_is_big_endian (env); }target/arm/internals.h +5
-5@@ -832,7 +832,7 @@ static inline ARMMMUIdx core_to_aa64_mmu_idx(int mmu_idx)int arm_mmu_idx_to_el (ARMMMUIdx mmu_idx);/* Return the MMU index for a v7M CPU in the specified security state */ -ARMMMUIdx arm_v7m_mmu_idx_for_secstate (CPUARMState *env,bool secstate); +ARMMMUIdx arm_v7m_mmu_idx_for_secstate (const CPUARMState *env,bool secstate);/* * Return true if the stage 1 translation regime is using LPAE @@ -1189,7 +1189,7 @@ void arm_cpu_update_vserr(ARMCPU *cpu);* * Return the full ARMMMUIdx for the translation regime for EL. */ -ARMMMUIdx arm_mmu_idx_el (CPUARMState *env,int el); +ARMMMUIdx arm_mmu_idx_el (const CPUARMState *env,int el);/** * arm_mmu_idx: @@ -1197,7 +1197,7 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el);* * Return the full ARMMMUIdx for the current translation regime. */ -ARMMMUIdx arm_mmu_idx (CPUARMState *env); +ARMMMUIdx arm_mmu_idx (const CPUARMState *env);/** * arm_stage1_mmu_idx: @@ -1210,13 +1210,13 @@ static inline ARMMMUIdx stage_1_mmu_idx(ARMMMUIdx mmu_idx) {return ARMMMUIdx_Stage1_E0; } -static inline ARMMMUIdx arm_stage1_mmu_idx (CPUARMState *env) +static inline ARMMMUIdx arm_stage1_mmu_idx (const CPUARMState *env) {return ARMMMUIdx_Stage1_E0; }#else ARMMMUIdx stage_1_mmu_idx (ARMMMUIdx mmu_idx); -ARMMMUIdx arm_stage1_mmu_idx (CPUARMState *env); +ARMMMUIdx arm_stage1_mmu_idx (const CPUARMState *env);#endif /** target/arm/helper.c +13
-12@@ -264,7 +264,7 @@ void init_cpreg_list(ARMCPU *cpu)g_list_free (keys); } -static bool arm_pan_enabled (CPUARMState *env) +static bool arm_pan_enabled (const CPUARMState *env) {if (is_a64 (env)) {if ((arm_hcr_el2_eff (env) & (HCR_NV |HCR_NV1 )) == (HCR_NV |HCR_NV1 )) {@@ -5229,7 +5229,8 @@ static void hcr_writelow(CPUARMState *env, const ARMCPRegInfo *ri,* Bits that are not included here: * RW (read from SCR_EL3.RW as needed) */ -uint64_t arm_hcr_el2_eff_secstate (CPUARMState *env,ARMSecuritySpace space) +uint64_t arm_hcr_el2_eff_secstate (const CPUARMState *env, +ARMSecuritySpace space) {uint64_t ret = env->cp15.hcr_el2;@@ -5294,7 +5295,7 @@ uint64_t arm_hcr_el2_eff_secstate(CPUARMState *env, ARMSecuritySpace space)return ret; } -uint64_t arm_hcr_el2_eff (CPUARMState *env) +uint64_t arm_hcr_el2_eff (const CPUARMState *env) {if (arm_feature (env,ARM_FEATURE_M )) {return 0 ;@@ -5396,7 +5397,7 @@ static const ARMCPRegInfo hcrx_el2_reginfo = { };/* Return the effective value of HCRX_EL2. */ -uint64_t arm_hcrx_el2_eff (CPUARMState *env) +uint64_t arm_hcrx_el2_eff (const CPUARMState *env) {/* * The bits in this register behave as 0 for all purposes other than @@ -5411,7 +5412,7 @@ uint64_t arm_hcrx_el2_eff(CPUARMState *env)*/ if (!arm_is_el2_enabled (env)) {uint64_t hcrx =0 ; -if (cpu_isar_feature (aa64_mops,env_archcpu (env))) { +if (cpu_isar_feature (aa64_mops,const_env_archcpu (env))) {/* MSCEn behaves as 1 if EL2 is not enabled */ hcrx |=HCRX_MSCEN ; }@@ -9333,7 +9334,7 @@ static int bad_mode_switch(CPUARMState *env, int mode, CPSRWriteType write_type) } } -uint32_t cpsr_read (CPUARMState *env) +uint32_t cpsr_read (const CPUARMState *env) {int ZF ;ZF = (env->ZF ==0 );@@ -10703,7 +10704,7 @@ void arm_cpu_do_interrupt(CPUState *cs) }#endif /* !CONFIG_USER_ONLY */ -uint64_t arm_sctlr (CPUARMState *env,int el) +uint64_t arm_sctlr (const CPUARMState *env,int el) {/* Only EL0 needs to be adjusted for EL1&0 or EL2&0 or EL3&0 */ if (el ==0 ) {@@ -11127,7 +11128,7 @@ ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) }#endif -ARMMMUIdx arm_mmu_idx_el (CPUARMState *env,int el) +ARMMMUIdx arm_mmu_idx_el (const CPUARMState *env,int el) {ARMMMUIdx idx;uint64_t hcr;@@ -11180,7 +11181,7 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el)return idx; } -ARMMMUIdx arm_mmu_idx (CPUARMState *env) +ARMMMUIdx arm_mmu_idx (const CPUARMState *env) {return arm_mmu_idx_el (env,arm_current_el (env)); }@@ -11412,7 +11413,7 @@ void aarch64_sve_change_el(CPUARMState *env, int old_el,#endif #ifndef CONFIG_USER_ONLY -ARMSecuritySpace arm_security_space (CPUARMState *env) +ARMSecuritySpace arm_security_space (const CPUARMState *env) {if (arm_feature (env,ARM_FEATURE_M )) {return arm_secure_to_space (env->v7m.secure);@@ -11429,7 +11430,7 @@ ARMSecuritySpace arm_security_space(CPUARMState *env)/* Check for AArch64 EL3 or AArch32 Mon. */ if (is_a64 (env)) {if (extract32 (env->pstate,2 ,2 ) ==3 ) { -if (cpu_isar_feature (aa64_rme,env_archcpu (env))) { +if (cpu_isar_feature (aa64_rme,const_env_archcpu (env))) {return ARMSS_Root; }else {return ARMSS_Secure;@@ -11444,7 +11445,7 @@ ARMSecuritySpace arm_security_space(CPUARMState *env)return arm_security_space_below_el3 (env); } -ARMSecuritySpace arm_security_space_below_el3 (CPUARMState *env) +ARMSecuritySpace arm_security_space_below_el3 (const CPUARMState *env) {assert (!arm_feature (env,ARM_FEATURE_M ));target/arm/ptw.c +1
-1@@ -158,7 +158,7 @@ ARMMMUIdx stage_1_mmu_idx(ARMMMUIdx mmu_idx) } } -ARMMMUIdx arm_stage1_mmu_idx (CPUARMState *env) +ARMMMUIdx arm_stage1_mmu_idx (const CPUARMState *env) {return stage_1_mmu_idx (arm_mmu_idx (env)); }target/arm/tcg/m_helper.c +4
-4@@ -156,14 +156,14 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) return 0; } -ARMMMUIdx arm_v7m_mmu_idx_for_secstate (CPUARMState *env,bool secstate) +ARMMMUIdx arm_v7m_mmu_idx_for_secstate (const CPUARMState *env,bool secstate) {return ARMMMUIdx_MUser; }#else /* !CONFIG_USER_ONLY */ -static ARMMMUIdx arm_v7m_mmu_idx_all (CPUARMState *env, +static ARMMMUIdx arm_v7m_mmu_idx_all (const CPUARMState *env,bool secstate,bool priv,bool negpri) {ARMMMUIdx mmu_idx =ARM_MMU_IDX_M ;@@ -183,7 +183,7 @@ static ARMMMUIdx arm_v7m_mmu_idx_all(CPUARMState *env,return mmu_idx; } -static ARMMMUIdx arm_v7m_mmu_idx_for_secstate_and_priv (CPUARMState *env, +static ARMMMUIdx arm_v7m_mmu_idx_for_secstate_and_priv (const CPUARMState *env,bool secstate,bool priv) {bool negpri =armv7m_nvic_neg_prio_requested (env->nvic, secstate);@@ -192,7 +192,7 @@ static ARMMMUIdx arm_v7m_mmu_idx_for_secstate_and_priv(CPUARMState *env, }/* Return the MMU index for a v7M CPU in the specified security state */ -ARMMMUIdx arm_v7m_mmu_idx_for_secstate (CPUARMState *env,bool secstate) +ARMMMUIdx arm_v7m_mmu_idx_for_secstate (const CPUARMState *env,bool secstate) {bool priv =arm_v7m_is_handler_mode (env) || !(env->v7m.control[secstate] &1 );target/arm/vfp_helper.c +3
-3@@ -59,7 +59,7 @@ static inline int vfp_exceptbits_from_host(int host_bits)return target_bits; } -static uint32_t vfp_get_fpsr_from_host (CPUARMState *env) +static uint32_t vfp_get_fpsr_from_host (const CPUARMState *env) {uint32_t i;@@ -132,7 +132,7 @@ static void vfp_set_fpcr_to_host(CPUARMState *env, uint32_t val, uint32_t mask)#else -static uint32_t vfp_get_fpsr_from_host (CPUARMState *env) +static uint32_t vfp_get_fpsr_from_host (const CPUARMState *env) {return 0 ; }@@ -162,7 +162,7 @@ uint32_t vfp_get_fpcr(CPUARMState *env)return fpcr; } -uint32_t vfp_get_fpsr (CPUARMState *env) +uint32_t vfp_get_fpsr (const CPUARMState *env) {uint32_t fpsr = env->vfp.fpsr;uint32_t i;
Re: [RFC PATCH 2/2] target/arm: Constify lot of helpers taking CPUARMState argument
Quoted 7 lines · Daniel Henrique Barboza
Quoted 4 lines · Philippe Mathieu-Daudé
When methods don't modify the CPUARMState* argument, we can mark it const. This allow enforcing places where the CPU env shouldn't be modified at all,
Quoted 8 lines
Quoted 2 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
We should use 'const' more often in general IMO. It forces a better usage and understanding of our own APIs.
Reviewed-by Daniel Henrique Barboza <[email protected]>
Thanks!
Quoted 3 lines
Quoted 3 lines
I went via the "modify one and fix until it builds" path, and the result seemed trivial enough, but can try to split if requested.
I actually did split and will respin.
Quoted 9 lines
Quoted 9 lines
---
target/arm/cpu-features.h| 2 +-
target/arm/cpu.h | 71 ++++++++++++++++++++------------------- target/arm/internals.h | 10 +++---
target/arm/helper.c | 25 +++++++------- target/arm/ptw.c | 2 +-target/arm/tcg/m_helper.c| 8 ++--- target/arm/vfp_helper.c | 6 ++--7 files changed, 63 insertions(+), 61 deletions(-)
Re: [RFC PATCH 2/2] target/arm: Constify lot of helpers taking CPUARMState argument
In reply to Philippe Mathieu-DaudéQuoted 9 lines · Philippe Mathieu-Daudé
When methods don't modify the CPUARMState* argument, we can mark it const. This allow enforcing places where the CPU env shouldn't be modified at all,
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
I went via the "modify one and fix until it builds" path, and the result seemed trivial enough, but can try to split if requested.
Re-reading me again, this sounds like a random patch, which isn't :)
What I meant is I made const the functions that I want to use with a Const CPUState*, then I built and fixed the call sites.
Quoted 9 lines
--- target/arm/cpu-features.h | 2 +- target/arm/cpu.h | 71 ++++++++++++++++++++------------------- target/arm/internals.h | 10 +++--- target/arm/helper.c | 25 +++++++------- target/arm/ptw.c | 2 +- target/arm/tcg/m_helper.c | 8 ++--- target/arm/vfp_helper.c | 6 ++-- 7 files changed, 63 insertions(+), 61 deletions(-)