[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/13] softmmu: move MMUSUFFIX under SOFTMMU_CODE_AC
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 05/13] softmmu: move MMUSUFFIX under SOFTMMU_CODE_ACCESS |
Date: |
Fri, 23 May 2014 17:20:49 +0200 |
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 087b2d4..cc85a43 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 */
--
1.7.1
- [Qemu-devel] [PATCH 00/13] Cleanup load/store functions in headers and C files, Paolo Bonzini, 2014/05/23
- [Qemu-devel] [PATCH 01/13] cputlb: Fix regression with TCG interpreter (bug 1310324), Paolo Bonzini, 2014/05/23
- [Qemu-devel] [PATCH 02/13] nseries: clean up coding style, Paolo Bonzini, 2014/05/23
- [Qemu-devel] [PATCH 04/13] softmmu: start introducing SOFTMMU_CODE_ACCESS in softmmu_header.h, Paolo Bonzini, 2014/05/23
- [Qemu-devel] [PATCH 03/13] hw: use ld_p/st_p instead of ld_raw/st_raw, Paolo Bonzini, 2014/05/23
- [Qemu-devel] [PATCH 06/13] softmmu: move definition of CPU_MMU_INDEX to inclusion site, drop ACCESS_TYPE, Paolo Bonzini, 2014/05/23
- [Qemu-devel] [PATCH 05/13] softmmu: move MMUSUFFIX under SOFTMMU_CODE_ACCESS,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 08/13] softmmu: move ALIGNED_ONLY to cpu.h, Paolo Bonzini, 2014/05/23
- [Qemu-devel] [PATCH 07/13] softmmu: make do_unaligned_access a method of CPU, Paolo Bonzini, 2014/05/23
[Qemu-devel] [PATCH 09/13] softmmu: commonize helper definitions, Paolo Bonzini, 2014/05/23
[Qemu-devel] [PATCH 10/13] softmmu: move softmmu_template.h out of include/, Paolo Bonzini, 2014/05/23
[Qemu-devel] [PATCH 11/13] target-arm: move arm_*_code to a separate file, Paolo Bonzini, 2014/05/23
[Qemu-devel] [PATCH 12/13] softmmu: introduce cpu_ldst.h, Paolo Bonzini, 2014/05/23