info->ctrl_regs.efer = guest_state->efer;
get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
- info->cpu_mode = v3_get_cpu_mode(info);
- info->mem_mode = v3_get_mem_mode(info);
+ info->cpu_mode = v3_get_vm_cpu_mode(info);
+ info->mem_mode = v3_get_vm_mem_mode(info);
exit_code = guest_ctrl->exit_code;
+ // PrintDebug("SVM Exit: %s (rip=%p)\n", vmexit_code_to_str(exit_code), (void *)info->rip);
+
if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) {
#ifdef DEBUG_INTERRUPTS
if (info->shdw_pg_mode == SHADOW_PAGING) {
- PrintHostPageTables(info, info->ctrl_regs.cr3);
+ // PrintHostPageTables(info, info->ctrl_regs.cr3);
//PrintGuestPageTables(info, info->shdw_pg_state.guest_cr3);
}
rdtscll(info->profiler.end_time);
v3_profile_exit(info, exit_code);
}
-
// Update the low level state
- if (info->intr_state.irq_pending == 1) {
-
- guest_ctrl->guest_ctrl.V_IRQ = 1;
- guest_ctrl->guest_ctrl.V_INTR_VECTOR = info->intr_state.irq_vector;
- guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
- guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
-
- } else if (v3_excp_pending(info)) {
+ if (v3_excp_pending(info)) {
uint_t excp = v3_get_excp_number(info);
-
+
guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
if (info->excp_state.excp_error_code_valid) {
(void *)(addr_t)info->rip);
#endif
v3_injecting_excp(info, excp);
+ } else if (info->intr_state.irq_pending == 1) {
+#ifdef DEBUG_INTERRUPTS
+ PrintDebug("IRQ pending from previous injection\n");
+#endif
+ guest_ctrl->guest_ctrl.V_IRQ = 1;
+ guest_ctrl->guest_ctrl.V_INTR_VECTOR = info->intr_state.irq_vector;
+ guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
+ guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
+
} else if (v3_intr_pending(info)) {
switch (v3_get_intr_type(info)) {
return -1;
}
+ } else {
+ //PrintDebug("Not interrupts or exceptions pending\n");
}