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

Timestamp:

Nov 27, 2008 12:19:22 AM (16 years ago)

Author:

vboxsync

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

39982

Message:

VMMR0CallHostSetJmp/LongJmp: Implemented stack switching for darwin.

File:

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

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

@@ -30 +30 @@
 %ifdef RT_ARCH_X86      ; The other architecture(s) use(s) C99 variadict macros.
 extern IMPNAME(RTLogLogger)
+%endif
+
+%ifdef RT_OS_DARWIN
+ %define VMM_R0_SWITCH_STACK
 %endif
 
@@ -71 +75 @@
     jnz     .resume
 
+    mov     ebx, edx                    ; pJmpBuf -> ebx (persistent reg)
+%ifdef VMM_R0_SWITCH_STACK
+    mov     esi, [ebx + VMMR0JMPBUF.pvSavedStack]
+    test    esi, esi
+    jz      .entry_error
+ %ifdef VBOX_STRICT
+    mov      edx, esi
+    mov      edi, esi
+    mov      ecx, 2048
+    mov      eax, 0eeeeeeeeh
+    repne stosd
+ %endif
+    lea     esi, [esi + 8192 - 32]
+    mov     [esi + 1ch], dword 0deadbeefh ; Marker 1.
+    mov     [esi + 18h], ebx            ; Save pJmpBuf pointer.
+    mov     [esi + 14h], dword 00c00ffeeh ; Marker 2.
+    mov     [esi + 10h], dword 0f00dbeefh ; Marker 3.
+    mov     edx, [esp + 10h]            ; pvArg2
+    mov     [esi + 04h], edx
+    mov     ecx, [esp + 0ch]            ; pvArg1
+    mov     [esi      ], ecx
+    mov     eax, [esp + 08h]            ; pfn
+    mov     esp, esi                    ; Switch stack!
+    call    eax
+    and     dword [esi + 1ch], byte 0   ; clear marker.
+
+%else  ; !VMM_R0_SWITCH_STACK
     mov     ecx, [esp + 0ch]            ; pvArg1
     mov     edx, [esp + 10h]            ; pvArg2
     mov     eax, [esp + 08h]            ; pfn
-    sub     esp, 16                     ; align the stack on a 16-byte boundrary.
-    mov     [esp], ecx
-    mov     [esp+4], edx
+    sub     esp, 12                     ; align the stack on a 16-byte boundrary.
+    mov     [esp      ], ecx
+    mov     [esp + 04h], edx
     call    eax
-    add     esp, 16
-    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)
+%endif ; !VMM_R0_SWITCH_STACK
+    mov     edx, ebx                    ; pJmpBuf -> edx (volatile reg)
+
+    ;
+    ; Return like in the long jump.
+    ; (It is vital that we restore all registers since they might've changed
+    ;  by a long jump.)
+    ;
+.proper_return:
+    mov     ebx, [edx + VMMR0JMPBUF.ebx]
+    mov     esi, [edx + VMMR0JMPBUF.esi]
     mov     edi, [edx + VMMR0JMPBUF.edi]
-    mov     esi, [edx + VMMR0JMPBUF.esi]
-    mov     ebx, [edx + VMMR0JMPBUF.ebx]
     mov     ebp, [edx + VMMR0JMPBUF.ebp]
-
+    mov     ecx, [edx + VMMR0JMPBUF.eip]
     and     dword [edx + VMMR0JMPBUF.eip], byte 0 ; used for valid check.
-    ret
+    mov     esp, [edx + VMMR0JMPBUF.esp]
+    jmp     ecx
+
+.entry_error:
+    mov     eax, VERR_INTERNAL_ERROR
+    jmp     .proper_return
 
     ;
@@ -95 +135 @@
     ;
 .resume:
+%ifdef VMM_R0_SWITCH_STACK
+    ; Switch stack.
+    mov     esp, [edx + VMMR0JMPBUF.SpResume]
+%else  ; !VMM_R0_SWITCH_STACK
     ; Sanity checks.
     cmp     ecx, [edx + VMMR0JMPBUF.SpCheck]
@@ -120 +164 @@
     ; Restore the stack.
     ;
-    mov     byte [edx + VMMR0JMPBUF.fInRing3Call], 0
     mov     ecx, [edx + VMMR0JMPBUF.cbSavedStack]
     shr     ecx, 2
@@ -127 +170 @@
     mov     esp, edi
     rep movsd
+%endif ; !VMM_R0_SWITCH_STACK
+    mov     byte [edx + VMMR0JMPBUF.fInRing3Call], 0
 
     ;
     ; Continue where we left off.
     ;
+%ifdef VBOX_STRICT
+    pop     eax                         ; magic
+    cmp     eax, 0f00dbed0h
+    je      .magic_ok
+    mov     ecx, 0123h
+    mov     [ecx], edx
+.magic_ok:
+%endif
     popf
     pop     ebx
@@ -288 +341 @@
     push    ebx
     pushf
+%ifdef VBOX_STRICT
+    push    dword 0f00dbed0h
+%endif
 
     ;
@@ -302 +358 @@
 
     ;
-    ; Save the stack.
+    ; Sanity checks.
     ;
     mov     edi, [edx + VMMR0JMPBUF.pvSavedStack]
@@ -308 +364 @@
     jz      .nok
     mov     [edx + VMMR0JMPBUF.SpResume], esp
+%ifndef VMM_R0_SWITCH_STACK
     mov     esi, esp
     mov     ecx, [edx + VMMR0JMPBUF.esp]
@@ -314 +371 @@
     ; two sanity checks on the size.
     cmp     ecx, 8192                   ; check max size.
-    jbe     .ok
-.nok:
-    mov     eax, VERR_INTERNAL_ERROR
-    popf
-    pop     ebx
-    pop     esi
-    pop     edi
-    leave
-    ret
-.ok:
+    jnbe    .nok
+
+    ;
+    ; Copy the stack.
+    ;
     test    ecx, 3                      ; check alignment
     jnz     .nok
@@ -329 +381 @@
     shr     ecx, 2
     rep movsd
+%endif ; !VMM_R0_SWITCH_STACK
 
     ; store the last pieces of info.
@@ -345 +398 @@
     mov     esp, [edx + VMMR0JMPBUF.esp]
     jmp     ecx
+
+    ;
+    ; Failure
+    ;
+.nok:
+%ifdef VBOX_STRICT
+    pop     eax                         ; magic
+    cmp     eax, 0f00dbed0h
+    je      .magic_ok
+    mov     ecx, 0123h
+    mov     [ecx], edx
+.magic_ok:
+%endif
+    popf
+    pop     ebx
+    pop     esi
+    pop     edi
+    mov     eax, VERR_INTERNAL_ERROR
+    leave
+    ret
 %endif ; RT_ARCH_X86