Changeset 4477 in vbox for trunk/src/VBox

Timestamp:

Sep 1, 2007 7:53:46 AM (17 years ago)

Author:

vboxsync

Message:

Added missing 20h spill area for register arguments. Changed it to use a rbp frame to simplify things. (Hope this doesn't break 64-bit linux...)

File:

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

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

@@ -6 +6 @@
 ;
 ;  Copyright (C) 2006-2007 innotek GmbH
-; 
+;
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -127 +127 @@
     ; Save the registers.
     ;
- %ifdef ASM_CALL64_MSC
+    push    rbp
+    mov     rbp, rsp
+ %ifdef ASM_CALL64_MSC
+    sub     rsp, 30h
     mov     r11, rdx                    ; pfn
     mov     rdx, rcx                    ; pJmpBuf;
  %else
+    sub     rsp, 10h
     mov     r8, rdx                     ; pVM (save it like MSC)
     mov     r11, rsi                    ; pfn
@@ -140 +144 @@
     mov     [rdx + VMMR0JMPBUF.rdi], rdi
  %endif
-    mov     [rdx + VMMR0JMPBUF.rbp], rbp
+    mov     r10, [rbp]
+    mov     [rdx + VMMR0JMPBUF.rbp], r10
     mov     [rdx + VMMR0JMPBUF.r12], r12
     mov     [rdx + VMMR0JMPBUF.r13], r13
     mov     [rdx + VMMR0JMPBUF.r14], r14
     mov     [rdx + VMMR0JMPBUF.r15], r15
-    mov     rax, [rsp]
+    mov     rax, [rbp + 8]
     mov     [rdx + VMMR0JMPBUF.rip], rax
-    lea     r10, [rsp + 8]              ; (used in resume)
+    lea     r10, [rbp + 10h]            ; (used in resume)
     mov     [rdx + VMMR0JMPBUF.rsp], r10
 
@@ -156 +161 @@
     jnz     .resume
 
-    push    rdx                         ; Save it and fix stack alignment (16).
+    mov     [rbp - 8], rdx              ; Save it and fix stack alignment (16).
  %ifdef ASM_CALL64_MSC
     mov     rcx, r8                     ; pVM -> arg0
@@ -163 +168 @@
  %endif
     call    r11
-    pop     rdx                         ; pJmpBuf
+    mov     rdx, [rbp - 8]              ; pJmpBuf
     and     qword [rdx + VMMR0JMPBUF.rip], byte 0 ; used for valid check.
+    leave
     ret
 
@@ -186 +192 @@
     mov     r15, [rdx + VMMR0JMPBUF.r15]
     mov     eax, VERR_INTERNAL_ERROR    ; todo better return code!
+    leave
     ret