Reviewed-by: Richard Henderson <r...@twiddle.net> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- include/exec/exec-all.h | 4 ++-- include/exec/softmmu_exec.h | 28 ++++++++++++++-------------- include/exec/softmmu_header.h | 11 ----------- 3 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 8223fbf..ef72027 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 diff --git a/include/exec/softmmu_exec.h b/include/exec/softmmu_exec.h index 470db20..8217733 100644 --- a/include/exec/softmmu_exec.h +++ b/include/exec/softmmu_exec.h @@ -22,7 +22,7 @@ /* The memory helpers for tcg-generated code need tcg_target_long etc. */ #include "tcg.h" -#define ACCESS_TYPE 0 +#define CPU_MMU_INDEX 0 #define MEMSUFFIX MMU_MODE0_SUFFIX #define DATA_SIZE 1 #include "exec/softmmu_header.h" @@ -35,10 +35,10 @@ #define DATA_SIZE 8 #include "exec/softmmu_header.h" -#undef ACCESS_TYPE +#undef CPU_MMU_INDEX #undef MEMSUFFIX -#define ACCESS_TYPE 1 +#define CPU_MMU_INDEX 1 #define MEMSUFFIX MMU_MODE1_SUFFIX #define DATA_SIZE 1 #include "exec/softmmu_header.h" @@ -51,12 +51,12 @@ #define DATA_SIZE 8 #include "exec/softmmu_header.h" -#undef ACCESS_TYPE +#undef CPU_MMU_INDEX #undef MEMSUFFIX #if (NB_MMU_MODES >= 3) -#define ACCESS_TYPE 2 +#define CPU_MMU_INDEX 2 #define MEMSUFFIX MMU_MODE2_SUFFIX #define DATA_SIZE 1 #include "exec/softmmu_header.h" @@ -69,13 +69,13 @@ #define DATA_SIZE 8 #include "exec/softmmu_header.h" -#undef ACCESS_TYPE +#undef CPU_MMU_INDEX #undef MEMSUFFIX #endif /* (NB_MMU_MODES >= 3) */ #if (NB_MMU_MODES >= 4) -#define ACCESS_TYPE 3 +#define CPU_MMU_INDEX 3 #define MEMSUFFIX MMU_MODE3_SUFFIX #define DATA_SIZE 1 #include "exec/softmmu_header.h" @@ -88,13 +88,13 @@ #define DATA_SIZE 8 #include "exec/softmmu_header.h" -#undef ACCESS_TYPE +#undef CPU_MMU_INDEX #undef MEMSUFFIX #endif /* (NB_MMU_MODES >= 4) */ #if (NB_MMU_MODES >= 5) -#define ACCESS_TYPE 4 +#define CPU_MMU_INDEX 4 #define MEMSUFFIX MMU_MODE4_SUFFIX #define DATA_SIZE 1 #include "exec/softmmu_header.h" @@ -107,13 +107,13 @@ #define DATA_SIZE 8 #include "exec/softmmu_header.h" -#undef ACCESS_TYPE +#undef CPU_MMU_INDEX #undef MEMSUFFIX #endif /* (NB_MMU_MODES >= 5) */ #if (NB_MMU_MODES >= 6) -#define ACCESS_TYPE 5 +#define CPU_MMU_INDEX 5 #define MEMSUFFIX MMU_MODE5_SUFFIX #define DATA_SIZE 1 #include "exec/softmmu_header.h" @@ -126,7 +126,7 @@ #define DATA_SIZE 8 #include "exec/softmmu_header.h" -#undef ACCESS_TYPE +#undef CPU_MMU_INDEX #undef MEMSUFFIX #endif /* (NB_MMU_MODES >= 6) */ @@ -135,7 +135,7 @@ #endif /* (NB_MMU_MODES > 6) */ /* these access are slower, they must be as rare as possible */ -#define ACCESS_TYPE (NB_MMU_MODES) +#define CPU_MMU_INDEX (cpu_mmu_index(env)) #define MEMSUFFIX _data #define DATA_SIZE 1 #include "exec/softmmu_header.h" @@ -148,7 +148,7 @@ #define DATA_SIZE 8 #include "exec/softmmu_header.h" -#undef ACCESS_TYPE +#undef CPU_MMU_INDEX #undef MEMSUFFIX #define ldub(p) ldub_data(p) diff --git a/include/exec/softmmu_header.h b/include/exec/softmmu_header.h index cc85a43..bb18f97 100644 --- a/include/exec/softmmu_header.h +++ b/include/exec/softmmu_header.h @@ -47,16 +47,6 @@ #error unsupported data size #endif -#if ACCESS_TYPE < (NB_MMU_MODES) -#define CPU_MMU_INDEX ACCESS_TYPE -#elif ACCESS_TYPE == (NB_MMU_MODES) -#define CPU_MMU_INDEX (cpu_mmu_index(env)) -#elif ACCESS_TYPE == (NB_MMU_MODES + 1) -#define CPU_MMU_INDEX (cpu_mmu_index(env)) -#else -#error invalid ACCESS_TYPE -#endif - #if DATA_SIZE == 8 #define RES_TYPE uint64_t #else @@ -199,6 +189,5 @@ static inline void glue(cpu_stfl, MEMSUFFIX)(CPUArchState *env, #undef SUFFIX #undef USUFFIX #undef DATA_SIZE -#undef CPU_MMU_INDEX #undef MMUSUFFIX #undef ADDR_READ -- 1.8.3.1
