Changeset 18849 in vbox for trunk/src/VBox

Timestamp:

Apr 8, 2009 4:34:39 PM (16 years ago)

Author:

vboxsync

Message:

VMMR0A.asm: Implemented stack switching for 64-bit machines as well (i.e. snow leopard)

File:

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

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

@@ -113 +113 @@
 
     ;
-    ; Return like in the long jump.
-    ; (It is vital that we restore all registers since they might've changed
-    ;  by a long jump.)
+    ; Return like in the long jump but clear eip, no short cuts here.
     ;
 .proper_return:
@@ -128 +126 @@
 
 .entry_error:
-    mov     eax, VERR_INTERNAL_ERROR
+    mov     eax, VERR_INTERNAL_ERROR_2
     jmp     .proper_return
 
@@ -147 +145 @@
     mov     esi, [edx + VMMR0JMPBUF.esi]
     mov     ebx, [edx + VMMR0JMPBUF.ebx]
-    mov     eax, VERR_INTERNAL_ERROR    ; todo better return code!
+    mov     eax, VERR_INTERNAL_ERROR_3    ; todo better return code!
     ret
 
@@ -232 +230 @@
     jnz     .resume
 
-    mov     [rbp - 8], rdx              ; Save it and fix stack alignment (16).
+ %ifdef VMM_R0_SWITCH_STACK
+    mov     r15, [rdx + VMMR0JMPBUF.pvSavedStack]
+    test    r15, r15
+    jz      .entry_error
+  %ifdef VBOX_STRICT
+    mov     rdi, r15
+    mov     rcx, 1024
+    mov     rax, 00eeeeeeeffeeeeeeeh
+    repne stosq
+    mov     [rdi - 10h], rbx
+  %endif
+    lea     r15, [r15 + 8192 - 40h]
+    mov     rsp, r15                    ; Switch stack!
+ %endif ; VMM_R0_SWITCH_STACK
+
+    mov     r12, rdx                    ; Save pJmpBuf.
  %ifdef ASM_CALL64_MSC
     mov     rcx, r8                     ; pvUser -> arg0
@@ -241 +254 @@
  %endif
     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     rdx, r12                    ; Restore pJmpBuf
+
+    ;
+    ; Return like in the long jump but clear eip, no short cuts here.
+    ;
+.proper_return:
     mov     rbx, [rdx + VMMR0JMPBUF.rbx]
  %ifdef ASM_CALL64_MSC
@@ -254 +269 @@
     mov     r14, [rdx + VMMR0JMPBUF.r14]
     mov     r15, [rdx + VMMR0JMPBUF.r15]
-
+    mov     rbp, [rdx + VMMR0JMPBUF.rbp]
+    mov     rcx, [rdx + VMMR0JMPBUF.rip]
     and     qword [rdx + VMMR0JMPBUF.rip], byte 0 ; used for valid check.
-    leave
-    ret
+    mov     rsp, [rdx + VMMR0JMPBUF.rsp]
+    jmp     rcx
+
+.entry_error:
+    mov     eax, VERR_INTERNAL_ERROR_2
+    jmp     .proper_return
 
     ;
@@ -263 +283 @@
     ;
 .resume:
+ %ifdef VMM_R0_SWITCH_STACK
+    ; Switch stack.
+    mov     rsp, [rdx + VMMR0JMPBUF.SpResume]
+ %else  ; !VMM_R0_SWITCH_STACK
     ; Sanity checks.
     cmp     r10, [rdx + VMMR0JMPBUF.SpCheck]
@@ -269 +293 @@
     and     qword [rdx + VMMR0JMPBUF.rip], byte 0 ; used for valid check.
     mov     rbx, [rdx + VMMR0JMPBUF.rbx]
- %ifdef ASM_CALL64_MSC
+  %ifdef ASM_CALL64_MSC
     mov     rsi, [rdx + VMMR0JMPBUF.rsi]
     mov     rdi, [rdx + VMMR0JMPBUF.rdi]
- %endif
+  %endif
     mov     r12, [rdx + VMMR0JMPBUF.r12]
     mov     r13, [rdx + VMMR0JMPBUF.r13]
     mov     r14, [rdx + VMMR0JMPBUF.r14]
     mov     r15, [rdx + VMMR0JMPBUF.r15]
-    mov     eax, VERR_INTERNAL_ERROR    ; todo better return code!
+    mov     eax, VERR_INTERNAL_ERROR_2
     leave
     ret
@@ -295 +319 @@
     ; Restore the stack.
     ;
-    mov     byte [rdx + VMMR0JMPBUF.fInRing3Call], 0
     mov     ecx, [rdx + VMMR0JMPBUF.cbSavedStack]
     shr     ecx, 3
@@ -302 +325 @@
     mov     rsp, rdi
     rep movsq
+ %endif ; !VMM_R0_SWITCH_STACK
+    mov     byte [rdx + VMMR0JMPBUF.fInRing3Call], 0
 
     ;
@@ -415 +440 @@
     pop     esi
     pop     edi
-    mov     eax, VERR_INTERNAL_ERROR
+    mov     eax, VERR_INTERNAL_ERROR_4
     leave
     ret
@@ -455 +480 @@
 
     ;
-    ; Save the stack.
+    ; Sanity checks.
     ;
     mov     rdi, [rdx + VMMR0JMPBUF.pvSavedStack]
@@ -461 +486 @@
     jz      .nok
     mov     [rdx + VMMR0JMPBUF.SpResume], rsp
+ %ifndef VMM_R0_SWITCH_STACK
     mov     rsi, rsp
     mov     rcx, [rdx + VMMR0JMPBUF.rsp]
@@ -467 +493 @@
     ; two sanity checks on the size.
     cmp     rcx, 8192                   ; check max size.
-    jbe     .ok
-.nok:
-    mov     eax, VERR_INTERNAL_ERROR
-    popf
-    pop     rbx
- %ifdef ASM_CALL64_MSC
-    pop     rsi
-    pop     rdi
- %endif
-    pop     r12
-    pop     r13
-    pop     r14
-    pop     r15
-    leave
-    ret
-
-.ok:
+    jnbe    .nok
+
+    ;
+    ; Copy the stack
+    ;
     test    ecx, 7                      ; check alignment
     jnz     .nok
@@ -489 +503 @@
     shr     ecx, 3
     rep movsq
+
+ %endif ; !VMM_R0_SWITCH_STACK
 
     ; store the last pieces of info.
@@ -511 +527 @@
     mov     rsp, [rdx + VMMR0JMPBUF.rsp]
     jmp     rcx
+
+    ;
+    ; Failure
+    ;
+.nok:
+    mov     eax, VERR_INTERNAL_ERROR_4
+    popf
+    pop     rbx
+ %ifdef ASM_CALL64_MSC
+    pop     rsi
+    pop     rdi
+ %endif
+    pop     r12
+    pop     r13
+    pop     r14
+    pop     r15
+    leave
+    ret
+
 %endif
 ENDPROC vmmR0CallHostLongJmp