80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Replaced the fatal for 286+ with an error correction mechanism (clear IRQ 2 and find best PIC 1 interrupt again).

Browse Source
This commit is contained in:
OBattler
2023-10-01 17:55:31 +02:00
parent ed119ed163
commit 8634cffb98
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pic.c
View File

@@ -233,20 +233,21 @@ pic_update_pending_xt(void)
} }
} }
/* Only check if PIC 1 frozen, because it should not happen
that one is frozen but the other is not. */
static __inline void static __inline void
pic_update_pending_at(void) pic_update_pending_at(void)
{ {
if (!(pic2.interrupt & 0x20)) { if (!(pic.interrupt & 0x20)) {
pic2.int_pending = (find_best_interrupt(&pic2) != -1); pic2.int_pending = (find_best_interrupt(&pic2) != -1);
}
if (pic2.int_pending) if (pic2.int_pending)
pic.irr |= (1 << pic2.icw3); pic.irr |= (1 << pic2.icw3);
else else
pic.irr &= ~(1 << pic2.icw3); pic.irr &= ~(1 << pic2.icw3);
if (!(pic.interrupt & 0x20))
pic.int_pending = (find_best_interrupt(&pic) != -1); pic.int_pending = (find_best_interrupt(&pic) != -1);
}
} }
static void static void
@@ -852,8 +853,12 @@ picinterrupt(void)
if (pic_slave_on(&pic, pic.interrupt)) { if (pic_slave_on(&pic, pic.interrupt)) {
if (!pic.slaves[pic.interrupt]->int_pending) { if (!pic.slaves[pic.interrupt]->int_pending) {
/* If we are on AT, IRQ 2 is pending, and we cannot find a pending IRQ on PIC 2, fatal out. */ /* If we are on AT, IRQ 2 is pending, and we cannot find a pending IRQ on PIC 2, fatal out. */
fatal("IRQ %i pending on AT without a pending IRQ on PIC %i (normal)\n", pic.interrupt, pic.interrupt); // fatal("IRQ %i pending on AT without a pending IRQ on PIC %i (normal)\n", pic.interrupt, pic.interrupt);
exit(-1); // exit(-1);
/* Error correction mechanism: Clear IRQ 2 and find best interrupt again. */
pic.irr &= ~(1 << pic2.icw3);
pic.int_pending = (find_best_interrupt(&pic) != -1);
return ret;
} }
pic.interrupt |= 0x40; /* Mark slave pending. */ pic.interrupt |= 0x40; /* Mark slave pending. */