儲存庫 vbox 的更動 15186

時間撮記:

2008-12-9 下午03:50:52 (16 年 以前)

作者:

vboxsync

訊息:

Fixed fpu and debug state syncing.

位置:

trunk/src/VBox/VMM

檔案:

• VMMR0/CPUMR0.cpp (修改) (2 筆差異)
• VMMSwitcher/LegacyandAMD64.mac (修改) (2 筆差異)

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

@@ -261 +261 @@
     if (CPUMIsGuestInLongModeEx(pCtx))
     {
-        HWACCMR0SaveFPUState(pVM, pVCpu, pCtx);
+        if (!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE))
+            HWACCMR0SaveFPUState(pVM, pVCpu, pCtx);
+
         CPUMR0RestoreHostFPUState(&pVCpu->cpum.s);
     }
@@ -322 +324 @@
     if (CPUMIsGuestInLongModeEx(pCtx))
     {
-        uint64_t dr6 = pCtx->dr[6];
-
-        HWACCMR0SaveDebugState(pVM, pVCpu, pCtx);
-        if (!fDR6) /* dr6 was already up-to-date */
-            pCtx->dr[6] = dr6;
+        if (!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_DEBUG_STATE))
+        {
+            uint64_t dr6 = pCtx->dr[6];
+
+            HWACCMR0SaveDebugState(pVM, pVCpu, pCtx);
+            if (!fDR6) /* dr6 was already up-to-date */
+                pCtx->dr[6] = dr6;
+        }
     }
     else

trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac

@@ -259 +259 @@
     fxrstor [rdx + CPUMCPU.Guest.fpu]
     mov     cr0, rcx                    ; and restore old CR0 again
+    
+    and     [rdx + CPUMCPU.fUseFlags], ~CPUM_SYNC_FPU_STATE
 
 gth_fpu_no:
@@ -275 +277 @@
     mov rax, qword [rdx + CPUMCPU.Guest.dr + 6*8]
     mov dr6, rax    ; not required for AMD-V
+
+    and     [rdx + CPUMCPU.fUseFlags], ~CPUM_SYNC_DEBUG_STATE
 
 gth_debug_no: