This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
Re: Add unwind information to i386 LinuxThreads syscalls
- From: Daniel Jacobowitz <drow at false dot org>
- To: Roland McGrath <roland at redhat dot com>, libc-alpha at sources dot redhat dot com
- Date: Tue, 8 Mar 2005 16:57:48 -0500
- Subject: Re: Add unwind information to i386 LinuxThreads syscalls
- References: <20050226004534.GA19311@nevyn.them.org> <200502260047.j1Q0lviA001016@magilla.sf.frob.com> <20050226014852.GA20794@nevyn.them.org>
On Fri, Feb 25, 2005 at 08:48:52PM -0500, Daniel Jacobowitz wrote:
> On Fri, Feb 25, 2005 at 04:47:57PM -0800, Roland McGrath wrote:
> > > On Fri, Feb 25, 2005 at 10:40:55PM +0100, Jakub Jelinek wrote:
> > > > On Fri, Feb 25, 2005 at 04:36:55PM -0500, Daniel Jacobowitz wrote:
> > > > > LinuxThreads doesn't need unwind information for cancellation, but other
> > > > > things need to unwind out of cancellable syscalls from time to time - for
> > > > > instance, GDB. I don't know if gcj needs this too but I suspect it does.
> > > > > This patch adapts the .eh_frame information from the NPTL version of
> > > > > sysdep-cancel.h.
> > > > >
> > > > > Tested on i686-pc-linux-gnu. Is this OK?
> > > >
> > > > Can't you use .cfi_* directives instead?
> > >
> > > Sure, but I didn't write this from scratch - as I said, I took it from
> > > the NPTL implementation. Might as well keep them in sync.
> >
> > Since you've adjusted the bits, they aren't in synch anyway. That code was
> > done before .cfi_* were available in the assembler, and just hasn't change
> > since. We do not want to add anything new that use hand-written bits.
>
> Actually, I didn't adjust them at all. They're exactly the same as
> they are in NPTL. However, if you'd prefer I rewrite them using
> .cfi_*, I'll try to do that tomorrow - should be reasonably easy.
Was a little trickier than I thought. Here's the patch - much easier
to read now. Is this OK?
Tested on i686-linux, using both LinuxThreads and NPTL. Also
hand-checked that the unwind information was right in various cases.
--
Daniel Jacobowitz
CodeSourcery, LLC
2005-03-08 Daniel Jacobowitz <dan@codesourcery.com>
* sysdeps/unix/sysv/linux/i386/sysdep.h: Include
<sysdeps/generic/sysdep.h>.
(_CFI, CFI_PUSH, CFI_POP): Define.
(PUSHARGS_1, POPARGS_1, _PUSHARGS_1, _POPARGS_1, _PUSHARGS_4,
_POPARGS_4, _PUSHARGS_5, _POPARGS_5, _PUSHARGS_6, _POPARGS_6): Use
them.
2005-03-08 Daniel Jacobowitz <dan@codesourcery.com>
* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (_CFI): Define.
(PSEUDO, SAVE_OLDTYPE_2, PUSHCARGS_1, POPCARGS_1, _PUSHCARGS_1,
_POPCARGS_1, _PUSHCARGS_4, _POPCARGS_4, _PUSHCARGS_5, _POPCARGS_5,
POPSTATE_0, POPSTATE_2): Use CFI markers.
(AUGMENTATION_STRING, AUGMENTATION_PARAM, AUGMENTATION_PARAM_FDE,
START_SYMBOL_REF, EH_FRAME_0, EH_FRAME_1, EH_FRAME_2, EH_FRAME_3,
EH_FRAME_4, EH_FRAME_5, ASM_SIZE_DIRECTIVE): Delete.
2005-03-08 Daniel Jacobowitz <dan@codesourcery.com>
* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (_CFI): Define.
(PSEUDO, SAVE_OLDTYPE_2, PUSHCARGS_1, POPCARGS_1, _PUSHCARGS_1,
_POPCARGS_1, _PUSHCARGS_4, _POPCARGS_4, _PUSHCARGS_5, _POPCARGS_5,
POPSTATE_0, POPSTATE_2): Add CFI markers.
Index: linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
===================================================================
RCS file: /home/drow/rsync/glibc/libc/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h,v
retrieving revision 1.12
diff -u -p -r1.12 sysdep-cancel.h
--- linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h 16 Apr 2004 21:54:33 -0000 1.12
+++ linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h 8 Mar 2005 21:51:07 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@@ -26,10 +26,15 @@
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+/* Enable CFI. */
+#undef _CFI
+#define _CFI(x) x
+
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
.text; \
ENTRY (name) \
+ cfi_startproc; \
SINGLE_THREAD_P; \
jne L(pseudo_cancel); \
DO_CALL (syscall_name, args); \
@@ -47,11 +52,12 @@
POPSTATE_##args \
cmpl $-4095, %eax; \
jae SYSCALL_ERROR_LABEL; \
+ cfi_endproc; \
L(pseudo_end):
# define SAVE_OLDTYPE_0 movl %eax, %ecx;
# define SAVE_OLDTYPE_1 SAVE_OLDTYPE_0
-# define SAVE_OLDTYPE_2 pushl %eax;
+# define SAVE_OLDTYPE_2 pushl %eax; cfi_adjust_cfa_offset(4);
# define SAVE_OLDTYPE_3 SAVE_OLDTYPE_2
# define SAVE_OLDTYPE_4 SAVE_OLDTYPE_2
# define SAVE_OLDTYPE_5 SAVE_OLDTYPE_2
@@ -62,11 +68,11 @@
# define _PUSHCARGS_0 /* No arguments to push. */
# define _POPCARGS_0 /* No arguments to pop. */
-# define PUSHCARGS_1 movl %ebx, %edx; PUSHCARGS_0
+# define PUSHCARGS_1 movl %ebx, %edx; cfi_register(%ebx,%edx); PUSHCARGS_0
# define DOCARGS_1 _DOARGS_1 (4)
-# define POPCARGS_1 POPCARGS_0; movl %edx, %ebx
-# define _PUSHCARGS_1 pushl %ebx; L(PUSHBX2): _PUSHCARGS_0
-# define _POPCARGS_1 _POPCARGS_0; popl %ebx; L(POPBX2):
+# define POPCARGS_1 POPCARGS_0; movl %edx, %ebx; cfi_restore(%ebx);
+# define _PUSHCARGS_1 pushl %ebx; CFI_PUSH(%ebx); _PUSHCARGS_0
+# define _POPCARGS_1 _POPCARGS_0; popl %ebx; CFI_POP(%ebx);
# define PUSHCARGS_2 PUSHCARGS_1
# define DOCARGS_2 _DOARGS_2 (12)
@@ -83,14 +89,14 @@
# define PUSHCARGS_4 _PUSHCARGS_4
# define DOCARGS_4 _DOARGS_4 (28)
# define POPCARGS_4 _POPCARGS_4
-# define _PUSHCARGS_4 pushl %esi; L(PUSHSI2): _PUSHCARGS_3
-# define _POPCARGS_4 _POPCARGS_3; popl %esi; L(POPSI2):
+# define _PUSHCARGS_4 pushl %esi; CFI_PUSH(%esi); _PUSHCARGS_3
+# define _POPCARGS_4 _POPCARGS_3; popl %esi; CFI_POP(%esi);
# define PUSHCARGS_5 _PUSHCARGS_5
# define DOCARGS_5 _DOARGS_5 (36)
# define POPCARGS_5 _POPCARGS_5
-# define _PUSHCARGS_5 pushl %edi; L(PUSHDI2): _PUSHCARGS_4
-# define _POPCARGS_5 _POPCARGS_4; popl %edi; L(POPDI2):
+# define _PUSHCARGS_5 pushl %edi; CFI_POP(%edi); _PUSHCARGS_4
+# define _POPCARGS_5 _POPCARGS_4; popl %edi; CFI_POP(%edi);
# ifdef IS_IN_libpthread
# define CENABLE call __pthread_enable_asynccancel;
@@ -115,9 +121,9 @@
# define CENABLE call __libc_enable_asynccancel;
# define CDISABLE call __libc_disable_asynccancel
# endif
-# define POPSTATE_0 pushl %eax; movl %ecx, %eax; CDISABLE; popl %eax;
+# define POPSTATE_0 pushl %eax; cfi_adjust_cfa_offset(4); movl %ecx, %eax; CDISABLE; popl %eax; cfi_adjust_cfa_offset(-4);
# define POPSTATE_1 POPSTATE_0
-# define POPSTATE_2 xchgl (%esp), %eax; CDISABLE; popl %eax;
+# define POPSTATE_2 xchgl (%esp), %eax; CDISABLE; popl %eax; cfi_adjust_cfa_offset(-4);
# define POPSTATE_3 POPSTATE_2
# define POPSTATE_4 POPSTATE_2
# define POPSTATE_5 POPSTATE_2
Index: nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
===================================================================
RCS file: /home/drow/rsync/glibc/libc/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h,v
retrieving revision 1.18
diff -u -p -r1.18 sysdep-cancel.h
--- nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h 6 Jul 2004 04:25:45 -0000 1.18
+++ nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h 8 Mar 2005 21:51:14 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@@ -25,11 +25,15 @@
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+/* Enable CFI. */
+#undef _CFI
+#define _CFI(x) x
+
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
.text; \
ENTRY (name) \
- L(name##START): \
+ cfi_startproc; \
cmpl $0, %gs:MULTIPLE_THREADS_OFFSET; \
jne L(pseudo_cancel); \
.type __##syscall_name##_nocancel,@function; \
@@ -51,258 +55,12 @@
POPSTATE_##args \
cmpl $-4095, %eax; \
jae SYSCALL_ERROR_LABEL; \
- L(pseudo_end): \
- \
- /* Create unwinding information for the syscall wrapper. */ \
- .section .eh_frame,"a",@progbits; \
- L(STARTFRAME): \
- /* Length of the CIE. */ \
- .long L(ENDCIE)-L(STARTCIE); \
- L(STARTCIE): \
- /* CIE ID. */ \
- .long 0; \
- /* Version number. */ \
- .byte 1; \
- /* NUL-terminated augmentation string. */ \
- AUGMENTATION_STRING; \
- /* Code alignment factor. */ \
- .uleb128 1; \
- /* Data alignment factor. */ \
- .sleb128 -4; \
- /* Return address register column. */ \
- .byte 8; \
- /* Optional augmentation parameter. */ \
- AUGMENTATION_PARAM \
- /* Start of the table initialization. */ \
- .byte 0xc; /* DW_CFA_def_cfa */ \
- .uleb128 4; \
- .uleb128 4; \
- .byte 0x88; /* DW_CFA_offset, column 0x8 */ \
- .uleb128 1; \
- .align 4; \
- L(ENDCIE): \
- /* Length of the FDE. */ \
- .long L(ENDFDE)-L(STARTFDE); \
- L(STARTFDE): \
- /* CIE pointer. */ \
- .long L(STARTFDE)-L(STARTFRAME); \
- /* Start address of the code. */ \
- START_SYMBOL_REF (name); \
- /* Length of the code. */ \
- .long L(name##END)-L(name##START); \
- /* Augmentation data. */ \
- AUGMENTATION_PARAM_FDE \
- /* The rest of the code depends on the number of parameters the syscall \
- takes. */ \
- EH_FRAME_##args(name); \
- .align 4; \
- L(ENDFDE): \
- .previous
-
-# ifdef SHARED
-/* NUL-terminated augmentation string. Note "z" means there is an
- augmentation value later on. */
-# define AUGMENTATION_STRING .string "zR"
-# define AUGMENTATION_PARAM \
- /* Augmentation value length. */ \
- .uleb128 1; \
- /* Encoding: DW_EH_PE_pcrel + DW_EH_PE_sdata4. */ \
- .byte 0x1b;
-# define AUGMENTATION_PARAM_FDE \
- /* No augmentation data. */ \
- .uleb128 0;
-# define START_SYMBOL_REF(name) \
- /* PC-relative start address of the code. */ \
- .long L(name##START)-.
-# else
-/* No augmentation. */
-# define AUGMENTATION_STRING .ascii "\0"
-# define AUGMENTATION_PARAM /* nothing */
-# define AUGMENTATION_PARAM_FDE /* nothing */
-# define START_SYMBOL_REF(name) \
- /* Absolute start address of the code. */ \
- .long L(name##START)
-# endif
-
-/* Callframe description for syscalls without parameters. This is very
- simple. The only place the stack pointer is changed is when the old
- cancellation state value is saved. */
-# define EH_FRAME_0(name) \
- .byte 0x40+L(PUSHSTATE)-L(name##START); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0x40+L(POPSTATE)-L(PUSHSTATE); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 4
-
-/* For syscalls with one and two parameters the code is the same as for
- those which take no parameter. */
-# define EH_FRAME_1(name) \
- .byte 0x40+L(SAVEBX1)-L(name##START); /* DW_CFA_advance_loc+N */ \
- .byte 9; /* DW_CFA_register */ \
- .uleb128 3; /* %ebx */ \
- .uleb128 2; /* %edx */ \
- .byte 0x40+L(RESTBX1)-L(SAVEBX1); /* DW_CFA_advance_loc+N */ \
- .byte 0xc3; /* DW_CFA_restore %ebx */ \
- .byte 0x40+L(PUSHSTATE)-L(RESTBX1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0x40+L(SAVEBX2)-L(PUSHSTATE); /* DW_CFA_advance_loc+N */ \
- .byte 9; /* DW_CFA_register */ \
- .uleb128 3; /* %ebx */ \
- .uleb128 2; /* %edx */ \
- .byte 0x40+L(RESTBX2)-L(SAVEBX2); /* DW_CFA_advance_loc+N */ \
- .byte 0xc3; /* DW_CFA_restore %ebx */ \
- .byte 0x40+L(POPSTATE)-L(RESTBX2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 4
-
-# define EH_FRAME_2(name) EH_FRAME_1 (name)
-
-/* For syscalls with three parameters the stack pointer is changed
- also to save the content of the %ebx register. */
-# define EH_FRAME_3(name) \
- .byte 0x40+L(PUSHBX1)-L(name##START); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0x83; /* DW_CFA_offset %ebx */ \
- .uleb128 2; \
- .byte 0x40+L(POPBX1)-L(PUSHBX1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 4; \
- .byte 0xc3; /* DW_CFA_restore %ebx */ \
- .byte 0x40+L(PUSHSTATE)-L(POPBX1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0x40+L(PUSHBX2)-L(PUSHSTATE); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 12; \
- .byte 0x83; /* DW_CFA_offset %ebx */ \
- .uleb128 3; \
- .byte 0x40+L(POPBX2)-L(PUSHBX2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0xc3; /* DW_CFA_restore %ebx */ \
- .byte 0x40+L(POPSTATE)-L(POPBX2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 4
-
-/* With four parameters the syscall wrappers have to save %ebx and %esi. */
-# define EH_FRAME_4(name) \
- .byte 0x40+L(PUSHSI1)-L(name##START); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0x86; /* DW_CFA_offset %esi */ \
- .uleb128 2; \
- .byte 0x40+L(PUSHBX1)-L(PUSHSI1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 12; \
- .byte 0x83; /* DW_CFA_offset %ebx */ \
- .uleb128 3; \
- .byte 0x40+L(POPBX1)-L(PUSHBX1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0xc3; /* DW_CFA_restore %ebx */ \
- .byte 0x40+L(POPSI1)-L(POPBX1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 4; \
- .byte 0xc6; /* DW_CFA_restore %esi */ \
- .byte 0x40+L(PUSHSTATE)-L(POPSI1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0x40+L(PUSHSI2)-L(PUSHSTATE); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 12; \
- .byte 0x86; /* DW_CFA_offset %esi */ \
- .uleb128 3; \
- .byte 0x40+L(PUSHBX2)-L(PUSHSI2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 16; \
- .byte 0x83; /* DW_CFA_offset %ebx */ \
- .uleb128 4; \
- .byte 0x40+L(POPBX2)-L(PUSHBX2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 12; \
- .byte 0xc3; /* DW_CFA_restore %ebx */ \
- .byte 0x40+L(POPSI2)-L(POPBX2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0xc6; /* DW_CFA_restore %esi */ \
- .byte 0x40+L(POPSTATE)-L(POPSI2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 4
-
-/* With five parameters the syscall wrappers have to save %ebx, %esi,
- and %edi. */
-# define EH_FRAME_5(name) \
- .byte 0x40+L(PUSHDI1)-L(name##START); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0x87; /* DW_CFA_offset %edi */ \
- .uleb128 2; \
- .byte 0x40+L(PUSHSI1)-L(PUSHDI1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 12; \
- .byte 0x86; /* DW_CFA_offset %esi */ \
- .uleb128 3; \
- .byte 0x40+L(PUSHBX1)-L(PUSHSI1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 16; \
- .byte 0x83; /* DW_CFA_offset %ebx */ \
- .uleb128 4; \
- .byte 0x40+L(POPBX1)-L(PUSHBX1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 12; \
- .byte 0xc3; /* DW_CFA_restore %ebx */ \
- .byte 0x40+L(POPSI1)-L(POPBX1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0xc6; /* DW_CFA_restore %esi */ \
- .byte 0x40+L(POPDI1)-L(POPSI1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 4; \
- .byte 0xc7; /* DW_CFA_restore %edi */ \
- .byte 0x40+L(PUSHSTATE)-L(POPDI1); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0x40+L(PUSHDI2)-L(PUSHSTATE); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 12; \
- .byte 0x87; /* DW_CFA_offset %edi */ \
- .uleb128 3; \
- .byte 0x40+L(PUSHSI2)-L(PUSHDI2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 16; \
- .byte 0x86; /* DW_CFA_offset %esi */ \
- .uleb128 4; \
- .byte 0x40+L(PUSHBX2)-L(PUSHSI2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 20; \
- .byte 0x83; /* DW_CFA_offset %ebx */ \
- .uleb128 5; \
- .byte 0x40+L(POPBX2)-L(PUSHBX2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 16; \
- .byte 0xc3; /* DW_CFA_restore %ebx */ \
- .byte 0x40+L(POPSI2)-L(POPBX2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 12; \
- .byte 0xc6; /* DW_CFA_restore %esi */ \
- .byte 0x40+L(POPDI2)-L(POPSI2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 8; \
- .byte 0xc7; /* DW_CFA_restore %edi */ \
- .byte 0x40+L(POPSTATE)-L(POPDI2); /* DW_CFA_advance_loc+N */ \
- .byte 14; /* DW_CFA_def_cfa_offset */ \
- .uleb128 4
-
-
-# undef ASM_SIZE_DIRECTIVE
-# define ASM_SIZE_DIRECTIVE(name) L(name##END): .size name,.-name;
+ cfi_endproc; \
+ L(pseudo_end):
# define SAVE_OLDTYPE_0 movl %eax, %ecx;
# define SAVE_OLDTYPE_1 SAVE_OLDTYPE_0
-# define SAVE_OLDTYPE_2 pushl %eax; L(PUSHSTATE):
+# define SAVE_OLDTYPE_2 pushl %eax; cfi_adjust_cfa_offset(4);
# define SAVE_OLDTYPE_3 SAVE_OLDTYPE_2
# define SAVE_OLDTYPE_4 SAVE_OLDTYPE_2
# define SAVE_OLDTYPE_5 SAVE_OLDTYPE_2
@@ -313,11 +71,11 @@
# define _PUSHCARGS_0 /* No arguments to push. */
# define _POPCARGS_0 /* No arguments to pop. */
-# define PUSHCARGS_1 movl %ebx, %edx; L(SAVEBX2): PUSHCARGS_0
+# define PUSHCARGS_1 movl %ebx, %edx; cfi_register(%ebx,%edx); PUSHCARGS_0
# define DOCARGS_1 _DOARGS_1 (4)
-# define POPCARGS_1 POPCARGS_0; movl %edx, %ebx; L(RESTBX2):
-# define _PUSHCARGS_1 pushl %ebx; L(PUSHBX2): _PUSHCARGS_0
-# define _POPCARGS_1 _POPCARGS_0; popl %ebx; L(POPBX2):
+# define POPCARGS_1 POPCARGS_0; movl %edx, %ebx; cfi_restore(%ebx);
+# define _PUSHCARGS_1 pushl %ebx; CFI_PUSH(%ebx); _PUSHCARGS_0
+# define _POPCARGS_1 _POPCARGS_0; popl %ebx; CFI_POP(%ebx);
# define PUSHCARGS_2 PUSHCARGS_1
# define DOCARGS_2 _DOARGS_2 (12)
@@ -334,14 +92,14 @@
# define PUSHCARGS_4 _PUSHCARGS_4
# define DOCARGS_4 _DOARGS_4 (28)
# define POPCARGS_4 _POPCARGS_4
-# define _PUSHCARGS_4 pushl %esi; L(PUSHSI2): _PUSHCARGS_3
-# define _POPCARGS_4 _POPCARGS_3; popl %esi; L(POPSI2):
+# define _PUSHCARGS_4 pushl %esi; CFI_PUSH(%esi); _PUSHCARGS_3
+# define _POPCARGS_4 _POPCARGS_3; popl %esi; CFI_POP(%esi);
# define PUSHCARGS_5 _PUSHCARGS_5
# define DOCARGS_5 _DOARGS_5 (36)
# define POPCARGS_5 _POPCARGS_5
-# define _PUSHCARGS_5 pushl %edi; L(PUSHDI2): _PUSHCARGS_4
-# define _POPCARGS_5 _POPCARGS_4; popl %edi; L(POPDI2):
+# define _PUSHCARGS_5 pushl %edi; CFI_PUSH(%edi); _PUSHCARGS_4
+# define _POPCARGS_5 _POPCARGS_4; popl %edi; CFI_POP(%edi);
# ifdef IS_IN_libpthread
# define CENABLE call __pthread_enable_asynccancel;
@@ -356,9 +114,9 @@
# error Unsupported library
# endif
# define POPSTATE_0 \
- pushl %eax; L(PUSHSTATE): movl %ecx, %eax; CDISABLE; popl %eax; L(POPSTATE):
+ pushl %eax; cfi_adjust_cfa_offset(4); movl %ecx, %eax; CDISABLE; popl %eax; cfi_adjust_cfa_offset(-4);
# define POPSTATE_1 POPSTATE_0
-# define POPSTATE_2 xchgl (%esp), %eax; CDISABLE; popl %eax; L(POPSTATE):
+# define POPSTATE_2 xchgl (%esp), %eax; CDISABLE; popl %eax; cfi_adjust_cfa_offset(-4);
# define POPSTATE_3 POPSTATE_2
# define POPSTATE_4 POPSTATE_3
# define POPSTATE_5 POPSTATE_4
Index: sysdeps/unix/sysv/linux/i386/sysdep.h
===================================================================
RCS file: /home/drow/rsync/glibc/libc/sysdeps/unix/sysv/linux/i386/sysdep.h,v
retrieving revision 1.60
diff -u -p -r1.60 sysdep.h
--- sysdeps/unix/sysv/linux/i386/sysdep.h 8 Feb 2005 06:48:30 -0000 1.60
+++ sysdeps/unix/sysv/linux/i386/sysdep.h 8 Mar 2005 20:24:56 -0000
@@ -29,6 +29,8 @@
#include <dl-sysdep.h>
#include <tls.h>
+/* For the CFI macros. */
+#include <sysdeps/generic/sysdep.h>
/* For Linux we can use the system call table in the header file
/usr/include/asm/unistd.h
@@ -211,6 +213,11 @@ __i686.get_pc_thunk.reg: \
# define ENTER_KERNEL int $0x80
#endif
+/* By default do not include CFI. */
+#define _CFI(x)
+#define CFI_PUSH(reg) _CFI(cfi_adjust_cfa_offset(4); cfi_rel_offset(reg, 0);)
+#define CFI_POP(reg) _CFI(cfi_adjust_cfa_offset(-4); cfi_restore(reg);)
+
/* Linux takes system call arguments in registers:
syscall number %eax call-clobbered
@@ -270,12 +277,12 @@ __i686.get_pc_thunk.reg: \
#define _DOARGS_0(n) /* No arguments to frob. */
#define _POPARGS_0 /* No arguments to pop. */
-#define PUSHARGS_1 movl %ebx, %edx; L(SAVEBX1): PUSHARGS_0
+#define PUSHARGS_1 movl %ebx, %edx; _CFI(cfi_register(%ebx,%edx);) PUSHARGS_0
#define DOARGS_1 _DOARGS_1 (4)
-#define POPARGS_1 POPARGS_0; movl %edx, %ebx; L(RESTBX1):
-#define _PUSHARGS_1 pushl %ebx; L(PUSHBX1): _PUSHARGS_0
+#define POPARGS_1 POPARGS_0; movl %edx, %ebx; _CFI(cfi_restore(%ebx);)
+#define _PUSHARGS_1 pushl %ebx; CFI_PUSH(%ebx); _PUSHARGS_0
#define _DOARGS_1(n) movl n(%esp), %ebx; _DOARGS_0(n-4)
-#define _POPARGS_1 _POPARGS_0; popl %ebx; L(POPBX1):
+#define _POPARGS_1 _POPARGS_0; popl %ebx; CFI_POP(%ebx);
#define PUSHARGS_2 PUSHARGS_1
#define DOARGS_2 _DOARGS_2 (8)
@@ -294,23 +301,23 @@ __i686.get_pc_thunk.reg: \
#define PUSHARGS_4 _PUSHARGS_4
#define DOARGS_4 _DOARGS_4 (24)
#define POPARGS_4 _POPARGS_4
-#define _PUSHARGS_4 pushl %esi; L(PUSHSI1): _PUSHARGS_3
+#define _PUSHARGS_4 pushl %esi; CFI_PUSH(%esi); _PUSHARGS_3
#define _DOARGS_4(n) movl n(%esp), %esi; _DOARGS_3 (n-4)
-#define _POPARGS_4 _POPARGS_3; popl %esi; L(POPSI1):
+#define _POPARGS_4 _POPARGS_3; popl %esi; CFI_POP(%esi);
#define PUSHARGS_5 _PUSHARGS_5
#define DOARGS_5 _DOARGS_5 (32)
#define POPARGS_5 _POPARGS_5
-#define _PUSHARGS_5 pushl %edi; L(PUSHDI1): _PUSHARGS_4
+#define _PUSHARGS_5 pushl %edi; CFI_PUSH(%edi); _PUSHARGS_4
#define _DOARGS_5(n) movl n(%esp), %edi; _DOARGS_4 (n-4)
-#define _POPARGS_5 _POPARGS_4; popl %edi; L(POPDI1):
+#define _POPARGS_5 _POPARGS_4; popl %edi; CFI_POP(%edi);
#define PUSHARGS_6 _PUSHARGS_6
#define DOARGS_6 _DOARGS_6 (36)
#define POPARGS_6 _POPARGS_6
-#define _PUSHARGS_6 pushl %ebp; L(PUSHBP1): _PUSHARGS_5
+#define _PUSHARGS_6 pushl %ebp; CFI_PUSH(%ebp); _PUSHARGS_5
#define _DOARGS_6(n) movl n(%esp), %ebp; _DOARGS_5 (n-4)
-#define _POPARGS_6 _POPARGS_5; popl %ebp; L(POPBP1):
+#define _POPARGS_6 _POPARGS_5; popl %ebp; CFI_POP(%ebp);
#else /* !__ASSEMBLER__ */