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

Timestamp:

Dec 12, 2008 2:41:28 PM (16 years ago)

Author:

vboxsync

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

40811

Message:

More paranoia

File:

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

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

@@ -133 +133 @@
     ; Flush the VMCS write cache first (before any other vmreads/vmwrites!)
     mov     rbx, [rbp + 24 + 8]                             ; pCache
+
+%ifdef DEBUG
+    mov     rax, [rbp + 8 + 8]                              ; pPageCpuPhys
+    mov     [rbx + VMCSCACHE.TestIn.pPageCpuPhys], rax
+    mov     rax, [rbp + 16 + 8]                             ; pVMCSPhys
+    mov     [rbx + VMCSCACHE.TestIn.pVMCSPhys], rax
+    mov     [rbx + VMCSCACHE.TestIn.pCache], rbx
+    mov     [rbx + VMCSCACHE.TestIn.pCtx], rsi
+%endif
+
     mov     ecx, [xBX + VMCSCACHE.Write.cValidEntries]
     cmp     ecx, 0
@@ -143 +153 @@
 .cached_write:
     mov     eax, [xBX + VMCSCACHE.Write.aField + xCX*4]
-    vmwrite xAX, [xBX + VMCSCACHE.Write.aFieldVal + xCX*8]
+    vmwrite xAX, qword [xBX + VMCSCACHE.Write.aFieldVal + xCX*8]
     inc     xCX
     cmp     xCX, xDX
@@ -284 +294 @@
 
 %ifdef VMX_USE_CACHED_VMCS_ACCESSES
-    pop     xDX         ; saved pCache
-    
-    mov     ecx, [xDX + VMCSCACHE.Read.cValidEntries]
+    pop     rdi         ; saved pCache
+
+%ifdef DEBUG
+    mov     [rdi + VMCSCACHE.TestOut.pCache], rdi
+    mov     [rdi + VMCSCACHE.TestOut.pCtx], rsi
+%endif
+    
+    mov     ecx, [rdi + VMCSCACHE.Read.cValidEntries]
     cmp     ecx, 0  ; can't happen
     je      .no_cached_reads
@@ -294 +309 @@
 .cached_read:
     dec     xCX
-    mov     eax, [xDX + VMCSCACHE.Read.aField + xCX*4]
-    vmread  [xDX + VMCSCACHE.Read.aFieldVal + xCX*8], xAX
-    cmp      xCX, 0
+    mov     eax, [rdi + VMCSCACHE.Read.aField + xCX*4]
+    vmread  qword [rdi + VMCSCACHE.Read.aFieldVal + xCX*8], xAX
+    cmp     xCX, 0
     jnz     .cached_read
 .no_cached_reads:
@@ -303 +318 @@
     ; Restore segment registers
     MYPOPSEGS rax
-
-    mov     eax, VINF_SUCCESS
 
 .vmstart64_end:
@@ -313 +326 @@
     vmwrite  rbx, rdx
 
+%ifdef DEBUG
+    mov     rax, [rsp]                             ; pVMCSPhys
+    mov     [rdi + VMCSCACHE.TestOut.pVMCSPhys], rax
+%endif
+
     ; Write back the data and disable the VMCS
     vmclear qword [rsp]  ;Pushed pVMCS
     add     rsp, 8
+
+    mov     eax, VINF_SUCCESS
 
 .vmstart64_vmoff_end: