| Message ID | 20230806121732.91853-15-deller@gmx.de |
|---|---|
| State | New |
| Headers | show |
| Series | Introduce MMU_INDEX() | expand |
On 8/6/23 05:17, Helge Deller wrote: > Use the new MMU_INDEX() helper to specify the index of the CPUTLB which > should be used. Additionally, in a follow-up patch this helper allows > then to optimize the tcg code generation. > > Signed-off-by: Helge Deller <deller@gmx.de> > --- > target/arm/cpu.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index 88e5accda6..16e18fb22a 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -2930,7 +2930,7 @@ typedef enum ARMMMUIdxBit { > > #undef TO_CORE_BIT > > -#define MMU_USER_IDX 0 > +#define MMU_USER_IDX MMU_INDEX(0) > > /* Indexes used when registering address spaces with cpu_address_space_init */ > typedef enum ARMASIdx { > @@ -3166,7 +3166,7 @@ FIELD(TBFLAG_A64, NAA, 30, 1) > */ > static inline int cpu_mmu_index(CPUARMState *env, bool ifetch) > { > - return EX_TBFLAG_ANY(env->hflags, MMUIDX); > + return MMU_INDEX(EX_TBFLAG_ANY(env->hflags, MMUIDX)); > } This cannot possibly work, since you've not changed any of the real mmu idx (ARMMMUIdx). r~
diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 88e5accda6..16e18fb22a 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2930,7 +2930,7 @@ typedef enum ARMMMUIdxBit { #undef TO_CORE_BIT -#define MMU_USER_IDX 0 +#define MMU_USER_IDX MMU_INDEX(0) /* Indexes used when registering address spaces with cpu_address_space_init */ typedef enum ARMASIdx { @@ -3166,7 +3166,7 @@ FIELD(TBFLAG_A64, NAA, 30, 1) */ static inline int cpu_mmu_index(CPUARMState *env, bool ifetch) { - return EX_TBFLAG_ANY(env->hflags, MMUIDX); + return MMU_INDEX(EX_TBFLAG_ANY(env->hflags, MMUIDX)); } /**
Use the new MMU_INDEX() helper to specify the index of the CPUTLB which should be used. Additionally, in a follow-up patch this helper allows then to optimize the tcg code generation. Signed-off-by: Helge Deller <deller@gmx.de> --- target/arm/cpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.41.0