Module: wine Branch: master Commit: e1f54247374a939c8276e85e113cc92c0d8f9467 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1f54247374a939c8276e85e113cc92...
Author: Rémi Bernon rbernon@codeweavers.com Date: Wed Nov 22 00:06:33 2023 +0100
ntdll: Remove unnecessary stack pointer CFI rules.
---
dlls/ntdll/unix/signal_i386.c | 8 -------- dlls/ntdll/unix/signal_x86_64.c | 7 ------- 2 files changed, 15 deletions(-)
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 379e8a50022..9325a0a9ae8 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2543,7 +2543,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_NAME("__wine_syscall_dispatcher_prolog_end") ":\n\t" "movl %esp,0x0c(%ecx)\n\t" /* frame->esp */ __ASM_CFI_CFA_IS_AT1(ecx, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, ecx, 0x0c) "movw %cs,0x10(%ecx)\n\t" "movw %ss,0x12(%ecx)\n\t" "movw %ds,0x14(%ecx)\n\t" @@ -2561,7 +2560,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI_REG_IS_AT1(ebp, ecx, 0x34) "leal 0x34(%ecx),%ebp\n\t" __ASM_CFI_CFA_IS_AT1(ebp, 0x58) - __ASM_CFI_REG_IS_AT1(esp, ebp, 0x58) __ASM_CFI_REG_IS_AT1(eip, ebp, 0x54) __ASM_CFI_REG_IS_AT1(ebx, ebp, 0x6c) __ASM_CFI_REG_IS_AT1(edi, ebp, 0x78) @@ -2626,7 +2624,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
__ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\t" __ASM_CFI_CFA_IS_AT1(esp, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, esp, 0x0c) __ASM_CFI_REG_IS_AT1(eip, esp, 0x08) __ASM_CFI_REG_IS_AT1(ebx, esp, 0x20) __ASM_CFI_REG_IS_AT1(edi, esp, 0x2c) @@ -2665,7 +2662,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_register %eip, %ecx\n\t") /* switch to user stack */ "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ - __ASM_CFI(".cfi_same_value %esp\n\t") "pushl %ecx\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "ret\n" @@ -2681,7 +2677,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, /* switch to user stack */ "xchgl %ebx,%esp\n\t" __ASM_CFI(".cfi_def_cfa %esp, 0\n\t") - __ASM_CFI(".cfi_same_value %esp\n\t") __ASM_CFI_REG_IS_AT1(eip, ebx, 0x08) __ASM_CFI_REG_IS_AT1(ebx, ebx, 0x20) "pushl 0x04(%ebx)\n\t" /* frame->eflags */ @@ -2735,7 +2730,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "leal 0x10(%esp),%edx\n\t" "movl %edx,0x0c(%ecx)\n\t" /* frame->esp */ __ASM_CFI_CFA_IS_AT1(ecx, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, ecx, 0x0c) "movw %cs,0x10(%ecx)\n\t" "movw %ss,0x12(%ecx)\n\t" "movw %ds,0x14(%ecx)\n\t" @@ -2759,7 +2753,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "call *(%eax,%edx,4)\n\t" "leal 16(%esp),%esp\n\t" __ASM_CFI_CFA_IS_AT1(esp, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, esp, 0x0c) __ASM_CFI_REG_IS_AT1(eip, esp, 0x08) __ASM_CFI_REG_IS_AT1(ebx, esp, 0x20) __ASM_CFI_REG_IS_AT1(edi, esp, 0x2c) @@ -2771,7 +2764,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI(".cfi_register %eip, %ecx\n\t") /* switch to user stack */ "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ - __ASM_CFI(".cfi_same_value %esp\n\t") "pushl %ecx\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "ret" ) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index de2993faa5b..54125501ffb 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2607,7 +2607,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movw %cs,0x78(%rcx)\n\t" "movq %rsp,0x88(%rcx)\n\t" __ASM_CFI_CFA_IS_AT2(rcx, 0x88, 0x01) - __ASM_CFI_REG_IS_AT2(rsp, rcx, 0x88, 0x01) "movw %ss,0x90(%rcx)\n\t" "movq %rbp,0x98(%rcx)\n\t" __ASM_CFI_REG_IS_AT2(rbp, rcx, 0x98, 0x01) @@ -2640,7 +2639,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_remember_state\n\t") "3:\tleaq 0x98(%rcx),%rbp\n\t" __ASM_CFI_CFA_IS_AT1(rbp, 0x70) - __ASM_CFI_REG_IS_AT1(rsp, rbp, 0x70) __ASM_CFI_REG_IS_AT1(rip, rbp, 0x58) __ASM_CFI_REG_IS_AT2(rbx, rbp, 0xf0, 0x7e) __ASM_CFI_REG_IS_AT2(rsi, rbp, 0x88, 0x7f) @@ -2756,7 +2754,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, /* switch to user stack */ "movq 0x88(%rcx),%rsp\n\t" __ASM_CFI(".cfi_def_cfa rsp, 0\n\t") - __ASM_CFI(".cfi_same_value rsp\n\t") "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ __ASM_CFI(".cfi_register rip, rcx\n\t") "pushq %rcx\n\t" @@ -2768,7 +2765,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_remember_state\n\t") "1:\tleaq 0x70(%rcx),%rsp\n\t" __ASM_CFI_CFA_IS_AT1(rsp, 0x18) - __ASM_CFI_REG_IS_AT1(rsp, rsp, 0x18) __ASM_CFI_REG_IS_AT1(rip, rsp, 0x00) "testl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ "jnz 1f\n\t" @@ -2786,7 +2782,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movq 0x10(%rcx),%rcx\n" "iretq\n" __ASM_CFI_CFA_IS_AT1(rbp, 0x70) - __ASM_CFI_REG_IS_AT1(rsp, rbp, 0x70) __ASM_CFI_REG_IS_AT1(rip, rbp, 0x58) __ASM_CFI_REG_IS_AT2(rbx, rbp, 0xf0, 0x7e) __ASM_CFI_REG_IS_AT2(rsi, rbp, 0x88, 0x7f) @@ -2842,7 +2837,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI_REG_IS_AT2(r15, rcx, 0xe8, 0x00) "movq %rsp,0x88(%rcx)\n\t" __ASM_CFI_CFA_IS_AT2(rcx, 0x88, 0x01) - __ASM_CFI_REG_IS_AT2(rsp, rcx, 0x88, 0x01) "movq %rbp,0x98(%rcx)\n\t" __ASM_CFI_REG_IS_AT2(rbp, rcx, 0x98, 0x01) "movdqa %xmm6,0x1c0(%rcx)\n\t" @@ -2903,7 +2897,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI(".cfi_same_value rsi\n\t") "movq 0x88(%rcx),%rsp\n\t" __ASM_CFI(".cfi_def_cfa rsp, 0\n\t") - __ASM_CFI(".cfi_same_value rsp\n\t") "pushq 0x70(%rcx)\n\t" /* frame->rip */ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") "ret" )