diff options
| author | Richard Henderson | 2019-03-23 00:07:18 +0100 |
|---|---|---|
| committer | Richard Henderson | 2019-06-10 16:03:34 +0200 |
| commit | 29a0af618ddd21f55df5753c3e16b0625f534b3c (patch) | |
| tree | 18b00b62ec94b2c90d4f0594b1bbc8c992a3b777 /target/ppc | |
| parent | cpu: Define ArchCPU (diff) | |
| download | qemu-29a0af618ddd21f55df5753c3e16b0625f534b3c.tar.gz qemu-29a0af618ddd21f55df5753c3e16b0625f534b3c.tar.xz qemu-29a0af618ddd21f55df5753c3e16b0625f534b3c.zip | |
cpu: Replace ENV_GET_CPU with env_cpu
Now that we have both ArchCPU and CPUArchState, we can define
this generically instead of via macro in each target's cpu.h.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/ppc')
| -rw-r--r-- | target/ppc/cpu.h | 2 | ||||
| -rw-r--r-- | target/ppc/mmu_helper.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 17e7213be9..ec92a8e7af 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1208,8 +1208,6 @@ static inline PowerPCCPU *ppc_env_get_cpu(CPUPPCState *env) return container_of(env, PowerPCCPU, env); } -#define ENV_GET_CPU(e) CPU(ppc_env_get_cpu(e)) - #define ENV_OFFSET offsetof(PowerPCCPU, env) PowerPCCPUClass *ppc_cpu_class_by_pvr(uint32_t pvr); diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index e605efa883..e3149e4d3f 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -522,7 +522,7 @@ static inline int get_segment_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx, ret = ppc6xx_tlb_check(env, ctx, eaddr, rw, type); #if defined(DUMP_PAGE_TABLES) if (qemu_loglevel_mask(CPU_LOG_MMU)) { - CPUState *cs = ENV_GET_CPU(env); + CPUState *cs = env_cpu(env); hwaddr curaddr; uint32_t a0, a1, a2, a3; |