Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stricter logic when adding/removing IO handlers. Fixes crashes with

Browse source 
GA686BX when triggering power events when using older BIOSes (tested
with 02/10/1999 BIOS).
This commit is contained in:
SarahW 2021-05-31 08:17:37 +01:00
commit be74288b5e
1 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/io.c
View file

@ -87,36 +87,28 @@ void io_removehandler(uint16_t base, int size,
int c; int c;
for (c = 0; c < size; c++) for (c = 0; c < size; c++)
{ {
if (port_priv[base + c][0] == priv) if (port_priv[base + c][0] == priv &&
port_inb[base + c][0] == inb && port_inw[base + c][0] == inw && port_inl[base + c][0] == inl &&
port_outb[base + c][0] == outb && port_outw[base + c][0] == outw && port_outl[base + c][0] == outl)
{ {
if (port_inb[ base + c][0] == inb) port_inb[ base + c][0] = NULL;
port_inb[ base + c][0] = NULL; port_inw[ base + c][0] = NULL;
if (port_inw[ base + c][0] == inw) port_inl[ base + c][0] = NULL;
port_inw[ base + c][0] = NULL; port_outb[ base + c][0] = NULL;
if (port_inl[ base + c][0] == inl) port_outw[ base + c][0] = NULL;
port_inl[ base + c][0] = NULL; port_outl[ base + c][0] = NULL;
if (port_outb[ base + c][0] == outb)
port_outb[ base + c][0] = NULL;
if (port_outw[ base + c][0] == outw)
port_outw[ base + c][0] = NULL;
if (port_outl[ base + c][0] == outl)
port_outl[ base + c][0] = NULL;
port_priv[base + c][0] = NULL; port_priv[base + c][0] = NULL;
} }
if (port_priv[base + c][1] == priv) if (port_priv[base + c][1] == priv &&
port_inb[base + c][1] == inb && port_inw[base + c][1] == inw && port_inl[base + c][1] == inl &&
port_outb[base + c][1] == outb && port_outw[base + c][1] == outw && port_outl[base + c][1] == outl)
{ {
if (port_inb[ base + c][1] == inb) port_inb[ base + c][1] = NULL;
port_inb[ base + c][1] = NULL; port_inw[ base + c][1] = NULL;
if (port_inw[ base + c][1] == inw) port_inl[ base + c][1] = NULL;
port_inw[ base + c][1] = NULL; port_outb[base + c][1] = NULL;
if (port_inl[ base + c][1] == inl) port_outw[base + c][1] = NULL;
port_inl[ base + c][1] = NULL; port_outl[base + c][1] = NULL;
if (port_outb[ base + c][1] == outb)
port_outb[ base + c][1] = NULL;
if (port_outw[ base + c][1] == outw)
port_outw[ base + c][1] = NULL;
if (port_outl[ base + c][1] == outl)
port_outl[ base + c][1] = NULL;
port_priv[base + c][1] = NULL; port_priv[base + c][1] = NULL;
} }
} }