if (i <= 7) {
if (((state->master_irr & ~(state->master_imr)) >> i) == 0x01) {
state->master_isr |= (0x1 << i);
+ // reset the irr
+ state->master_irr &= ~(0x1 << i);
+ PrintDebug("IRQ: %d, icw2: %x\n", i, state->master_icw2);
return i + state->master_icw2;
}
} else {
- if (((state->slave_irr & ~(state->slave_imr)) >> i) == 0x01) {
- state->slave_isr |= (0x1 << i);
- return i + state->slave_icw2;
+ if (((state->slave_irr & ~(state->slave_imr)) >> (i - 8)) == 0x01) {
+ state->slave_isr |= (0x1 << (i - 8));
+ state->slave_irr &= ~(0x1 << (i - 8));
+ return (i - 8) + state->slave_icw2;
}
}
}
-
-
-
int read_master_port1(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
struct pic_internal * state = (struct pic_internal*)dev->private_data;
if (length != 1) {
if (state->master_state == ICW1) {
state->master_icw1 = cw;
state->master_state = ICW2;
+
} else if (state->master_state == READY) {
if (IS_OCW2(cw)) {
// handle the EOI here
struct ocw2 * cw2 = (struct ocw2*)&cw;
+
if ((cw2->EOI) && (!cw2->R) && (cw2->SL)) {
// specific EOI;
state->master_isr &= ~(0x01 << cw2->level);
} else if ((cw2->EOI) & (!cw2->R) && (!cw2->SL)) {
+ int i;
// Non-specific EOI
-
+ PrintDebug("Pre ISR = %x\n", state->master_isr);
+ for (i = 0; i < 8; i++) {
+ if (state->master_isr & (0x01 << i)) {
+ state->master_isr &= ~(0x01 << i);
+ break;
+ }
+ }
+ PrintDebug("Post ISR = %x\n", state->master_isr);
} else {
// error;
}
if (state->master_state == ICW2) {
struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1);
+ PrintDebug("Setting ICW2 = %x\n", cw);
state->master_icw2 = cw;
if (cw1->sngl == 0) {
// specific EOI;
state->slave_isr &= ~(0x01 << cw2->level);
} else if ((cw2->EOI) & (!cw2->R) && (!cw2->SL)) {
- // non specific EOI
+ int i;
+ // Non-specific EOI
+ PrintDebug("Pre ISR = %x\n", state->slave_isr);
+ for (i = 0; i < 8; i++) {
+ if (state->slave_isr & (0x01 << i)) {
+ state->slave_isr &= ~(0x01 << i);
+ break;
+ }
+ }
+ PrintDebug("Post ISR = %x\n", state->slave_isr);
} else {
// error;
}
static void pic_intr_handler(struct Interrupt_State * state) {
Begin_IRQ(state);
struct guest_info * info = irq_map[state->intNum - 32];
- SerialPrint("Interrupt %d\n", state->intNum);
+ SerialPrint("Interrupt %d (IRQ=%d)\n", state->intNum, state->intNum - 32);
if (info) {
- SerialPrint("Calling handler(info=%x)->%x\n", info, info->vm_ops.raise_irq);
info->vm_ops.raise_irq(info, state->intNum - 32, state->errorCode);
} else {
SerialPrint("Interrupt handler error: NULL pointer found, no action taken\n");
if (intr_pending(&(info->intr_state))) {
- guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
- guest_ctrl->EVENTINJ.valid = 1;
-
- PrintDebug("Injecting Interrupt %d\n", guest_ctrl->EVENTINJ.vector);
-
switch (get_intr_type(&(info->intr_state))) {
case EXTERNAL_IRQ:
+ guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
+ guest_ctrl->EVENTINJ.valid = 1;
guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
break;
case NMI:
return -1;
}
+
+ PrintDebug("Injecting Interrupt %d\n", guest_ctrl->EVENTINJ.vector);
+
+
// IMPORTANT TODO
// We need to figure out stack parameters....