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

Timestamp:

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

Author:

vboxsync

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

40088

Message:

Fixed 64 bits switcher loading

Location:

trunk/src/VBox/VMM/VMMSwitcher

Files:

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

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
 ;/** @} */