Changeset 14767 in vbox for trunk/src/VBox

Timestamp:

Nov 28, 2008 9:51:25 AM (16 years ago)

Author:

vboxsync

Message:

Updates

File:

• trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac (modified) (5 diffs)

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

@@ -163 +163 @@
     ;; Load Intermediate memory context.
     ;;
-    FIXUP FIX_INTER_32BIT_CR3, 1
+    FIXUP SWITCHER_FIX_INTER_CR3_HC, 1
     mov     eax, 0ffffffffh
     mov     cr3, eax
@@ -326 +326 @@
     mov     rax, 0ffffffffh
     mov     cr3, rax
-    ;; We're now in intermediate memory context!
+    ;; We're now in the intermediate memory context!
         
     ;;
@@ -346 +346 @@
     DEBUG_CHAR('2')
 
-    ; 2. Load 32-bit intermediate page table.
-    FIXUP FIX_INTER_32BIT_CR3, 1
+    ; 2. Load intermediate page table.
+    FIXUP SWITCHER_FIX_INTER_CR3_HC, 1
     mov     edx, 0ffffffffh
     mov     cr3, edx
@@ -360 +360 @@
     DEBUG_CHAR('6')
 
+%ifndef NEED_PAE_ON_HOST
     ; 3b. Disable PAE.
     mov     eax, cr4
@@ -365 +366 @@
     mov     cr4, eax
     DEBUG_CHAR('7')
+%endif
 
     ; 4. Enable paging.