vbox的更動 13267 路徑 trunk/src/VBox/VMM/VMMAll/EMAll.cpp

時間撮記:

2008-10-14 下午02:46:07 (16 年 以前)

作者:

vboxsync

訊息:

lmsw: corrected exit path

檔案:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (修改) (1 筆差異)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1926 +1926 @@
     uint64_t OldCr0 = CPUMGetGuestCR0(pVM);
 
-    /* don't use this path to go into protected mode! */
-    Assert(OldCr0 & X86_CR0_PE);
-    if (!(OldCr0 & X86_CR0_PE))
-        return VERR_EM_INTERPRETER;
-
     /* Only PE, MP, EM and TS can be changed; note that PE can't be cleared by this instruction. */
     uint64_t NewCr0 = ( OldCr0 & ~(             X86_CR0_MP | X86_CR0_EM | X86_CR0_TS))
                     | (u16Data &  (X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS));
+
+    /* don't use this path to go into protected mode! */
+    if ((OldCr0 & X86_CR0_PE) != (NewCr0 & X86_CR0_PE))
+        return VERR_EM_INTERPRETER;
 
     return CPUMSetGuestCR0(pVM, NewCr0);