target/ppc: Use env_cpu, env_archcpu

Cleanup in the boilerplate that each target must define.
Replace ppc_env_get_cpu with env_archcpu.  The combination
CPU(ppc_env_get_cpu) should have used ENV_GET_CPU to begin;
use env_cpu now.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2019-03-22 19:07:57 -07:00
parent 5ee2b02e92
commit db70b31144
13 changed files with 134 additions and 172 deletions

View file

@ -1203,11 +1203,6 @@ struct PowerPCCPU {
int32_t mig_slb_nr;
};
static inline PowerPCCPU *ppc_env_get_cpu(CPUPPCState *env)
{
return container_of(env, PowerPCCPU, env);
}
#define ENV_OFFSET offsetof(PowerPCCPU, env)
PowerPCCPUClass *ppc_cpu_class_by_pvr(uint32_t pvr);
@ -2450,7 +2445,7 @@ static inline int booke206_tlbm_to_tlbn(CPUPPCState *env, ppcmas_tlb_t *tlbm)
}
}
cpu_abort(CPU(ppc_env_get_cpu(env)), "Unknown TLBe: %d\n", id);
cpu_abort(env_cpu(env), "Unknown TLBe: %d\n", id);
return 0;
}