ioport: loosen assertions on emulation of 16-bit ports
Right now, ioport.c assumes that the entire range specified with MemoryRegionPortio includes a region with size == 1. This however is not true for the VBE DISPI ports, which are 16-bit only. The next patch will make these regions' length equal to two, which can cause the assertions to trigger. Replace them with simple conditionals. Also, ioport.c will emulate a 16-bit ioport with two distinct reads or writes, even if one of the two accesses is out of the bounds given by the MemoryRegionPortio array. Do not do this anymore, instead discard writes to the incorrect register and read it as all-ones. This ensures that the mrp->read and mrp->write callbacks get an in-range ioport number. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
30476b2282
commit
147ed37983
16
ioport.c
16
ioport.c
@ -187,9 +187,14 @@ static uint64_t portio_read(void *opaque, hwaddr addr, unsigned size)
|
||||
data = mrp->read(mrpio->portio_opaque, mrp->base + addr);
|
||||
} else if (size == 2) {
|
||||
mrp = find_portio(mrpio, addr, 1, false);
|
||||
assert(mrp);
|
||||
data = mrp->read(mrpio->portio_opaque, mrp->base + addr) |
|
||||
(mrp->read(mrpio->portio_opaque, mrp->base + addr + 1) << 8);
|
||||
if (mrp) {
|
||||
data = mrp->read(mrpio->portio_opaque, mrp->base + addr);
|
||||
if (addr + 1 < mrp->offset + mrp->len) {
|
||||
data |= mrp->read(mrpio->portio_opaque, mrp->base + addr + 1) << 8;
|
||||
} else {
|
||||
data |= 0xff00;
|
||||
}
|
||||
}
|
||||
}
|
||||
return data;
|
||||
}
|
||||
@ -204,10 +209,13 @@ static void portio_write(void *opaque, hwaddr addr, uint64_t data,
|
||||
mrp->write(mrpio->portio_opaque, mrp->base + addr, data);
|
||||
} else if (size == 2) {
|
||||
mrp = find_portio(mrpio, addr, 1, true);
|
||||
assert(mrp);
|
||||
if (mrp) {
|
||||
mrp->write(mrpio->portio_opaque, mrp->base + addr, data & 0xff);
|
||||
if (addr + 1 < mrp->offset + mrp->len) {
|
||||
mrp->write(mrpio->portio_opaque, mrp->base + addr + 1, data >> 8);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static const MemoryRegionOps portio_ops = {
|
||||
|
Loading…
Reference in New Issue
Block a user