Changeset 3593 for trunk/kStuff/kProfiler2/prfamd64msc.asm

Timestamp:

Sep 30, 2007, 11:41:15 PM (18 years ago)

Author:

bird

Message:

Fixed some unwinding stuff on msc+amd64.

File:

• trunk/kStuff/kProfiler2/prfamd64msc.asm (modified) (2 diffs)

trunk/kStuff/kProfiler2/prfamd64msc.asm

@@ -91 +91 @@
         or      r8, rax                 ; param 3 - the timestamp
         mov     [rsp + 20h], r8         ; save the tsc for later use.
-        lea     rdx, [rsp + 8*8 + 28h]  ; Param 2 - frame pointer (pointer to the return address of the function calling us)
+        lea     rdx, [rsp + 8*8 + 28h]  ; Param 2 - default frame pointer
         mov     rcx, [rdx]              ; Param 1 - The function address
+
+        ; MSC seems to put the _penter both before and after the typical sub rsp, xxh
+        ; statement as if it cannot quite make up its mind. We'll try adjust for this
+        ; to make the unwinding a bit more accurate wrt to longjmp/throw. But since
+        ; there are also an uneven amount of push/pop around the _penter/_pexit we
+        ; can never really make a perfect job of it. sigh.
+        cmp     word [rcx - 5 - 4], 08348h  ; sub rsp, imm8
+        jne     .not_byte_sub
+        cmp     byte [rcx - 5 - 2], 0ech
+        jne     .not_byte_sub
+        movzx   eax, byte [rcx - 5 - 1]     ; imm8
+        add     rdx, rax
+        jmp     .call_prf_enter
+.not_byte_sub:
+        cmp     word [rcx - 5 - 7], 08148h  ; sub rsp, imm8
+        jne     .not_dword_sub
+        cmp     byte [rcx - 5 - 5], 0ech
+        jne     .not_dword_sub
+        mov     eax, [rcx - 5 - 4]          ; imm32
+        add     rdx, rax
+;        jmp     .call_prf_enter
+.not_dword_sub:
+.call_prf_enter:
         call    KPRF_ENTER
         jmp     common_return_path
@@ -135 +158 @@
         or      r8, rax                 ; param 3 - the timestamp
         mov     [rsp + 20h], r8         ; save the tsc for later use.
-        lea     rdx, [rsp + 8*8 + 28h]  ; Param 2 - frame pointer (pointer to the return address of the function calling us)
+        lea     rdx, [rsp + 8*8 + 28h]  ; Param 2 - frame pointer.
         mov     rcx, [rdx]              ; Param 1 - The function address
+
+        ; MSC some times put the _pexit before the add rsp, xxh. To try match up with
+        ; any adjustments made in _penter, we'll try detect this.
+        cmp     word [rcx], 08348h      ; add rsp, imm8
+        jne     .not_byte_sub
+        cmp     byte [rcx + 2], 0c4h
+        jne     .not_byte_sub
+        movzx   eax, byte [rcx + 3]     ; imm8
+        add     rdx, rax
+        jmp     .call_prf_leave
+.not_byte_sub:
+        cmp     word [rcx], 08148h      ; add rsp, imm32
+        jne     .not_dword_sub
+        cmp     byte [rcx + 2], 0c4h
+        jne     .not_dword_sub
+        mov     eax, [rcx + 3]          ; imm32
+        add     rdx, rax
+;        jmp     .call_prf_leave
+.not_dword_sub:
+.call_prf_leave:
         call    KPRF_LEAVE
         jmp common_return_path