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

softmmu: move MMUSUFFIX under SOFTMMU_CODE_ACCESS

Browse Source 
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:18:14 +01:00
parent 859d76120b
commit a6c9eac0d5
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/exec/softmmu_header.h
View File

@ -48,20 +48,11 @@
#endif #endif
#if ACCESS_TYPE < (NB_MMU_MODES) #if ACCESS_TYPE < (NB_MMU_MODES)
#define CPU_MMU_INDEX ACCESS_TYPE #define CPU_MMU_INDEX ACCESS_TYPE
#define MMUSUFFIX _mmu
#elif ACCESS_TYPE == (NB_MMU_MODES) #elif ACCESS_TYPE == (NB_MMU_MODES)
#define CPU_MMU_INDEX (cpu_mmu_index(env)) #define CPU_MMU_INDEX (cpu_mmu_index(env))
#define MMUSUFFIX _mmu
#elif ACCESS_TYPE == (NB_MMU_MODES + 1) #elif ACCESS_TYPE == (NB_MMU_MODES + 1)
#define CPU_MMU_INDEX (cpu_mmu_index(env)) #define CPU_MMU_INDEX (cpu_mmu_index(env))
#define MMUSUFFIX _cmmu
#else #else
#error invalid ACCESS_TYPE #error invalid ACCESS_TYPE
#endif #endif
@ -74,8 +65,10 @@
#ifdef SOFTMMU_CODE_ACCESS #ifdef SOFTMMU_CODE_ACCESS
#define ADDR_READ addr_code #define ADDR_READ addr_code
#define MMUSUFFIX _cmmu
#else #else
#define ADDR_READ addr_read #define ADDR_READ addr_read
#define MMUSUFFIX _mmu
#endif #endif
/* generic load/store macros */ /* generic load/store macros */