Changeset 47032 in vbox for trunk

Timestamp:

Jul 8, 2013 11:16:27 AM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: HMR0 fix regression caused by r86900.

File:

• trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac

@@ -854 +854 @@
 
     ; Save the Guest CPU context pointer.
-    mov     rsi, [rbp + xCB * 2]                  ; pCtx
-    push    rsi                                   ; push for saving the state at the end
+    mov     rsi, [rbp + xCB * 2 + RTHCPHYS_CB * 2]  ; pCtx
+    push    rsi                                     ; push for saving the state at the end
 
     ; Save host fs, gs, sysenter msr etc.
-    mov     rax, [rbp + xCB * 2]                  ; pVMCBHostPhys (64 bits physical address; x86: take low dword only)
-    push    rax                                   ; Save for the vmload after vmrun
+    mov     rax, [rbp + xCB * 2]                    ; pVMCBHostPhys (64 bits physical address; x86: take low dword only)
+    push    rax                                     ; Save for the vmload after vmrun
     vmsave
 
     ; Setup eax for VMLOAD.
-    mov     rax, [rbp + xCB * 2 + RTHCPHYS_CB]    ; pVMCBPhys (64 bits physical address; take low dword only)
+    mov     rax, [rbp + xCB * 2 + RTHCPHYS_CB]      ; pVMCBPhys (64 bits physical address; take low dword only)
 
     ; Restore Guest's general purpose registers.
@@ -928 +928 @@
     popf
     pop     rbp
-    add     rsp, 4*xCB
+    add     rsp, 4 * xCB
     ret
 ENDPROC MY_NAME(SVMR0VMRun64)