| Message ID | 20190508000641.19090-9-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tcg: Move the softmmu tlb to CPUNegativeOffsetState | expand |
On Tue, May 7, 2019 at 5:07 PM Richard Henderson <richard.henderson@linaro.org> wrote: > > With exactly one exception, most uses of alpha_env_get_cpu > were failures to use the more proper, ENV_GET_CPU macro, > now replaced by env_cpu. > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/alpha/cpu.h | 5 ----- > linux-user/alpha/cpu_loop.c | 2 +- > target/alpha/helper.c | 8 +++----- > target/alpha/sys_helper.c | 8 ++++---- > 4 files changed, 8 insertions(+), 15 deletions(-) > > diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h > index 2c7f75f584..53c085f691 100644 > --- a/target/alpha/cpu.h > +++ b/target/alpha/cpu.h > @@ -273,11 +273,6 @@ struct AlphaCPU { > QEMUTimer *alarm_timer; > }; > > -static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env) > -{ > - return container_of(env, AlphaCPU, env); > -} > - > #define ENV_OFFSET offsetof(AlphaCPU, env) > > #ifndef CONFIG_USER_ONLY > diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c > index 61992571e1..7a94eee84c 100644 > --- a/linux-user/alpha/cpu_loop.c > +++ b/linux-user/alpha/cpu_loop.c > @@ -23,7 +23,7 @@ > > void cpu_loop(CPUAlphaState *env) > { > - CPUState *cs = CPU(alpha_env_get_cpu(env)); > + CPUState *cs = env_cpu(env); > int trapnr; > target_siginfo_t info; > abi_long sysret; > diff --git a/target/alpha/helper.c b/target/alpha/helper.c > index 7201576aae..08dfb834a5 100644 > --- a/target/alpha/helper.c > +++ b/target/alpha/helper.c > @@ -119,7 +119,7 @@ static int get_physical_address(CPUAlphaState *env, target_ulong addr, > int prot_need, int mmu_idx, > target_ulong *pphys, int *pprot) > { > - CPUState *cs = CPU(alpha_env_get_cpu(env)); > + CPUState *cs = env_cpu(env); > target_long saddr = addr; > target_ulong phys = 0; > target_ulong L1pte, L2pte, L3pte; > @@ -463,8 +463,7 @@ void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags) > We expect that ENV->PC has already been updated. */ > void QEMU_NORETURN helper_excp(CPUAlphaState *env, int excp, int error) > { > - AlphaCPU *cpu = alpha_env_get_cpu(env); > - CPUState *cs = CPU(cpu); > + CPUState *cs = env_cpu(env); > > cs->exception_index = excp; > env->error_code = error; > @@ -475,8 +474,7 @@ void QEMU_NORETURN helper_excp(CPUAlphaState *env, int excp, int error) > void QEMU_NORETURN dynamic_excp(CPUAlphaState *env, uintptr_t retaddr, > int excp, int error) > { > - AlphaCPU *cpu = alpha_env_get_cpu(env); > - CPUState *cs = CPU(cpu); > + CPUState *cs = env_cpu(env); > > cs->exception_index = excp; > env->error_code = error; > diff --git a/target/alpha/sys_helper.c b/target/alpha/sys_helper.c > index ac22323191..f9c34b1144 100644 > --- a/target/alpha/sys_helper.c > +++ b/target/alpha/sys_helper.c > @@ -44,17 +44,17 @@ uint64_t helper_load_pcc(CPUAlphaState *env) > #ifndef CONFIG_USER_ONLY > void helper_tbia(CPUAlphaState *env) > { > - tlb_flush(CPU(alpha_env_get_cpu(env))); > + tlb_flush(env_cpu(env)); > } > > void helper_tbis(CPUAlphaState *env, uint64_t p) > { > - tlb_flush_page(CPU(alpha_env_get_cpu(env)), p); > + tlb_flush_page(env_cpu(env), p); > } > > void helper_tb_flush(CPUAlphaState *env) > { > - tb_flush(CPU(alpha_env_get_cpu(env))); > + tb_flush(env_cpu(env)); > } > > void helper_halt(uint64_t restart) > @@ -78,7 +78,7 @@ uint64_t helper_get_walltime(void) > > void helper_set_alarm(CPUAlphaState *env, uint64_t expire) > { > - AlphaCPU *cpu = alpha_env_get_cpu(env); > + AlphaCPU *cpu = env_archcpu(env); > > if (expire) { > env->alarm_expire = expire; > -- > 2.17.1 > >
diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index 2c7f75f584..53c085f691 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -273,11 +273,6 @@ struct AlphaCPU { QEMUTimer *alarm_timer; }; -static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env) -{ - return container_of(env, AlphaCPU, env); -} - #define ENV_OFFSET offsetof(AlphaCPU, env) #ifndef CONFIG_USER_ONLY diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c index 61992571e1..7a94eee84c 100644 --- a/linux-user/alpha/cpu_loop.c +++ b/linux-user/alpha/cpu_loop.c @@ -23,7 +23,7 @@ void cpu_loop(CPUAlphaState *env) { - CPUState *cs = CPU(alpha_env_get_cpu(env)); + CPUState *cs = env_cpu(env); int trapnr; target_siginfo_t info; abi_long sysret; diff --git a/target/alpha/helper.c b/target/alpha/helper.c index 7201576aae..08dfb834a5 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -119,7 +119,7 @@ static int get_physical_address(CPUAlphaState *env, target_ulong addr, int prot_need, int mmu_idx, target_ulong *pphys, int *pprot) { - CPUState *cs = CPU(alpha_env_get_cpu(env)); + CPUState *cs = env_cpu(env); target_long saddr = addr; target_ulong phys = 0; target_ulong L1pte, L2pte, L3pte; @@ -463,8 +463,7 @@ void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags) We expect that ENV->PC has already been updated. */ void QEMU_NORETURN helper_excp(CPUAlphaState *env, int excp, int error) { - AlphaCPU *cpu = alpha_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = env_cpu(env); cs->exception_index = excp; env->error_code = error; @@ -475,8 +474,7 @@ void QEMU_NORETURN helper_excp(CPUAlphaState *env, int excp, int error) void QEMU_NORETURN dynamic_excp(CPUAlphaState *env, uintptr_t retaddr, int excp, int error) { - AlphaCPU *cpu = alpha_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = env_cpu(env); cs->exception_index = excp; env->error_code = error; diff --git a/target/alpha/sys_helper.c b/target/alpha/sys_helper.c index ac22323191..f9c34b1144 100644 --- a/target/alpha/sys_helper.c +++ b/target/alpha/sys_helper.c @@ -44,17 +44,17 @@ uint64_t helper_load_pcc(CPUAlphaState *env) #ifndef CONFIG_USER_ONLY void helper_tbia(CPUAlphaState *env) { - tlb_flush(CPU(alpha_env_get_cpu(env))); + tlb_flush(env_cpu(env)); } void helper_tbis(CPUAlphaState *env, uint64_t p) { - tlb_flush_page(CPU(alpha_env_get_cpu(env)), p); + tlb_flush_page(env_cpu(env), p); } void helper_tb_flush(CPUAlphaState *env) { - tb_flush(CPU(alpha_env_get_cpu(env))); + tb_flush(env_cpu(env)); } void helper_halt(uint64_t restart) @@ -78,7 +78,7 @@ uint64_t helper_get_walltime(void) void helper_set_alarm(CPUAlphaState *env, uint64_t expire) { - AlphaCPU *cpu = alpha_env_get_cpu(env); + AlphaCPU *cpu = env_archcpu(env); if (expire) { env->alarm_expire = expire;