Changeset 15354 in vbox for trunk/src/VBox/VMM/VMMGC

Timestamp:

Dec 12, 2008 8:51:41 AM (16 years ago)

Author:

vboxsync

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

40788

Message:

Flush the VMCS write cache first (before any other vmreads/vmwrites!)

File:

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

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

@@ -127 +127 @@
     push    qword [rbp + 16 + 8];
 
+    ;/* Save segment registers */
+    MYPUSHSEGS rax
+
+%ifdef VMX_USE_CACHED_VMCS_ACCESSES
+    ; Flush the VMCS write cache first (before any other vmreads/vmwrites!)
+    mov     rbx, [rbp + 24 + 8]                             ; pCache
+    mov     ecx, [xBX + VMCSCACHE.Write.cValidEntries]
+    cmp     ecx, 0
+    je      .no_cached_writes
+    mov     edx, ecx
+    mov     ecx, 0
+    jmp     .cached_write
+    
+ALIGN(16)    
+.cached_write:
+    mov     eax, [xBX + VMCSCACHE.Write.aField + xCX*4]
+    vmwrite xAX, [xBX + VMCSCACHE.Write.aFieldVal + xCX*8]
+    inc     xCX
+    cmp     xCX, xDX
+    jl     .cached_write
+
+    mov     dword [xBX + VMCSCACHE.Write.cValidEntries], 0
+.no_cached_writes:
+
+    ; Save the pCache pointer
+    push    xBX
+%endif
+
     ; Signal that we're in 64 bits mode now!
     mov     eax, VMX_VMCS_CTRL_EXIT_CONTROLS
@@ -179 +207 @@
     ; *
     ; */
-
-    ;/* Save segment registers */
-    MYPUSHSEGS rax
-
-
-%ifdef VMX_USE_CACHED_VMCS_ACCESSES
-    mov     rbx, [rbp + 24 + 8]                             ; pCache
-    mov     ecx, [xBX + VMCSCACHE.Write.cValidEntries]
-    cmp     ecx, 0
-    je      .no_cached_writes
-    mov     edx, ecx
-    mov     ecx, 0
-    jmp     .cached_write
-    
-ALIGN(16)    
-.cached_write:
-    mov     eax, [xBX + VMCSCACHE.Write.aField + xCX*4]
-    vmwrite xAX, [xBX + VMCSCACHE.Write.aFieldVal + xCX*8]
-    inc     xCX
-    cmp     xCX, xDX
-    jl     .cached_write
-
-    mov     dword [xBX + VMCSCACHE.Write.cValidEntries], 0
-.no_cached_writes:
-
-    ; Save the pCache pointer
-    push    xBX
-%endif
 
     ; Load the guest LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs