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

Timestamp:

Nov 28, 2008 11:07:18 AM (16 years ago)

Author:

vboxsync

Message:

Fixed 64 bits switcher loading

Location:

trunk/src/VBox/VMM

Files:

• VMMSwitcher.cpp (modified) (6 diffs)
• VMMSwitcher/LegacyandAMD64.mac (modified) (5 diffs)
• VMMSwitcher/VMMSwitcher.h (modified) (1 diff)
• VMMSwitcher/VMMSwitcher.mac (modified) (1 diff)

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -55 +55 @@
     &vmmR3Switcher32BitTo32Bit_Def,
     &vmmR3Switcher32BitToPAE_Def,
-    NULL, //&vmmR3Switcher32BitToAMD64_Def - disabled because it causes assertions.
+    &vmmR3Switcher32BitToAMD64_Def,
     &vmmR3SwitcherPAETo32Bit_Def,
     &vmmR3SwitcherPAEToPAE_Def,
-    NULL, //&vmmR3SwitcherPAEToAMD64_Def - disabled because it causes assertions.
+    &vmmR3SwitcherPAEToAMD64_Def,
     NULL,   //&vmmR3SwitcherPAETo32Bit_Def,
 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
@@ -348 +348 @@
             case FIX_GC_2_ID_NEAR_REL:
             {
-                Assert(offSrc - pSwitcher->offGCCode < pSwitcher->cbGCCode);
+                AssertMsg(offSrc - pSwitcher->offGCCode < pSwitcher->cbGCCode, ("%x - %x < %x\n", offSrc, pSwitcher->offGCCode, pSwitcher->cbGCCode));
                 uint32_t offTrg = *u.pu32++;
                 Assert(offTrg - pSwitcher->offIDCode0 < pSwitcher->cbIDCode0 || offTrg - pSwitcher->offIDCode1 < pSwitcher->cbIDCode1);
@@ -610 +610 @@
 #if defined(RT_ARCH_AMD64) || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
             /*
-             * 64-bit HC pointer fixup to (HC) target within the code (32-bit offset).
-             */
-            case FIX_HC_64BIT:
-            {
-                uint32_t offTrg = *u.pu32++;
-                Assert(offSrc < pSwitcher->cbCode);
-                Assert(offTrg - pSwitcher->offHCCode0 < pSwitcher->cbHCCode0 || offTrg - pSwitcher->offHCCode1 < pSwitcher->cbHCCode1);
-                *uSrc.pu64 = R0PtrCode + offTrg;
-                break;
-            }
-
-            /*
              * 64-bit HC Code Selector (no argument).
              */
@@ -636 +624 @@
 #endif
             /*
+             * 64-bit HC pointer fixup to (HC) target within the code (32-bit offset).
+             */
+            case FIX_HC_64BIT:
+            {
+                uint32_t offTrg = *u.pu32++;
+                Assert(offSrc < pSwitcher->cbCode);
+                Assert(offTrg - pSwitcher->offHCCode0 < pSwitcher->cbHCCode0 || offTrg - pSwitcher->offHCCode1 < pSwitcher->cbHCCode1);
+                *uSrc.pu64 = R0PtrCode + offTrg;
+                break;
+            }
+
+            /*
              * 64-bit HC pointer to the CPUM instance data (no argument).
              */
@@ -661 +661 @@
              */
             case FIX_ID_64BIT:
+            case FIX_HC_64BIT_NOCHECK:
             {
                 uint32_t offTrg = *u.pu32++;
                 Assert(offSrc < pSwitcher->cbCode);
-                Assert(offTrg - pSwitcher->offIDCode0 < pSwitcher->cbIDCode0 || offTrg - pSwitcher->offIDCode1 < pSwitcher->cbIDCode1);
+                Assert(u8 == FIX_HC_64BIT_NOCHECK || offTrg - pSwitcher->offIDCode0 < pSwitcher->cbIDCode0 || offTrg - pSwitcher->offIDCode1 < pSwitcher->cbIDCode1);
                 *uSrc.pu64 = u32IDCode + offTrg;
                 break;
@@ -883 +884 @@
 }
 
+/**
+ * Relocator for the PAE to AMD64 world switcher.
+ */
+DECLCALLBACK(void) vmmR3SwitcherPAEToAMD64_Relocate(PVM pVM, PVMMSWITCHERDEF pSwitcher, RTR0PTR R0PtrCode, uint8_t *pu8CodeR3, RTGCPTR GCPtrCode, uint32_t u32IDCode)
+{
+    vmmR3SwitcherGenericRelocate(pVM, pSwitcher, R0PtrCode, pu8CodeR3, GCPtrCode, u32IDCode,
+                                 SELMGetHyperCS(pVM), SELMGetHyperDS(pVM), SELMGetHyperTSS(pVM), SELMGetHyperGDT(pVM), SELMGetHyperCS64(pVM));
+}
+
 
 /**

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

@@ -171 +171 @@
     ;; Jump to identity mapped location
     ;;
-    FIXUP FIX_GC_2_ID_NEAR_REL, 1, NAME(IDEnterTarget) - NAME(Start)
+    FIXUP FIX_HC_2_ID_NEAR_REL, 1, NAME(IDEnterTarget) - NAME(Start)
     jmp near NAME(IDEnterTarget)
 
@@ -225 +225 @@
 ; 64-bit jump target
 NAME(pICEnterTarget):
-FIXUP FIX_HC_64BIT, 0, NAME(ICEnterTarget) - NAME(Start)
+FIXUP FIX_HC_64BIT_NOCHECK, 0, NAME(ICEnterTarget) - NAME(Start)
 dq 0ffffffffffffffffh
 
@@ -327 +327 @@
     mov     cr3, rax
     ;; We're now in the intermediate memory context!
+
+    ;;
+    ;; Switch to compatibility mode, placing ourselves in identity mapped code.
+    ;;
+    jmp far [NAME(fpIDEnterTarget) wrt rip]
+
+; 16:32 Pointer to IDEnterTarget.
+NAME(fpIDEnterTarget):
+    FIXUP FIX_ID_32BIT, 0, NAME(IDExitTarget) - NAME(Start)
+dd  0
+    FIXUP FIX_HYPER_CS, 0
+dd  0
         
-    ;;
-    ;; Jump to identity mapped location
-    ;;
-    FIXUP FIX_GC_2_ID_NEAR_REL, 1, NAME(IDExitTarget) - NAME(Start)
-    jmp near NAME(IDExitTarget)
-
     ; We're now on identity mapped pages!
 ALIGNCODE(16)
@@ -378 +384 @@
     ;; 5. Jump to guest code mapping of the code and load the Hypervisor CS.
     ;;
-    FIXUP FIX_ID_2_GC_NEAR_REL, 1, NAME(ICExitTarget) - NAME(Start)
+    FIXUP FIX_ID_2_HC_NEAR_REL, 1, NAME(ICExitTarget) - NAME(Start)
     jmp near NAME(ICExitTarget)
    
@@ -589 +595 @@
         at VMMSWITCHERDEF.cbIDCode0,                    dd NAME(ICEnterTarget)              - NAME(IDEnterTarget)
         at VMMSWITCHERDEF.offIDCode1,                   dd NAME(IDExitTarget)               - NAME(Start)
-        at VMMSWITCHERDEF.cbIDCode1,                    dd NAME(ICExitTarget)               - NAME(IDExitTarget)
-        at VMMSWITCHERDEF.offGCCode,                    dd NAME(ICEnterTarget)              - NAME(Start)
-        at VMMSWITCHERDEF.cbGCCode,                     dd NAME(IDExitTarget)               - NAME(ICEnterTarget)
+        at VMMSWITCHERDEF.cbIDCode1,                    dd NAME(ICExitTarget)               - NAME(Start)
+        at VMMSWITCHERDEF.offGCCode,                    dd 0
+        at VMMSWITCHERDEF.cbGCCode,                     dd 0
 
     iend

trunk/src/VBox/VMM/VMMSwitcher/VMMSwitcher.h

@@ -63 +63 @@
 #define FIX_ID_FAR32_TO_64BIT_MODE 33
 #define FIX_GC_APIC_BASE_32BIT  34
+#define FIX_HC_64BIT_NOCHECK    35
 #define FIX_THE_END             255
 /** @} */

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

@@ -107 +107 @@
 %define FIX_ID_FAR32_TO_64BIT_MODE 33
 %define FIX_GC_APIC_BASE_32BIT  34
+%define FIX_HC_64BIT_NOCHECK    35
 %define FIX_THE_END             255
 ;/** @} */