aboutsummaryrefslogtreecommitdiff
path: root/exec.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2013-05-26 21:42:40 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2013-06-20 16:32:46 +0200
commitf52cc467426e43792eb39f81705766bcb3d9e96a (patch)
tree58561fa92064e2a71dcbf07e90e28fbf7111b14f /exec.c
parent1db8abb10243abe969a2ba307664ba51b60fcac6 (diff)
downloadqemu-f52cc467426e43792eb39f81705766bcb3d9e96a.zip
qemu-f52cc467426e43792eb39f81705766bcb3d9e96a.tar.gz
qemu-f52cc467426e43792eb39f81705766bcb3d9e96a.tar.bz2
exec: Allow unaligned address_space_rw
This will be needed for some corner cases with para-virtual I/O ports. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'exec.c')
-rw-r--r--exec.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/exec.c b/exec.c
index 510d01b..9c6f1fe 100644
--- a/exec.c
+++ b/exec.c
@@ -1913,12 +1913,12 @@ static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write)
return false;
}
-static inline int memory_access_size(int l, hwaddr addr)
+static inline int memory_access_size(MemoryRegion *mr, int l, hwaddr addr)
{
- if (l >= 4 && ((addr & 3) == 0)) {
+ if (l >= 4 && (((addr & 3) == 0 || mr->ops->impl.unaligned))) {
return 4;
}
- if (l >= 2 && ((addr & 1) == 0)) {
+ if (l >= 2 && (((addr & 1) == 0) || mr->ops->impl.unaligned)) {
return 2;
}
return 1;
@@ -1940,7 +1940,7 @@ bool address_space_rw(AddressSpace *as, hwaddr addr, uint8_t *buf,
if (is_write) {
if (!memory_access_is_direct(section->mr, is_write)) {
- l = memory_access_size(l, addr1);
+ l = memory_access_size(section->mr, l, addr1);
/* XXX: could force cpu_single_env to NULL to avoid
potential bugs */
if (l == 4) {
@@ -1966,7 +1966,7 @@ bool address_space_rw(AddressSpace *as, hwaddr addr, uint8_t *buf,
} else {
if (!memory_access_is_direct(section->mr, is_write)) {
/* I/O case */
- l = memory_access_size(l, addr1);
+ l = memory_access_size(section->mr, l, addr1);
if (l == 4) {
/* 32 bit read access */
error |= io_mem_read(section->mr, addr1, &val, 4);
@@ -2097,7 +2097,7 @@ bool address_space_access_valid(AddressSpace *as, hwaddr addr, int len, bool is_
l = len;
section = address_space_translate(as, addr, &xlat, &l, is_write);
if (!memory_access_is_direct(section->mr, is_write)) {
- l = memory_access_size(l, addr);
+ l = memory_access_size(section->mr, l, addr);
if (!memory_region_access_valid(section->mr, xlat, l, is_write)) {
return false;
}