info->rip = guest_state->rip;
info->vm_regs.rsp = guest_state->rsp;
info->vm_regs.rax = guest_state->rax;
- info->vm_regs.rsp = guest_state->rsp;
+ info->vm_regs.rsp = guest_state->rsp;
+ exit_code = guest_ctrl->exit_code;
+
+ PrintDebug("SVM Returned: Exit Code: %x\n",exit_code);
+ // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
-
+ // PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data);
+ //PrintDebug("RIP: %x\n", guest_state->rip);
- exit_code = guest_ctrl->exit_code;
- // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
-
+ //PrintDebug("SVM Returned: Exit Code: %x\n",exit_code);
if (exit_code == VMEXIT_IOIO) {
struct svm_io_info * io_info = (struct svm_io_info *)&(guest_ctrl->exit_info1);
if (io_info->type == 0) {
if (io_info->str) {
- handle_svm_io_outs(info);
+ if (handle_svm_io_outs(info) == -1 ) {
+ return -1;
+ }
} else {
- handle_svm_io_out(info);
+ if (handle_svm_io_out(info) == -1) {
+ return -1;
+ }
}
} else {
if (io_info->str) {
- handle_svm_io_ins(info);
+ if (handle_svm_io_ins(info) == -1) {
+ return -1;
+ }
} else {
- handle_svm_io_in(info);
+ if (handle_svm_io_in(info) == -1) {
+ return -1;
+ }
}
}
} else if (exit_code == VMEXIT_CR0_WRITE) {
if (handle_cr0_write(info) == -1) {
return -1;
}
+ } else if (exit_code == VMEXIT_CR0_READ) {
+ PrintDebug("CR0 Read\n");
+
+ if (handle_cr0_read(info) == -1) {
+ return -1;
+ }
+ } else if (exit_code == VMEXIT_CR3_WRITE) {
+ PrintDebug("CR3 Write\n");
+
+ if (handle_cr3_write(info) == -1) {
+ return -1;
+ }
+ } else if (exit_code == VMEXIT_CR3_READ) {
+ PrintDebug("CR3 Read\n");
+
+ if (handle_cr3_read(info) == -1) {
+ return -1;
+ }
+
+ } else if (exit_code == VMEXIT_EXCP14) {
+ addr_t fault_addr = guest_ctrl->exit_info2;
+ pf_error_t * error_code = (pf_error_t *)&(guest_ctrl->exit_info1);
+
+ PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code);
+
+
+
+ if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) {
+ return -1;
+ }
+
/*
- } else if (( (exit_code == VMEXIT_CR3_READ) ||
- (exit_code == VMEXIT_CR3_WRITE) ||
- (exit_code == VMEXIT_INVLPG) ||
- (exit_code == VMEXIT_INVLPGA) ||
- (exit_code == VMEXIT_EXCP14)) &&
- (info->page_mode == SHADOW_PAGING)) {
- handle_shadow_paging(info);
+ } else if (( (exit_code == VMEXIT_CR3_READ) ||
+ (exit_code == VMEXIT_CR3_WRITE) ||
+ (exit_code == VMEXIT_INVLPG) ||
+ (exit_code == VMEXIT_INVLPGA) ||
+ (exit_code == VMEXIT_EXCP14)) &&
+ (info->page_mode == SHADOW_PAGING)) {
+ handle_shadow_paging(info);
*/
+
+ } else if (exit_code == VMEXIT_INTR) {
+
+ // handle_svm_intr(info);
+
+ } else if (exit_code == VMEXIT_HLT) {
+ PrintDebug("Guest halted\n");
+ return -1;
} else {
- addr_t rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.selector);
+ addr_t rip_addr;
char buf[15];
addr_t host_addr;
+ if (info->cpu_mode == REAL) {
+ rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.selector);
+ } else {
+ rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.base);
+ }
+
PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data);
PrintDebug("RIP: %x\n", guest_state->rip);
// Update the low level state
if (intr_pending(&(info->intr_state))) {
- guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
- guest_ctrl->EVENTINJ.valid = 1;
-
+
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:
guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI;
break;
case EXCEPTION:
guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
+ guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
break;
case SOFTWARE:
guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
case INVALID_INTR:
default:
- PrintDebug("Attempted to issue and invalid interrupt\n");
+ PrintDebug("Attempted to issue an invalid interrupt\n");
return -1;
}
+
+ PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
+
+
// IMPORTANT TODO
// We need to figure out stack parameters....
- // EVENTINJ.error_code
+
+ //EVENTINJ.error_code
}
+
+
guest_state->rax = info->vm_regs.rax;
guest_state->rip = info->rip;
guest_state->rsp = info->vm_regs.rsp;
+ if (exit_code == VMEXIT_INTR) {
+ PrintDebug("INTR ret IP = %x\n", guest_state->rip);
+ }
+
return 0;
}
+int handle_svm_intr(struct guest_info * info) {
+ vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
+ // vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
+
+ //struct Interrupt_Info * int_info = &(guest_ctrl->exit_int_info);
+
+ //struct vmm_irq_hook * get_irq_hook(&(info->irq_map), int_info->vector);
+
+ PrintDebug("SVM Returned: Exit Code: %x\n",guest_ctrl->exit_code);
+ PrintDebug("V_INTR_VECTOR: 0x%x\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR);
+
+ while(1);
+
+ return 0;
+}