From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Peter Xu" <peterx@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Bibo Mao" <maobibo@loongson.cn>
Subject: [RFC PATCH 15/25] exec/memory: Add methods for aligned pointer access (address space)
Date: Tue, 18 May 2021 20:36:45 +0200 [thread overview]
Message-ID: <20210518183655.1711377-16-philmd@redhat.com> (raw)
In-Reply-To: <20210518183655.1711377-1-philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/exec/memory.h | 11 +++++++++++
include/exec/memory_ldst_cached.h.inc | 20 ++++++++++++++++----
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 175d7151a5d..7eeabbceef3 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -2315,12 +2315,23 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache,
}
}
+#define address_space_ldub_cached_aligned address_space_ldub_cached
+#define address_space_stb_cached_aligned address_space_stb_cached
+
#define ENDIANNESS _le
#include "exec/memory_ldst_cached.h.inc"
#define ENDIANNESS _be
#include "exec/memory_ldst_cached.h.inc"
+#define LDST_ALIGNED
+#define ENDIANNESS _le
+#include "exec/memory_ldst_cached.h.inc"
+
+#define LDST_ALIGNED
+#define ENDIANNESS _be
+#include "exec/memory_ldst_cached.h.inc"
+
#define SUFFIX _cached
#define ARG1 cache
#define ARG1_DECL MemoryRegionCache *cache
diff --git a/include/exec/memory_ldst_cached.h.inc b/include/exec/memory_ldst_cached.h.inc
index d7834f852c4..db45e688c03 100644
--- a/include/exec/memory_ldst_cached.h.inc
+++ b/include/exec/memory_ldst_cached.h.inc
@@ -17,12 +17,21 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef LDST_ALIGNED
+#define FUNC_SUFFIX _cached_aligned
+#define LDST_SUFFIX _ap
+#undef LDST_ALIGNED
+#else
+#define FUNC_SUFFIX _cached
+#define LDST_SUFFIX _p
+#endif
+
#define ADDRESS_SPACE_LD_CACHED(size) \
- glue(glue(address_space_ld, size), glue(ENDIANNESS, _cached))
+ glue(glue(address_space_ld, size), glue(ENDIANNESS, FUNC_SUFFIX))
#define ADDRESS_SPACE_LD_CACHED_SLOW(size) \
glue(glue(address_space_ld, size), glue(ENDIANNESS, _cached_slow))
#define LD_P(size) \
- glue(glue(ld, size), glue(ENDIANNESS, _p))
+ glue(glue(ld, size), glue(ENDIANNESS, LDST_SUFFIX))
static inline uint16_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cache,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
@@ -65,11 +74,11 @@ static inline uint64_t ADDRESS_SPACE_LD_CACHED(q)(MemoryRegionCache *cache,
#undef LD_P
#define ADDRESS_SPACE_ST_CACHED(size) \
- glue(glue(address_space_st, size), glue(ENDIANNESS, _cached))
+ glue(glue(address_space_st, size), glue(ENDIANNESS, FUNC_SUFFIX))
#define ADDRESS_SPACE_ST_CACHED_SLOW(size) \
glue(glue(address_space_st, size), glue(ENDIANNESS, _cached_slow))
#define ST_P(size) \
- glue(glue(st, size), glue(ENDIANNESS, _p))
+ glue(glue(st, size), glue(ENDIANNESS, LDST_SUFFIX))
static inline void ADDRESS_SPACE_ST_CACHED(w)(MemoryRegionCache *cache,
hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result)
@@ -108,4 +117,7 @@ static inline void ADDRESS_SPACE_ST_CACHED(q)(MemoryRegionCache *cache,
#undef ADDRESS_SPACE_ST_CACHED_SLOW
#undef ST_P
+#undef FUNC_SUFFIX
+#undef LDST_SUFFIX
+
#undef ENDIANNESS
--
2.26.3
next prev parent reply other threads:[~2021-05-18 18:51 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 18:36 [RFC PATCH 00/25] exec: Add load/store API for aligned pointers Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 01/25] exec/memory_ldst_cached: Sort declarations Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 02/25] exec/memory_ldst_phys: " Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 03/25] exec/memory_ldst: Use correct type sizes Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 04/25] exec/memory_ldst_phys: " Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 05/25] exec/memory_ldst_cached: Use correct type size Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 06/25] exec/memory: " Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 07/25] qemu/bswap: Introduce ST_CONVERT() macro Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 08/25] qemu/bswap: Use ST_CONVERT() macro to emit 16-bit load/store functions Philippe Mathieu-Daudé
2021-05-18 20:08 ` Peter Maydell
2021-05-19 17:30 ` Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 09/25] qemu/bswap: Introduce LD_CONVERT() macro Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 10/25] qemu/bswap: Use LD_CONVERT macro to emit 16-bit signed load/store code Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 11/25] qemu/bswap: Use LD_CONVERT macro to emit 16-bit unsigned " Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 12/25] qemu/bswap: Use LDST_CONVERT macro to emit 32-bit load/store functions Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 13/25] qemu/bswap: Use LDST_CONVERT macro to emit 64-bit " Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 14/25] qemu/bswap: Introduce load/store for aligned pointer Philippe Mathieu-Daudé
2021-05-18 20:15 ` Peter Maydell
2021-05-19 5:56 ` Philippe Mathieu-Daudé
2021-05-19 9:08 ` Stefan Hajnoczi
2021-05-18 18:36 ` Philippe Mathieu-Daudé [this message]
2021-05-18 18:36 ` [RFC PATCH 16/25] exec/memory: Add methods for aligned pointer access (physical memory) Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 17/25] hw/virtio: Use correct type sizes Philippe Mathieu-Daudé
2021-05-20 16:27 ` Richard Henderson
2021-05-20 19:13 ` Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 18/25] hw/virtio: Introduce VIRTIO_LD_CONVERT() macro Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 19/25] hw/virtio: Use LD_CONVERT macro to emit 16-bit unsigned load/store code Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 20/25] hw/virtio: Introduce VIRTIO_ST_CONVERT() macro Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 21/25] hw/virtio: Use ST_CONVERT() macro to emit 16-bit load/store functions Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 22/25] hw/virtio: Use LDST_CONVERT macro to emit 32-bit " Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 23/25] hw/virtio: Use LDST_CONVERT macro to emit 64-bit " Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 24/25] hw/virtio: Add methods for aligned pointer access Philippe Mathieu-Daudé
2021-05-18 18:36 ` [RFC PATCH 25/25] hw/virtio: Optimize accesses on vring aligned pointers Philippe Mathieu-Daudé
2021-05-18 18:42 ` [RFC PATCH 00/25] exec: Add load/store API for " no-reply
2021-05-19 19:20 ` Richard Henderson
2021-05-19 19:40 ` Philippe Mathieu-Daudé
2021-05-20 16:28 ` 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=20210518183655.1711377-16-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=chenhuacai@kernel.org \
--cc=maobibo@loongson.cn \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).