Changeset 14870 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Dec 1, 2008 3:28:54 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40201

Message:

Cleaning up.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• CPUMR0.cpp (modified) (7 diffs)
• CPUMR0A.asm (added)
• HWACCMR0.cpp (modified) (3 diffs)

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

@@ -216 +216 @@
             pVCpu->cpum.s.Host.fpu.MXCSR = CPUMGetMXCSR();
 
-        CPUMLoadFPUAsm(pCtx);
+        CPUMR0LoadFPU(pCtx);
 
         /*
@@ -231 +231 @@
             {
                 /* fxrstor doesn't restore the XMM state! */
-                CPUMLoadXMMAsm(pCtx);
+                CPUMR0LoadXMM(pCtx);
                 pVCpu->cpum.s.fUseFlags |= CPUM_MANUAL_XMM_RESTORE;
             }
@@ -262 +262 @@
         Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE));
         HWACCMR0SaveFPUState(pVM, pVCpu, pCtx);
-        CPUMRestoreHostFPUState(pVCpu);
+        CPUMR0RestoreHostFPUState(&pVCpu->cpum.s);
     }
     else
@@ -276 +276 @@
             ASMWrMsr(MSR_K6_EFER, oldMsrEFERHost & ~MSR_K6_EFER_FFXSR);
         }
-        CPUMSaveGuestRestoreHostFPUState(pVM, pVCpu);
+        CPUMR0SaveGuestRestoreHostFPUState(&pVCpu->cpum.s);
 
         /* Restore EFER MSR */
@@ -283 +283 @@
 
 #else  /* CPUM_CAN_HANDLE_NM_TRAPS_IN_KERNEL_MODE */
-        CPUMSaveFPUAsm(pCtx);
+        CPUMR0SaveFPU(pCtx);
         if (pVCpu->cpum.s.fUseFlags & CPUM_MANUAL_XMM_RESTORE)
         {
             /* fxsave doesn't save the XMM state! */
-            CPUMSaveXMMAsm(pCtx);
+            CPUMR0SaveXMM(pCtx);
         }
 
@@ -294 +294 @@
          * We don't want the guest to be able to trigger floating point/SSE exceptions on the host.
          */
-        CPUMSetFCW(pVCpu->cpum.s.Host.fpu.FCW);
+        CPUMR0SetFCW(pVCpu->cpum.s.Host.fpu.FCW);
         if (pVM->cpum.s.CPUFeatures.edx.u1SSE)
-            CPUMSetMXCSR(pVCpu->cpum.s.Host.fpu.MXCSR);
+            CPUMR0SetMXCSR(pVCpu->cpum.s.Host.fpu.MXCSR);
 #endif /* CPUM_CAN_HANDLE_NM_TRAPS_IN_KERNEL_MODE */
     }
@@ -396 +396 @@
 }
 
+

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

@@ -1002 +1002 @@
 #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS)
 /**
- * Save guest FPU/XMM state
+ * Save guest FPU/XMM state (64 bits guest mode & 32 bits host only)
  *
  * @returns VBox status code.
@@ -1011 +1011 @@
 VMMR0DECL(int)   HWACCMR0SaveFPUState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
+    if (pVM->hwaccm.s.vmx.fSupported)
+    {
+    }
+    else
+    {
+    }
     return VINF_SUCCESS;
 }
@@ -1025 +1031 @@
 VMMR0DECL(int)   HWACCMR0SaveDebugState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, bool fDR6)
 {
+    if (pVM->hwaccm.s.vmx.fSupported)
+    {
+    }
+    else
+    {
+    }
     return VINF_SUCCESS;
 }