diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-28 11:15:30 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-05 16:05:27 +0200 |
| commit | 859d76120b87598bed0ba0757f62327cc8834332 (patch) | |
| tree | 91e6634f42d436eef8b2886736ab6493476e84c8 | |
| parent | 0983979b3a5edbff399c092b90c8be6dc656f2a4 (diff) | |
| download | focaccia-qemu-859d76120b87598bed0ba0757f62327cc8834332.tar.gz focaccia-qemu-859d76120b87598bed0ba0757f62327cc8834332.zip | |
softmmu: start introducing SOFTMMU_CODE_ACCESS in softmmu_header.h
This preprocessor symbol is already used in softmmu_template.h. We will use it to distinguish the two "fake" ACCESS_TYPEs NB_MMU_MODES and NB_MMU_MODES + 1. Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | include/exec/exec-all.h | 2 | ||||
| -rw-r--r-- | include/exec/softmmu_header.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index c964ca4f0b..8223fbf246 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -351,6 +351,7 @@ uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx); #define ACCESS_TYPE (NB_MMU_MODES + 1) #define MEMSUFFIX _code +#define SOFTMMU_CODE_ACCESS #define DATA_SIZE 1 #include "exec/softmmu_header.h" @@ -366,6 +367,7 @@ uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx); #undef ACCESS_TYPE #undef MEMSUFFIX +#undef SOFTMMU_CODE_ACCESS #endif diff --git a/include/exec/softmmu_header.h b/include/exec/softmmu_header.h index d8d9c81b05..087b2d4e1e 100644 --- a/include/exec/softmmu_header.h +++ b/include/exec/softmmu_header.h @@ -72,7 +72,7 @@ #define RES_TYPE uint32_t #endif -#if ACCESS_TYPE == (NB_MMU_MODES + 1) +#ifdef SOFTMMU_CODE_ACCESS #define ADDR_READ addr_code #else #define ADDR_READ addr_read @@ -124,7 +124,7 @@ glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) } #endif -#if ACCESS_TYPE != (NB_MMU_MODES + 1) +#ifndef SOFTMMU_CODE_ACCESS /* generic store macro */ @@ -148,9 +148,7 @@ glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr, } } -#endif /* ACCESS_TYPE != (NB_MMU_MODES + 1) */ -#if ACCESS_TYPE != (NB_MMU_MODES + 1) #if DATA_SIZE == 8 static inline float64 glue(cpu_ldfq, MEMSUFFIX)(CPUArchState *env, @@ -200,7 +198,7 @@ static inline void glue(cpu_stfl, MEMSUFFIX)(CPUArchState *env, } #endif /* DATA_SIZE == 4 */ -#endif /* ACCESS_TYPE != (NB_MMU_MODES + 1) */ +#endif /* !SOFTMMU_CODE_ACCESS */ #undef RES_TYPE #undef DATA_TYPE |