Changeset 14653 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 26, 2008 4:54:05 PM (16 years ago)

Author:

vboxsync

Message:

Switcher updates

Location:

trunk/src/VBox/VMM

Files:

• VMMSwitcher.cpp (modified) (1 diff)
• VMMSwitcher/32BitToAMD64.asm (modified) (1 diff)

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -862 +862 @@
 {
     vmmR3SwitcherGenericRelocate(pVM, pSwitcher, R0PtrCode, pu8CodeR3, GCPtrCode, u32IDCode,
-                                 SELMGetHyperCS(pVM), SELMGetHyperDS(pVM), SELMGetHyperTSS(pVM), SELMGetHyperGDT(pVM), 0);
+                                 SELMGetHyperCS(pVM), SELMGetHyperDS(pVM), SELMGetHyperTSS(pVM), SELMGetHyperGDT(pVM), SELMGetHyperCS64(pVM));
 }
 

trunk/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm

@@ -168 +168 @@
     mov     eax, cr0
     mov     [edx + CPUMCPU.Host.cr0], eax
-    ;mov     eax, cr2                   ; assume host os don't stuff things in cr2. (safe)
-    ;mov     [edx + CPUMCPU.Host.cr2], eax
+    ;Skip cr2; assume host os don't stuff things in cr2. (safe)
     mov     eax, cr3
     mov     [edx + CPUMCPU.Host.cr3], eax