info->intr_state.excp_num = 0;
info->intr_state.excp_error_code = 0;
- info->vm_ops.raise_irq = &raise_irq;
+ info->vm_ops.raise_irq = &v3_raise_irq;
}
void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) {
int raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) {
struct vm_intr * intr_state = &(info->intr_state);
- if (intr_state->excp_pending) {
+ if (intr_state->excp_pending == 0) {
intr_state->excp_pending = 1;
intr_state->excp_num = excp;
intr_state->excp_error_code = error_code;
intr_state->excp_error_code_valid = 1;
+ PrintDebug("Raising exception with error code: %x\n", error_code);
} else {
+ PrintDebug("exception already pending, currently not implemented\n");
return -1;
}
intr_state->excp_error_code = 0;
intr_state->excp_error_code_valid = 0;
} else {
+ PrintDebug("exception already pending, currently not implemented\n");
return -1;
}
}
-int raise_irq(struct guest_info * info, int irq) {
+int v3_raise_irq(struct guest_info * info, int irq) {
// Look up PIC and resend
V3_ASSERT(info);
V3_ASSERT(info->intr_state.controller);
int intr_pending(struct guest_info * info) {
struct vm_intr * intr_state = &(info->intr_state);
- if (intr_state->excp_pending) {
+ if (intr_state->excp_pending == 1) {
return 1;
- } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
+ } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) {
return 1;
}
uint_t get_intr_number(struct guest_info * info) {
struct vm_intr * intr_state = &(info->intr_state);
- if (intr_state->excp_pending) {
+ if (intr_state->excp_pending == 1) {
return intr_state->excp_num;
} else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
return intr_state->controller->get_intr_number(intr_state->controller_state);