From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, rth@twiddle.net
Subject: [Qemu-devel] [RFC PATCH 03/11] softmmu: move MMUSUFFIX under SOFTMMU_CODE_ACCESS
Date: Thu, 8 May 2014 18:09:43 +0200 [thread overview]
Message-ID: <1399565391-27833-4-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1399565391-27833-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
| 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
--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
next prev parent reply other threads:[~2014-05-08 16:44 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-08 16:09 [Qemu-devel] [RFC PATCH 00/11] Cleanup load/store functions in headers and C files Paolo Bonzini
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 01/11] hw: use ld_p/st_p instead of ld_raw/st_raw Paolo Bonzini
2014-05-09 18:18 ` Peter Maydell
2014-05-09 19:03 ` Paolo Bonzini
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 02/11] softmmu: start introducing SOFTMMU_CODE_ACCESS in softmmu_header.h Paolo Bonzini
2014-05-08 16:09 ` Paolo Bonzini [this message]
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 04/11] softmmu: move definition of CPU_MMU_INDEX to inclusion site, drop ACCESS_TYPE Paolo Bonzini
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 05/11] softmmu: move ALIGNED_ONLY to cpu.h Paolo Bonzini
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 06/11] softmmu: commonize helper definitions Paolo Bonzini
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 07/11] softmmu: move softmmu_template.h out of include/ Paolo Bonzini
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 08/11] softmmu: make do_unaligned_access extern Paolo Bonzini
2014-05-13 6:53 ` Andreas Färber
2014-05-13 7:08 ` Paolo Bonzini
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 09/11] target-arm: move arm_*_code to a separate file Paolo Bonzini
2014-05-13 7:03 ` Andreas Färber
2014-05-13 9:05 ` Peter Maydell
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 10/11] softmmu: introduce cpu_ldst.h Paolo Bonzini
2014-05-08 16:09 ` [Qemu-devel] [RFC PATCH 11/11] softmmu: move all load/store functions to cpu_ldst.h Paolo Bonzini
2014-05-12 17:36 ` Richard Henderson
2014-05-13 7:13 ` Andreas Färber
2014-05-13 7:32 ` Paolo Bonzini
2014-05-12 17:37 ` [Qemu-devel] [RFC PATCH 00/11] Cleanup load/store functions in headers and C files Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399565391-27833-4-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).