Changeset 9718 in vbox

Timestamp:

Jun 16, 2008 12:35:09 PM (16 years ago)

Author:

vboxsync

Message:

Single instruction emulation for rd/wrmsr

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (2 diffs)
• HWVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -1713 +1713 @@
 
     /* Emulate in ring 3. */
+    case SVM_EXIT_MSR:
+        /* Note: If we decide to emulate them here, then we must sync the MSRs that could have been changed (sysenter, fs/gs base)!!! */
+        rc = VERR_EM_INTERPRETER;
+        break;
+
     case SVM_EXIT_MONITOR:
     case SVM_EXIT_RDPMC:
@@ -1718 +1723 @@
     case SVM_EXIT_MWAIT_UNCOND:
     case SVM_EXIT_MWAIT_ARMED:
-    case SVM_EXIT_MSR:
     case SVM_EXIT_TASK_SWITCH:          /* can change CR3; emulate */
         rc = VINF_EM_RAW_EXCEPTION_PRIVILEGED;

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1519 +1519 @@
                 TRPMSetFaultAddress(pVM, exitQualification);
 
+if (exitQualification == 0x805ce018)
+{ 
+        rc = VINF_EM_RAW_EMULATE_INSTR;
+    break;
+}
                 /* Forward it to our trap handler first, in case our shadow pages are out of sync. */
                 rc = PGMTrap0eHandler(pVM, errCode, CPUMCTX2CORE(pCtx), (RTGCPTR)exitQualification);
@@ -1991 +1996 @@
     case VMX_EXIT_WRMSR:                /* 32 WRMSR. Guest software attempted to execute WRMSR. */
         /* Note: If we decide to emulate them here, then we must sync the MSRs that could have been changed (sysenter, fs/gs base)!!! */
+        rc = VERR_EM_INTERPRETER;
+        break;
+
     case VMX_EXIT_RDPMC:                /* 15 Guest software attempted to execute RDPMC. */
     case VMX_EXIT_MWAIT:                /* 36 Guest software executed MWAIT. */