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

Timestamp:

Jun 14, 2009 12:52:53 AM (15 years ago)

Author:

vboxsync

Message:

VMMR0JmpA-x86.asm: Fixed stack usage calc.

File:

• trunk/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm

@@ -97 +97 @@
     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!
+%if 1                                   ; Use this to eat of some extra stack - handy for finding paths using lots of stack.
+ %define FRAME_OFFSET 0
+%else
+ %define FRAME_OFFSET 1024
+%endif
+    mov     [esi - FRAME_OFFSET + 04h], edx
+    mov     [esi - FRAME_OFFSET      ], ecx
+    lea     esp, [esi - FRAME_OFFSET]   ; Switch stack!
     call    eax
     and     dword [esi + 1ch], byte 0   ; reset marker.
@@ -115 +120 @@
     cld
     repe scasd
+    shl     ecx, 2                      ; *4
+    cmp     ecx, VMM_STACK_SIZE - 64    ; Less than 64 bytes left -> overflow as well.
     mov     eax, esi                    ; restore eax in case of overflow (esi remains used)
-    mov     edi, VMM_STACK_SIZE
-    shl     ecx, 2                      ; *4
-    sub     edi, ecx
-    cmp     edi, VMM_STACK_SIZE - 64    ; Less than 64 bytes left -> overflow as well.
     jae     .stack_overflow_almost
 
     ; Update stack usage statistics.
-    cmp     edi, [ebx + VMMR0JMPBUF.cbUsedMax] ; New max usage?
+    cmp     ecx, [ebx + VMMR0JMPBUF.cbUsedMax] ; New max usage?
     jle     .no_used_max
-    mov     [ebx + VMMR0JMPBUF.cbUsedMax], edi
+    mov     [ebx + VMMR0JMPBUF.cbUsedMax], ecx
 .no_used_max:
     ; To simplify the average stuff, just historize before we hit div errors.
@@ -132 +135 @@
     jz      .no_historize
     mov     dword [ebx + VMMR0JMPBUF.cUsedTotal], 2
-    mov     ecx, [ebx + VMMR0JMPBUF.cbUsedAvg]
-    mov     [ebx + VMMR0JMPBUF.cbUsedTotal], ecx
+    mov     edi, [ebx + VMMR0JMPBUF.cbUsedAvg]
+    mov     [ebx + VMMR0JMPBUF.cbUsedTotal], edi
     mov     dword [ebx + VMMR0JMPBUF.cbUsedTotal + 4], 0
 .no_historize:
-    add     [ebx + VMMR0JMPBUF.cbUsedTotal], edi
+    add     [ebx + VMMR0JMPBUF.cbUsedTotal], ecx
     adc     dword [ebx + VMMR0JMPBUF.cbUsedTotal + 4], 0
     mov     eax, [ebx + VMMR0JMPBUF.cbUsedTotal]
     mov     edx, [ebx + VMMR0JMPBUF.cbUsedTotal + 4]
-    mov     ecx, [ebx + VMMR0JMPBUF.cUsedTotal]
-    div     ecx
+    mov     edi, [ebx + VMMR0JMPBUF.cUsedTotal]
+    div     edi
     mov     [ebx + VMMR0JMPBUF.cbUsedAvg], eax