[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/15] softmmu/memory: Simplify access_with_adjusted_size interfa
From: |
Richard Henderson |
Subject: |
[PATCH 07/15] softmmu/memory: Simplify access_with_adjusted_size interface |
Date: |
Sat, 19 Jun 2021 10:26:18 -0700 |
Create a typedef for the access_fn callback. Remove the
access_size_{min,max} and access_fn arguments, and instead
derive these from the MemoryRegion argument. Add a write
boolean argument. Mark the function inline.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
softmmu/memory.c | 67 +++++++++++++++++++-----------------------------
1 file changed, 26 insertions(+), 41 deletions(-)
diff --git a/softmmu/memory.c b/softmmu/memory.c
index 744c5a80bd..7373d89600 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -509,22 +509,24 @@ static MemTxResult
memory_region_write_with_attrs_accessor(MemoryRegion *mr,
return mr->ops->write_with_attrs(mr->opaque, addr, tmp, size, attrs);
}
+typedef MemTxResult MemoryRegionAccessFn(MemoryRegion *mr,
+ hwaddr addr,
+ uint64_t *value,
+ unsigned size,
+ signed shift,
+ uint64_t mask,
+ MemTxAttrs attrs);
+
static MemTxResult access_with_adjusted_size(hwaddr addr,
- uint64_t *value,
- unsigned size,
- unsigned access_size_min,
- unsigned access_size_max,
- MemTxResult (*access_fn)
- (MemoryRegion *mr,
- hwaddr addr,
- uint64_t *value,
- unsigned size,
- signed shift,
- uint64_t mask,
- MemTxAttrs attrs),
- MemoryRegion *mr,
- MemTxAttrs attrs)
+ uint64_t *value,
+ unsigned size,
+ MemoryRegion *mr,
+ MemTxAttrs attrs,
+ bool write)
{
+ unsigned access_size_min = mr->ops->impl.min_access_size;
+ unsigned access_size_max = mr->ops->impl.max_access_size;
+ MemoryRegionAccessFn *access_fn;
uint64_t access_mask;
unsigned access_size;
unsigned i;
@@ -537,6 +539,14 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
access_size_max = 4;
}
+ if (write) {
+ access_fn = (mr->ops->write ? memory_region_write_accessor
+ : memory_region_write_with_attrs_accessor);
+ } else {
+ access_fn = (mr->ops->read ? memory_region_read_accessor
+ : memory_region_read_with_attrs_accessor);
+ }
+
/* FIXME: support unaligned access? */
access_size = MAX(MIN(size, access_size_max), access_size_min);
access_mask = MAKE_64BIT_MASK(0, access_size * 8);
@@ -1423,19 +1433,7 @@ MemTxResult memory_region_dispatch_read(MemoryRegion *mr,
}
*pval = 0;
- if (mr->ops->read) {
- r = access_with_adjusted_size(addr, pval, size,
- mr->ops->impl.min_access_size,
- mr->ops->impl.max_access_size,
- memory_region_read_accessor,
- mr, attrs);
- } else {
- r = access_with_adjusted_size(addr, pval, size,
- mr->ops->impl.min_access_size,
- mr->ops->impl.max_access_size,
- memory_region_read_with_attrs_accessor,
- mr, attrs);
- }
+ r = access_with_adjusted_size(addr, pval, size, mr, attrs, false);
adjust_endianness(mr, pval, op);
return r;
}
@@ -1486,20 +1484,7 @@ MemTxResult memory_region_dispatch_write(MemoryRegion
*mr,
return MEMTX_OK;
}
- if (mr->ops->write) {
- return access_with_adjusted_size(addr, &data, size,
- mr->ops->impl.min_access_size,
- mr->ops->impl.max_access_size,
- memory_region_write_accessor, mr,
- attrs);
- } else {
- return
- access_with_adjusted_size(addr, &data, size,
- mr->ops->impl.min_access_size,
- mr->ops->impl.max_access_size,
- memory_region_write_with_attrs_accessor,
- mr, attrs);
- }
+ return access_with_adjusted_size(addr, &data, size, mr, attrs, true);
}
void memory_region_init_io(MemoryRegion *mr,
--
2.25.1
- [PATCH 04/15] accel/tcg: Don't test for watchpoints for code read, (continued)
- [PATCH 04/15] accel/tcg: Don't test for watchpoints for code read, Richard Henderson, 2021/06/19
- [PATCH 05/15] accel/tcg: Handle page span access before i/o access, Richard Henderson, 2021/06/19
- [PATCH 03/15] accel/tcg: Use byte ops for unaligned loads, Richard Henderson, 2021/06/19
- [PATCH 06/15] softmmu/memory: Inline memory_region_dispatch_read1, Richard Henderson, 2021/06/19
- [PATCH 02/15] accel/tcg: Extract load_helper_unaligned from load_helper, Richard Henderson, 2021/06/19
- [PATCH 08/15] hw/net/e1000e: Fix size of io operations, Richard Henderson, 2021/06/19
- [PATCH 09/15] hw/net/e1000e: Fix impl.min_access_size, Richard Henderson, 2021/06/19
- [PATCH 07/15] softmmu/memory: Simplify access_with_adjusted_size interface,
Richard Henderson <=
- [PATCH 11/15] hw/scsi/megasas: Fix megasas_mmio_ops sizes, Richard Henderson, 2021/06/19
- [PATCH 10/15] hw/pci-host/q35: Improve blackhole_ops, Richard Henderson, 2021/06/19
- [PATCH 13/15] softmmu/memory: Disallow short writes, Richard Henderson, 2021/06/19
- [PATCH 12/15] hw/scsi/megasas: Improve megasas_queue_ops min_access_size, Richard Henderson, 2021/06/19
- [PATCH 15/15] RFC accel/tcg: Defer some unaligned accesses to memory subsystem, Richard Henderson, 2021/06/19
- [PATCH 14/15] softmmu/memory: Support some unaligned access, Richard Henderson, 2021/06/19
- Re: [PATCH 00/15] accel/tcg: Fix for #360 and other i/o alignment issues, Mark Cave-Ayland, 2021/06/20
- Re: [PATCH 00/15] accel/tcg: Fix for #360 and other i/o alignment issues, Peter Maydell, 2021/06/20