From ca0aa408167888d862df3e7f734f6b7b35bd556d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Mar 2014 11:19:35 +0100 Subject: softmmu: move definition of CPU_MMU_INDEX to inclusion site, drop ACCESS_TYPE Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- include/exec/exec-all.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/exec/exec-all.h') diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 8223fbf246..ef72027dd8 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -349,7 +349,7 @@ uint16_t helper_ldw_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx); uint32_t helper_ldl_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx); uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx); -#define ACCESS_TYPE (NB_MMU_MODES + 1) +#define CPU_MMU_INDEX (cpu_mmu_index(env)) #define MEMSUFFIX _code #define SOFTMMU_CODE_ACCESS @@ -365,7 +365,7 @@ uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx); #define DATA_SIZE 8 #include "exec/softmmu_header.h" -#undef ACCESS_TYPE +#undef CPU_MMU_INDEX #undef MEMSUFFIX #undef SOFTMMU_CODE_ACCESS -- cgit v1.2.3-55-g7522