diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/alloca.h | 4 | ||||
| -rw-r--r-- | sysdeps/i386/stackinfo.h | 12 |
3 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 36d09f734c..eada0c52a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-01-29 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/i386/stackinfo.h (stackinfo_get_sp): Define. + (stackinfo_sub_sp): Define. + 2009-01-28 Ulrich Drepper <drepper@redhat.com> [BZ #9750] diff --git a/include/alloca.h b/include/alloca.h index 7d243fd4ac..9a4b5c7da0 100644 --- a/include/alloca.h +++ b/include/alloca.h @@ -55,8 +55,8 @@ extern int __libc_alloca_cutoff (size_t size) __attribute__ ((const)); #else # define alloca_account(size, avar) \ ({ size_t s__ = (size); \ - avar += size__; \ - __alloca (size__); }) + avar += s__; \ + __alloca (s__); }) #endif #endif diff --git a/sysdeps/i386/stackinfo.h b/sysdeps/i386/stackinfo.h index a9a6745aaf..2530ea7234 100644 --- a/sysdeps/i386/stackinfo.h +++ b/sysdeps/i386/stackinfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,4 +25,14 @@ /* On x86 the stack grows down. */ #define _STACK_GROWS_DOWN 1 +/* Access to the stack pointer. The macros are used in alloca_account + for which they need to act as barriers as well, hence the additional + (unnecessary) parameters. */ +#define stackinfo_get_sp() \ + ({ void *p__; asm volatile ("mov %%esp, %0" : "=r" (p__)); p__; }) +#define stackinfo_sub_sp(ptr) \ + ({ ptrdiff_t d__; \ + asm volatile ("sub %%esp, %0" : "=r" (d__) : "0" (ptr)); \ + d__; }) + #endif /* stackinfo.h */ |