Changeset 7507 in vbox

Timestamp:

Mar 20, 2008 2:16:51 PM (17 years ago)

Author:

vboxsync

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

28969

Message:

Restore saved registers after returning from a call in vmmR0CallHostSetJmp. Otherwise after resume registers that you're not supposed to trash contain the values of the previous run. (esi contains the IRP pointer for instance)

File:

• trunk/src/VBox/VMM/VMMR0/VMMR0A.asm (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/VMMR0A.asm

@@ -73 +73 @@
     add     esp, 12
     mov     edx, [esp + 4h]             ; pJmpBuf
+
+    ; restore the registers that we're not allowed to modify
+    ; otherwise a resume might restore the wrong values (from the previous run)
+    mov     edi, [edx + VMMR0JMPBUF.edi]
+    mov     esi, [edx + VMMR0JMPBUF.esi]
+    mov     ebx, [edx + VMMR0JMPBUF.ebx]
+    mov     ebp, [edx + VMMR0JMPBUF.ebp]
+
     and     dword [edx + VMMR0JMPBUF.eip], byte 0 ; used for valid check.
     ret
@@ -171 +179 @@
     call    r11
     mov     rdx, [rbp - 8]              ; pJmpBuf
+
+    ; restore the registers that we're not allowed to modify
+    ; otherwise a resume might restore the wrong values (from the previous run)
+    mov     rbx, [rdx + VMMR0JMPBUF.rbx]
+ %ifdef ASM_CALL64_MSC
+    mov     rsi, [rdx + VMMR0JMPBUF.rsi]
+    mov     rdi, [rdx + VMMR0JMPBUF.rdi]
+ %endif
+    mov     r12, [rdx + VMMR0JMPBUF.r12]
+    mov     r13, [rdx + VMMR0JMPBUF.r13]
+    mov     r14, [rdx + VMMR0JMPBUF.r14]
+    mov     r15, [rdx + VMMR0JMPBUF.r15]
+
     and     qword [rdx + VMMR0JMPBUF.rip], byte 0 ; used for valid check.
     leave