ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-31 08:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vbox: support unaligned MMIO read access

Browse Source 
Fixes #1540.
This commit is contained in:
Josef Söntgen 2015-05-19 18:40:50 +02:00 committed by Christian Helmuth
parent 6133acb179
commit 30a02a5d92
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
repos/ports/src/virtualbox/iommio.cc
View File

@ -158,12 +158,24 @@ VMMDECL(VBOXSTRICTRC) IOMMMIORead(PVM pVM, PVMCPU, RTGCPHYS GCPhys,
*/ */
if (rc == VERR_IOM_NOT_MMIO_RANGE_OWNER) { if (rc == VERR_IOM_NOT_MMIO_RANGE_OWNER) {
/* implement what we need to - extend by need */ /* implement what we need to - extend by need */
Assert((GCPhys & 3U) == 0);
Assert(bytes == 1 || bytes == 2); Assert(bytes == 1 || bytes == 2);
uint32_t value;
rc = guest_memory()->mmio_read(GCPhys, &value, sizeof(value));
Assert(rc == VINF_SUCCESS);
uint32_t value = 0;
if ((GCPhys & 3UL) == 0)
rc = guest_memory()->mmio_read(GCPhys, &value, sizeof(value));
else {
/* only read until word boundary */
Assert(((GCPhys & 3UL) + bytes) <= sizeof(value));
/*
* Do an aligned read and shift the result to get the value at
* the unaligned address.
*/
rc = guest_memory()->mmio_read((GCPhys & ~3UL), &value, sizeof(value));
value >>= (8 * (GCPhys & 3UL));
}
Assert(rc == VINF_SUCCESS);
if (rc == VINF_SUCCESS) { if (rc == VINF_SUCCESS) {
switch (bytes) { switch (bytes) {
case 1: case 1: