[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 03/11] softmmu: move MMUSUFFIX under SOFTMMU_COD
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [RFC PATCH 03/11] softmmu: move MMUSUFFIX under SOFTMMU_CODE_ACCESS |
Date: |
Thu, 8 May 2014 18:09:43 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/exec/softmmu_header.h | 11 ++---------
1 file 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.8.3.1
- Re: [Qemu-devel] [RFC PATCH 11/11] softmmu: move all load/store functions to cpu_ldst.h, (continued)
- [Qemu-devel] [RFC PATCH 09/11] target-arm: move arm_*_code to a separate file, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [RFC PATCH 05/11] softmmu: move ALIGNED_ONLY to cpu.h, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [RFC PATCH 04/11] softmmu: move definition of CPU_MMU_INDEX to inclusion site, drop ACCESS_TYPE, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [RFC PATCH 02/11] softmmu: start introducing SOFTMMU_CODE_ACCESS in softmmu_header.h, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [RFC PATCH 08/11] softmmu: make do_unaligned_access extern, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [RFC PATCH 03/11] softmmu: move MMUSUFFIX under SOFTMMU_CODE_ACCESS,
Paolo Bonzini <=
- [Qemu-devel] [RFC PATCH 07/11] softmmu: move softmmu_template.h out of include/, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [RFC PATCH 10/11] softmmu: introduce cpu_ldst.h, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [RFC PATCH 06/11] softmmu: commonize helper definitions, Paolo Bonzini, 2014/05/08
- Re: [Qemu-devel] [RFC PATCH 00/11] Cleanup load/store functions in headers and C files, Richard Henderson, 2014/05/12