david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

softmmu: start introducing SOFTMMU_CODE_ACCESS in softmmu_header.h

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2014-03-28 11:15:30 +01:00
parent 0983979b3a
commit 859d76120b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/exec/exec-all.h
View File

@ -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 ACCESS_TYPE (NB_MMU_MODES + 1)
#define MEMSUFFIX _code #define MEMSUFFIX _code
#define SOFTMMU_CODE_ACCESS
#define DATA_SIZE 1 #define DATA_SIZE 1
#include "exec/softmmu_header.h" #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 ACCESS_TYPE
#undef MEMSUFFIX #undef MEMSUFFIX
#undef SOFTMMU_CODE_ACCESS
#endif #endif

8
include/exec/softmmu_header.h
View File

@ -72,7 +72,7 @@
#define RES_TYPE uint32_t #define RES_TYPE uint32_t
#endif #endif
#if ACCESS_TYPE == (NB_MMU_MODES + 1) #ifdef SOFTMMU_CODE_ACCESS
#define ADDR_READ addr_code #define ADDR_READ addr_code
#else #else
#define ADDR_READ addr_read #define ADDR_READ addr_read
@ -124,7 +124,7 @@ glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr)
} }
#endif #endif
#if ACCESS_TYPE != (NB_MMU_MODES + 1) #ifndef SOFTMMU_CODE_ACCESS
/* generic store macro */ /* 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 #if DATA_SIZE == 8
static inline float64 glue(cpu_ldfq, MEMSUFFIX)(CPUArchState *env, 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 /* DATA_SIZE == 4 */
#endif /* ACCESS_TYPE != (NB_MMU_MODES + 1) */ #endif /* !SOFTMMU_CODE_ACCESS */
#undef RES_TYPE #undef RES_TYPE
#undef DATA_TYPE #undef DATA_TYPE