for (i = 0; i < 16; i++) {
if (i <= 7) {
- if (((state->master_irr & ~(state->master_imr)) >> i) == 0x01) {
+ if (((state->master_irr & ~(state->master_imr)) >> i) & 0x01) {
//state->master_isr |= (0x1 << i);
// reset the irr
//state->master_irr &= ~(0x1 << i);
break;
}
} else {
- if (((state->slave_irr & ~(state->slave_imr)) >> (i - 8)) == 0x01) {
+ if (((state->slave_irr & ~(state->slave_imr)) >> (i - 8)) & 0x01) {
//state->slave_isr |= (0x1 << (i - 8));
//state->slave_irr &= ~(0x1 << (i - 8));
PrintDebug("8259 PIC: IRQ: %d, slave_icw2: %x\n", i, state->slave_icw2);
- irq= (i - 8) + state->slave_icw2;
+ irq = (i - 8) + state->slave_icw2;
break;
}
}
}
+#if 1
if ((i == 15) || (i == 6)) {
DumpPICState(state);
}
+#endif
if (i == 16) {
return -1;
} else {
+ PrintDebug("8259 PIC: get num is returning %d\n",irq);
return irq;
}
}
}
if (irq <= 7) {
- if (((state->master_irr & ~(state->master_imr)) >> irq) == 0x01) {
+ // This should always be true: See pic_get_intr_number
+ if (((state->master_irr & ~(state->master_imr)) >> irq) & 0x01) {
state->master_isr |= (0x1 << irq);
if (!(state->master_elcr & (0x1 << irq))) {
state->master_irr &= ~(0x1 << irq);
}
+ } else {
+ PrintDebug("8259 PIC: (master) Ignoring begin_irq for %d since I don't own it\n",irq);
}
+
} else {
- state->slave_isr |= (0x1 << (irq - 8));
+ // This should always be true: See pic_get_intr_number
+ if (((state->slave_irr & ~(state->slave_imr)) >> (irq - 8)) & 0x01) {
+ state->slave_isr |= (0x1 << (irq - 8));
+
+ if (!(state->slave_elcr & (0x1 << (irq - 8)))) {
+ state->slave_irr &= ~(0x1 << (irq - 8));
+ }
+ } else {
+ PrintDebug("8259 PIC: (slave) Ignoring begin_irq for %d since I don't own it\n",irq);
+ }
- if (!(state->slave_elcr & (0x1 << irq))) {
- state->slave_irr &= ~(0x1 << (irq - 8));
- }
}
return 0;