aboutsummaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/memory.c b/memory.c
index 7c20a07..adfdf14 100644
--- a/memory.c
+++ b/memory.c
@@ -831,8 +831,14 @@ void memory_region_init(MemoryRegion *mr,
static bool memory_region_access_valid(MemoryRegion *mr,
target_phys_addr_t addr,
- unsigned size)
+ unsigned size,
+ bool is_write)
{
+ if (mr->ops->valid.accepts
+ && !mr->ops->valid.accepts(mr->opaque, addr, size, is_write)) {
+ return false;
+ }
+
if (!mr->ops->valid.unaligned && (addr & (size - 1))) {
return false;
}
@@ -856,7 +862,7 @@ static uint32_t memory_region_read_thunk_n(void *_mr,
MemoryRegion *mr = _mr;
uint64_t data = 0;
- if (!memory_region_access_valid(mr, addr, size)) {
+ if (!memory_region_access_valid(mr, addr, size, false)) {
return -1U; /* FIXME: better signalling */
}
@@ -880,7 +886,7 @@ static void memory_region_write_thunk_n(void *_mr,
{
MemoryRegion *mr = _mr;
- if (!memory_region_access_valid(mr, addr, size)) {
+ if (!memory_region_access_valid(mr, addr, size, true)) {
return; /* FIXME: better signalling */
}