Commit 06eb2e29 authored Mar 22, 2019 by Richard Henderson

target/tricore: Use env_cpu



Cleanup in the boilerplate that each target must define.
Replace tricore_env_get_cpu with env_archcpu.  The combination
CPU(tricore_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>

parent 06887771

target/tricore/cpu.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -208,11 +208,6 @@ struct TriCoreCPU {
		CPUTriCoreState env;
		};

		static inline TriCoreCPU tricore_env_get_cpu(CPUTriCoreState env)
		{
		return TRICORE_CPU(container_of(env, TriCoreCPU, env));
		}

		#define ENV_OFFSET offsetof(TriCoreCPU, env)

		hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);

target/tricore/op_helper.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ static void QEMU_NORETURN
		raise_exception_sync_internal(CPUTriCoreState *env, uint32_t class, int tin,
		uintptr_t pc, uint32_t fcd_pc)
		{
		CPUState *cs = CPU(tricore_env_get_cpu(env));
		CPUState *cs = env_cpu(env);
		/* in case we come from a helper-call we need to restore the PC */
		cpu_restore_state(cs, pc, true);