diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-28 11:18:14 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-05 16:05:47 +0200 |
| commit | a6c9eac0d57d29bce82200175f9a4ef03c2c6bca (patch) | |
| tree | 1968b8d76873ed7f107a21b7875b332487ef20b9 | |
| parent | 859d76120b87598bed0ba0757f62327cc8834332 (diff) | |
softmmu: move MMUSUFFIX under SOFTMMU_CODE_ACCESS
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | include/exec/softmmu_header.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/exec/softmmu_header.h b/include/exec/softmmu_header.h index 087b2d4e1e..cc85a43685 100644 --- a/include/exec/softmmu_header.h +++ b/include/exec/softmmu_header.h @@ -48,20 +48,11 @@ #endif #if ACCESS_TYPE < (NB_MMU_MODES) - #define CPU_MMU_INDEX ACCESS_TYPE -#define MMUSUFFIX _mmu - #elif ACCESS_TYPE == (NB_MMU_MODES) - #define CPU_MMU_INDEX (cpu_mmu_index(env)) -#define MMUSUFFIX _mmu - #elif ACCESS_TYPE == (NB_MMU_MODES + 1) - #define CPU_MMU_INDEX (cpu_mmu_index(env)) -#define MMUSUFFIX _cmmu - #else #error invalid ACCESS_TYPE #endif @@ -74,8 +65,10 @@ #ifdef SOFTMMU_CODE_ACCESS #define ADDR_READ addr_code +#define MMUSUFFIX _cmmu #else #define ADDR_READ addr_read +#define MMUSUFFIX _mmu #endif /* generic load/store macros */ |