diff options
| author | Roland McGrath <roland@gnu.org> | 2005-12-28 05:42:30 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-12-28 05:42:30 +0000 |
| commit | db169ed561acef18093cc6739fb159d6274bf5a5 (patch) | |
| tree | 18d7b799dd18051b570bcec3826b6392074cde43 /nptl/sysdeps/x86_64 | |
| parent | 0317eaecb1f1a0667a18412b2209f0ae70f94420 (diff) | |
| download | glibc-db169ed561acef18093cc6739fb159d6274bf5a5.tar glibc-db169ed561acef18093cc6739fb159d6274bf5a5.tar.gz glibc-db169ed561acef18093cc6739fb159d6274bf5a5.tar.bz2 glibc-db169ed561acef18093cc6739fb159d6274bf5a5.zip | |
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
(PTR_MANGLE): Fix cast.
* sysdeps/alpha/bits/setjmp.h (_JMPBUF_UNWINDS): Take third argument
DEMANGLE, and pass SP value through it.
* sysdeps/hppa/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise.
* sysdeps/i386/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise.
* sysdeps/m68k/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise.
* sysdeps/mips/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise.
* sysdeps/powerpc/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise.
* sysdeps/s390/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise.
* sysdeps/sh/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/setjmp.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/setjmp.h: Likewise.
* sysdeps/x86_64/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise.
* hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Pass inline
demangler function to _JMPBUF_UNWINDS.
* sysdeps/mach/hurd/jmp-unwind.c (demangle_ptr): New function.
(_longjmp_unwind): Pass it to _JMPBUF_UNWINDS.
Diffstat (limited to 'nptl/sysdeps/x86_64')
| -rw-r--r-- | nptl/sysdeps/x86_64/jmpbuf-unwind.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nptl/sysdeps/x86_64/jmpbuf-unwind.h b/nptl/sysdeps/x86_64/jmpbuf-unwind.h index 345ed557c5..1a36c53d11 100644 --- a/nptl/sysdeps/x86_64/jmpbuf-unwind.h +++ b/nptl/sysdeps/x86_64/jmpbuf-unwind.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. @@ -20,12 +20,23 @@ #include <setjmp.h> #include <stdint.h> #include <unwind.h> +#include <sysdep.h> #define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \ _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj) +static inline uintptr_t __attribute__ ((unused)) +_jmpbuf_sp (__jmp_buf regs) +{ + uintptr_t sp = regs[JB_RSP]; +#ifdef PTR_DEMANGLE + PTR_DEMANGLE (sp); +#endif + return sp; +} + #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ - ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_RSP] - (_adj)) + ((uintptr_t) (_address) - (_adj) < _jmpbuf_sp (_jmpbuf) - (_adj)) /* We use the normal lobngjmp for unwinding. */ #define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) |