[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 04/12] exec/memory_ldst_cached: Sort declarations
From: |
Philippe Mathieu-Daudé |
Subject: |
[RFC PATCH 04/12] exec/memory_ldst_cached: Sort declarations |
Date: |
Thu, 20 May 2021 13:09:11 +0200 |
To ease the file review, sort the declarations by the size of
the access (8, 16, 32). Simple code movement, no logical change.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/exec/memory_ldst_cached.h.inc | 46 +++++++++++++--------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/include/exec/memory_ldst_cached.h.inc
b/include/exec/memory_ldst_cached.h.inc
index 7bc8790d346..c33449d0cd5 100644
--- a/include/exec/memory_ldst_cached.h.inc
+++ b/include/exec/memory_ldst_cached.h.inc
@@ -24,6 +24,18 @@
#define LD_P(size) \
glue(glue(ld, size), glue(ENDIANNESS, _p))
+static inline uint32_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cache,
+ hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
+{
+ assert(addr < cache->len && 2 <= cache->len - addr);
+ fuzz_dma_read_cb(cache->xlat + addr, 2, cache->mrs.mr);
+ if (likely(cache->ptr)) {
+ return LD_P(uw)(cache->ptr + addr);
+ } else {
+ return ADDRESS_SPACE_LD_CACHED_SLOW(uw)(cache, addr, attrs, result);
+ }
+}
+
static inline uint32_t ADDRESS_SPACE_LD_CACHED(l)(MemoryRegionCache *cache,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
{
@@ -48,18 +60,6 @@ static inline uint64_t
ADDRESS_SPACE_LD_CACHED(q)(MemoryRegionCache *cache,
}
}
-static inline uint32_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cache,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- assert(addr < cache->len && 2 <= cache->len - addr);
- fuzz_dma_read_cb(cache->xlat + addr, 2, cache->mrs.mr);
- if (likely(cache->ptr)) {
- return LD_P(uw)(cache->ptr + addr);
- } else {
- return ADDRESS_SPACE_LD_CACHED_SLOW(uw)(cache, addr, attrs, result);
- }
-}
-
#undef ADDRESS_SPACE_LD_CACHED
#undef ADDRESS_SPACE_LD_CACHED_SLOW
#undef LD_P
@@ -71,17 +71,6 @@ static inline uint32_t
ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cache,
#define ST_P(size) \
glue(glue(st, size), glue(ENDIANNESS, _p))
-static inline void ADDRESS_SPACE_ST_CACHED(l)(MemoryRegionCache *cache,
- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- assert(addr < cache->len && 4 <= cache->len - addr);
- if (likely(cache->ptr)) {
- ST_P(l)(cache->ptr + addr, val);
- } else {
- ADDRESS_SPACE_ST_CACHED_SLOW(l)(cache, addr, val, attrs, result);
- }
-}
-
static inline void ADDRESS_SPACE_ST_CACHED(w)(MemoryRegionCache *cache,
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
{
@@ -93,6 +82,17 @@ static inline void
ADDRESS_SPACE_ST_CACHED(w)(MemoryRegionCache *cache,
}
}
+static inline void ADDRESS_SPACE_ST_CACHED(l)(MemoryRegionCache *cache,
+ hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
+{
+ assert(addr < cache->len && 4 <= cache->len - addr);
+ if (likely(cache->ptr)) {
+ ST_P(l)(cache->ptr + addr, val);
+ } else {
+ ADDRESS_SPACE_ST_CACHED_SLOW(l)(cache, addr, val, attrs, result);
+ }
+}
+
static inline void ADDRESS_SPACE_ST_CACHED(q)(MemoryRegionCache *cache,
hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result)
{
--
2.26.3
- [RFC PATCH 00/12] exec/memory: Experimental API to catch unaligned accesses, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 01/12] exec/memory_ldst: Use correct type sizes, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 02/12] exec/memattrs: Add attribute/error for address alignment, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 03/12] exec/memory_ldst: Return MEMTX_UNALIGNED_ERROR for unaligned addresses, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 04/12] exec/memory_ldst_cached: Sort declarations,
Philippe Mathieu-Daudé <=
- [RFC PATCH 05/12] exec/memory_ldst_cached: Use correct type size, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 06/12] exec/memory_ldst_cached: Set MemTxResult on success, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 07/12] exec/memory_ldst_cached: Document aligned addresses are expected, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 08/12] exec/memory_ldst_cached: Check address alignment if requested, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 09/12] hw/virtio: Use correct type sizes, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 10/12] hw/virtio: Extract virtio_lduw_phys_cached_with_attrs(), Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 12/12] hw/virtio: Display error if vring flag field is not aligned, Philippe Mathieu-Daudé, 2021/05/20
- [RFC PATCH 11/12] hw/virtio: Have vring_avail_flags() return a boolean value, Philippe Mathieu-Daudé, 2021/05/20
- Re: [RFC PATCH 00/12] exec/memory: Experimental API to catch unaligned accesses, Philippe Mathieu-Daudé, 2021/05/31