Changeset 45711 in vbox

Timestamp:

Apr 24, 2013 4:24:19 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMRC: Fix 64-bit guests on 32-bit hosts for the new VT-x code.

File:

• trunk/src/VBox/VMM/VMMRC/HMRCA.asm (modified) (5 diffs)

trunk/src/VBox/VMM/VMMRC/HMRCA.asm

@@ -229 +229 @@
     ; */
 
+%ifndef VBOX_WITH_AUTO_MSR_LOAD_RESTORE
     ; Load the guest LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs
-    ;; @todo use the automatic load feature for MSRs
     LOADGUESTMSR MSR_K8_LSTAR,          CPUMCTX.msrLSTAR
     LOADGUESTMSR MSR_K6_STAR,           CPUMCTX.msrSTAR
     LOADGUESTMSR MSR_K8_SF_MASK,        CPUMCTX.msrSFMASK
+%endif
+    ; Kernel GS Base is special, we need to manually load/store it, see @bugref{6208}.
     LOADGUESTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
 
@@ -245 +247 @@
     ; Restore CR2
     mov     rbx, qword [rsi + CPUMCTX.cr2]
+    mov     rdx, cr2
+    cmp     rdx, rbx
+    je      .skipcr2write64
     mov     cr2, rbx
 
+.skipcr2write64:
     mov     eax, VMX_VMCS_HOST_RSP
     vmwrite rax, rsp
@@ -296 +302 @@
     mov     qword [rdi + CPUMCTX.r14], r14
     mov     qword [rdi + CPUMCTX.r15], r15
+%ifndef VBOX_WITH_OLD_VTX_CODE
+    mov     rax, cr2
+    mov     qword [rdi + CPUMCTX.cr2], rax
+%endif
 
     pop     rax                                 ; the guest edi we pushed above
@@ -302 +312 @@
     pop     rsi         ; pCtx (needed in rsi by the macros below)
 
-    ;; @todo use the automatic load feature for MSRs
+%ifndef VBOX_WITH_AUTO_MSR_LOAD_RESTORE
     SAVEGUESTMSR MSR_K8_LSTAR,          CPUMCTX.msrLSTAR
     SAVEGUESTMSR MSR_K6_STAR,           CPUMCTX.msrSTAR
     SAVEGUESTMSR MSR_K8_SF_MASK,        CPUMCTX.msrSFMASK
+%endif
+    ; Kernel GS Base is special, we need to manually load/store it, see @bugref{6208}.
     SAVEGUESTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
 
@@ -335 +347 @@
 .no_cached_reads:
 
+ %ifdef VBOX_WITH_OLD_VTX_CODE
     ; Save CR2 for EPT
     mov     rax, cr2
     mov     [rdi + VMCSCACHE.cr2], rax
+ %endif
  %ifdef VBOX_WITH_CRASHDUMP_MAGIC
     mov     dword [rdi + VMCSCACHE.uPos], 8