Changeset 15045 in vbox

Timestamp:

Dec 5, 2008 1:54:11 PM (16 years ago)

Author:

vboxsync

Message:

VT-x 64 bits switcher handler updates

File:

• trunk/src/VBox/VMM/VMMGC/HWACCMGCA.asm (modified) (4 diffs)

trunk/src/VBox/VMM/VMMGC/HWACCMGCA.asm

@@ -87 +87 @@
 ; trashes rax & rdx
  %macro VMCSWRITE 2
-    mov     rdx, %2
     mov     eax, %1
-    vmwrite rax, rdx
+    vmwrite rax, %2
  %endmacro
 
@@ -95 +94 @@
  %macro VMCSREAD 2
     mov     eax, %1
-    vmwrite rax, rdx
-    mov     %2, rdx
+    vmwrite rax, %2
  %endmacro
 
@@ -133 +131 @@
     jmp     .vmstart64_vmoff_end
     
-.vmptrld_success:    
+.vmptrld_success:
+    ; Signal that we're in 64 bits mode now!
+    VMCSREAD VMX_VMCS_CTRL_EXIT_CONTROLS,       rdx
+    or      rdx, VMX_VMCS_CTRL_EXIT_CONTROLS_HOST_AMD64
+    VMCSWRITE VMX_VMCS_CTRL_EXIT_CONTROLS,      rdx
+    
     ; Have to sync half the guest state as we can't access most of the 64 bits state in 32 bits mode. Sigh.
     VMCSWRITE VMX_VMCS64_GUEST_CS_BASE,         [rsi + CPUMCTX.csHid.u64Base]
@@ -274 +277 @@
 
 .vmstart64_end:
+    ; Signal that we're going back to 32 bits mode!
+    VMCSREAD VMX_VMCS_CTRL_EXIT_CONTROLS,       rdx
+    and      rdx, ~VMX_VMCS_CTRL_EXIT_CONTROLS_HOST_AMD64
+    VMCSWRITE VMX_VMCS_CTRL_EXIT_CONTROLS,      rdx
+
     ; Write back the data and disable the VMCS
     vmclear [rbp + 16 + 8]  ;pVMCS