Add some more cfi directives

With some gcc versions, without these directives, unwind does
not work or gives strange entries in stack traces.

Patch from Matthias Schwarzott

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15247

diff --git a/coregrind/m_syscall.c b/coregrind/m_syscall.c
index b3b204b1c9632190551f8d0f162f6ad311f0243d..f152b72c82f2514c22640662d7e7d6e4bf7d4c13 100644 (file)
--- a/coregrind/m_syscall.c
+++ b/coregrind/m_syscall.c
@@ -308,12 +308,16 @@ asm(
 "      .cfi_startproc\n"
 "      push    %esi\n"
 "      .cfi_adjust_cfa_offset 4\n"
+"      .cfi_offset %esi, -8\n"
 "      push    %edi\n"
 "      .cfi_adjust_cfa_offset 4\n"
+"      .cfi_offset %edi, -12\n"
 "      push    %ebx\n"
 "      .cfi_adjust_cfa_offset 4\n"
+"      .cfi_offset %ebx, -16\n"
 "      push    %ebp\n"
 "      .cfi_adjust_cfa_offset 4\n"
+"      .cfi_offset %ebp, -20\n"
 "      movl    16+ 4(%esp),%eax\n"
 "      movl    16+ 8(%esp),%ebx\n"
 "      movl    16+12(%esp),%ecx\n"
@@ -324,12 +328,16 @@ asm(
 "      int     $0x80\n"
 "      popl    %ebp\n"
 "      .cfi_adjust_cfa_offset -4\n"
+"      .cfi_restore %ebp\n"
 "      popl    %ebx\n"
 "      .cfi_adjust_cfa_offset -4\n"
+"      .cfi_restore %ebx\n"
 "      popl    %edi\n"
 "      .cfi_adjust_cfa_offset -4\n"
+"      .cfi_restore %edi\n"
 "      popl    %esi\n"
 "      .cfi_adjust_cfa_offset -4\n"
+"      .cfi_restore %esi\n"
 "      ret\n"
 "      .cfi_endproc\n"
 ".previous\n"

diff --git a/coregrind/m_syswrap/syscall-amd64-linux.S b/coregrind/m_syswrap/syscall-amd64-linux.S
index 0810b5455d1d80aa8ce6df73fd96ea43bb207de9..a6d74690ecc4e0d99d891da0dec418b261ba78ec 100644 (file)
--- a/coregrind/m_syswrap/syscall-amd64-linux.S
+++ b/coregrind/m_syswrap/syscall-amd64-linux.S
@@ -77,29 +77,52 @@
        
 .globl ML_(do_syscall_for_client_WRK)
 ML_(do_syscall_for_client_WRK):
+       .cfi_startproc
        /* save callee-saved regs */
        pushq   %rbx
+       .cfi_adjust_cfa_offset 8
+       .cfi_offset %rbx, -16
        pushq   %rbp
+       .cfi_adjust_cfa_offset 8
+       .cfi_offset %rbp, -24
        pushq   %r12
+       .cfi_adjust_cfa_offset 8
+       .cfi_offset %r12, -32
        pushq   %r13
+       .cfi_adjust_cfa_offset 8
+       .cfi_offset %r13, -40
        pushq   %r14
+       .cfi_adjust_cfa_offset 8
+       .cfi_offset %r14, -48
        pushq   %r15
+       .cfi_adjust_cfa_offset 8
+       .cfi_offset %r15, -56
 
 #define FSZ    ((4+1)*4)       /* 4 args + ret addr */
 
-#define PUSH_di_si_dx_cx_8     \
-       pushq   %rdi ;          \
-       pushq   %rsi ;          \
-       pushq   %rdx ;          \
-       pushq   %rcx ;          \
-       pushq   %r8
-
-#define        POP_di_si_dx_cx_8       \
-       popq    %r8 ;           \
-       popq    %rcx ;          \
-       popq    %rdx ;          \
-       popq    %rsi ;          \
-       popq    %rdi
+#define PUSH_di_si_dx_cx_8        \
+       pushq   %rdi ;             \
+       .cfi_adjust_cfa_offset 8 ; \
+       pushq   %rsi ;             \
+       .cfi_adjust_cfa_offset 8 ; \
+       pushq   %rdx ;             \
+       .cfi_adjust_cfa_offset 8 ; \
+       pushq   %rcx ;             \
+       .cfi_adjust_cfa_offset 8 ; \
+       pushq   %r8 ;              \
+       .cfi_adjust_cfa_offset 8
+
+#define        POP_di_si_dx_cx_8           \
+       popq    %r8 ;               \
+       .cfi_adjust_cfa_offset -8 ; \
+       popq    %rcx ;              \
+       .cfi_adjust_cfa_offset -8 ; \
+       popq    %rdx ;              \
+       .cfi_adjust_cfa_offset -8 ; \
+       popq    %rsi ;              \
+       .cfi_adjust_cfa_offset -8 ; \
+       popq    %rdi ;              \
+       .cfi_adjust_cfa_offset -8
 
 1:     /* Even though we can't take a signal until the sigprocmask completes,
           start the range early.
@@ -129,6 +152,7 @@ ML_(do_syscall_for_client_WRK):
 
        movq    %rsi, %rax      /* rax --> VexGuestAMD64State * */
        pushq   %rdi            /* syscallno -> stack */
+       .cfi_adjust_cfa_offset 8
        movq    OFFSET_amd64_RDI(%rax), %rdi
        movq    OFFSET_amd64_RSI(%rax), %rsi
        movq    OFFSET_amd64_RDX(%rax), %rdx
@@ -136,6 +160,7 @@ ML_(do_syscall_for_client_WRK):
        movq    OFFSET_amd64_R8(%rax), %r8
        movq    OFFSET_amd64_R9(%rax), %r9
        popq    %rax    /* syscallno -> %rax */
+       .cfi_adjust_cfa_offset -8
        
        /* If rip==2, then the syscall was either just about
           to start, or was interrupted and the kernel was 
@@ -168,24 +193,38 @@ ML_(do_syscall_for_client_WRK):
 5:     /* now safe from signals */
        movq    $0, %rax        /* SUCCESS */
        popq    %r15
+       .cfi_adjust_cfa_offset -8
        popq    %r14
+       .cfi_adjust_cfa_offset -8
        popq    %r13
+       .cfi_adjust_cfa_offset -8
        popq    %r12
+       .cfi_adjust_cfa_offset -8
        popq    %rbp
+       .cfi_adjust_cfa_offset -8
        popq    %rbx
+       .cfi_adjust_cfa_offset -8
        ret
+       .cfi_adjust_cfa_offset 6*8
 
 7:     /* failure:      return 0x8000 | error code */
        negq    %rax
        andq    $0x7FFF, %rax
        orq     $0x8000, %rax
        popq    %r15
+       .cfi_adjust_cfa_offset -8
        popq    %r14
+       .cfi_adjust_cfa_offset -8
        popq    %r13
+       .cfi_adjust_cfa_offset -8
        popq    %r12
+       .cfi_adjust_cfa_offset -8
        popq    %rbp
+       .cfi_adjust_cfa_offset -8
        popq    %rbx
+       .cfi_adjust_cfa_offset -8
        ret
+       .cfi_endproc
 #undef FSZ
 
 .section .rodata

diff --git a/coregrind/m_syswrap/syscall-x86-linux.S b/coregrind/m_syswrap/syscall-x86-linux.S
index 78b3df41fe2ecd3cc312766719591bc36ecb566c..d32d537bdf1bedabf0ed3c462158836d4741c676 100644 (file)
--- a/coregrind/m_syswrap/syscall-x86-linux.S
+++ b/coregrind/m_syswrap/syscall-x86-linux.S
@@ -78,11 +78,20 @@
        
 .globl ML_(do_syscall_for_client_WRK)
 ML_(do_syscall_for_client_WRK):
+       .cfi_startproc
        /* save callee-saved regs */
        push    %esi
+       .cfi_adjust_cfa_offset 4
+       .cfi_offset %esi, -8
        push    %edi
+       .cfi_adjust_cfa_offset 4
+       .cfi_offset %esi, -12
        push    %ebx
+       .cfi_adjust_cfa_offset 4
+       .cfi_offset %esi, -16
        push    %ebp
+       .cfi_adjust_cfa_offset 4
+       .cfi_offset %esi, -20
 #define FSZ    ((4+1)*4)       /* 4 args + ret addr */
 
 1:     /* Even though we can't take a signal until the sigprocmask completes,
@@ -131,20 +140,30 @@ ML_(do_syscall_for_client_WRK):
 5:     /* now safe from signals */
        movl    $0, %eax        /* SUCCESS */
        popl    %ebp
+       .cfi_adjust_cfa_offset -4
        popl    %ebx
+       .cfi_adjust_cfa_offset -4
        popl    %edi
+       .cfi_adjust_cfa_offset -4
        popl    %esi
+       .cfi_adjust_cfa_offset -4
        ret
+       .cfi_adjust_cfa_offset 4*4
 
 7:     /* failure: return 0x8000 | error code */
        negl    %eax
        andl    $0x7FFF, %eax
        orl     $0x8000, %eax
        popl    %ebp
+       .cfi_adjust_cfa_offset -4
        popl    %ebx
+       .cfi_adjust_cfa_offset -4
        popl    %edi
+       .cfi_adjust_cfa_offset -4
        popl    %esi
+       .cfi_adjust_cfa_offset -4
        ret
+       .cfi_endproc
 #undef FSZ