added decoder

[palacios.git] / palacios / src / palacios / svm_handler.c

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 7ac7be2..7e1a91b 100644 (file)
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -1,13 +1,12 @@
 #include <palacios/svm_handler.h>
 #include <palacios/vmm.h>
 #include <palacios/vm_guest_mem.h>
-#include <palacios/vmm_emulate.h>
+#include <palacios/vmm_decoder.h>
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/svm_io.h>
 #include <palacios/vmm_intr.h>
 
 
-
 int handle_svm_exit(struct guest_info * info) {
   vmcb_ctrl_t * guest_ctrl = 0;
   vmcb_saved_state_t * guest_state = 0;
@@ -22,6 +21,7 @@ int handle_svm_exit(struct guest_info * info) {
   info->vm_regs.rsp = guest_state->rsp;
   info->vm_regs.rax = guest_state->rax;
 
+  info->cpl = guest_state->cpl;
 
 
   info->ctrl_regs.cr0 = guest_state->cr0;
@@ -36,7 +36,12 @@ int handle_svm_exit(struct guest_info * info) {
 
   exit_code = guest_ctrl->exit_code;
  
-  PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
+
+  // Disable printing io exits due to bochs debug messages
+  //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
+
+  PrintDebug("SVM Returned: Exit Code: %x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
+    //  }
   // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
 
 
@@ -110,8 +115,15 @@ int handle_svm_exit(struct guest_info * info) {
       return -1;
     }
 
+  } else if (exit_code == VMEXIT_INVLPG) {
+    if (info->page_mode == SHADOW_PAGING) {
+      PrintDebug("Invlpg\n");
+      if (handle_shadow_invlpg(info) == -1) {
+       return -1;
+      }
+    }
+   
     /*
-      (exit_code == VMEXIT_INVLPG)    ||
       (exit_code == VMEXIT_INVLPGA)   || 
     */
     
@@ -174,10 +186,19 @@ int handle_svm_exit(struct guest_info * info) {
     case EXTERNAL_IRQ: 
       {
        uint_t irq = get_intr_number(info);
-       guest_ctrl->EVENTINJ.vector = irq;
-       guest_ctrl->EVENTINJ.valid = 1;
-       guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
+       /*      
+         guest_ctrl->EVENTINJ.vector = irq;
+         guest_ctrl->EVENTINJ.valid = 1;
+         guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
+       */
        
+       guest_ctrl->guest_ctrl.V_IRQ = 1;
+       guest_ctrl->guest_ctrl.V_INTR_VECTOR = irq;
+       guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
+       guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
+
+       PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR, info->rip);
+
        injecting_intr(info, irq, EXTERNAL_IRQ);
        
        break;
@@ -198,6 +219,7 @@ int handle_svm_exit(struct guest_info * info) {
        
        guest_ctrl->EVENTINJ.vector = excp;
        
+       PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
        injecting_intr(info, excp, EXCEPTION);
        break;
       }
@@ -214,7 +236,6 @@ int handle_svm_exit(struct guest_info * info) {
       return -1;
     }
 
-    PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
   }
 
 
@@ -226,6 +247,8 @@ int handle_svm_exit(struct guest_info * info) {
   guest_state->rflags = info->ctrl_regs.rflags;
 
 
+  guest_state->cpl = info->cpl;
+
   guest_state->rax = info->vm_regs.rax;
   guest_state->rip = info->rip;
   guest_state->rsp = info->vm_regs.rsp;