Changeset 727 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Feb 6, 2007 7:38:36 PM (18 years ago)

Author:

vboxsync

Message:

3rd arg is rdx not rcx.

File:

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

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

@@ -46 +46 @@
 ; @param    pJmpBuf msc:rcx gcc:rdi x86:[esp+4]     Our jmp_buf.
 ; @param    pfn     msc:rdx gcc:rsi x86:[esp+8]     The function to be called when not resuming.
-; @param    pVM     msc:r8  gcc:rcx x86:[esp+c]     The argument of that function.
+; @param    pVM     msc:r8  gcc:rdx x86:[esp+c]     The argument of that function.
 ;
 BEGINPROC vmmR0CallHostSetJmp
@@ -132 +132 @@
     ;
  %ifdef ASM_CALL64_MSC
-    xchg    rdx, rcx                    ; rdx=pJmpBuf rcx=pfn
+    mov     r11, rdx                    ; pfn
+    mov     rdx, rcx                    ; pJmpBuf;
  %else
+    mov     r8, rdx                     ; pVM (save it like MSC)
+    mov     r11, rsi                    ; pfn
     mov     rdx, rdi                    ; pJmpBuf
  %endif
@@ -159 +162 @@
     push    rdx                         ; Save it and fix stack alignment (16).
  %ifdef ASM_CALL64_MSC
-    mov     rax, rcx                    ; pfn
     mov     rcx, r8                     ; pVM -> arg0
  %else
-    mov     rax, rsi                    ; pfn
-    mov     rdi, rcx                    ; pVM -> arg0
- %endif
-    call    rax
+    mov     rdi, r8                     ; pVM -> arg0
+ %endif
+    call    r11
     pop     rdx                         ; pJmpBuf
     and     qword [rdx + VMMR0JMPBUF.rip], byte 0 ; used for valid check.