diff options
| author | Greg McGary <greg@mcgary.org> | 2000-06-29 22:55:31 +0000 |
|---|---|---|
| committer | Greg McGary <greg@mcgary.org> | 2000-06-29 22:55:31 +0000 |
| commit | e5f88e0ca0d2762ca87263ee01d13e9950de403d (patch) | |
| tree | 88f266651d99e6be69fd69c46935bfb81bf33676 /sysdeps/i386/bits | |
| parent | d3d89ab3a83ad036d7ea4794d044a1e710598fcd (diff) | |
| download | glibc-e5f88e0ca0d2762ca87263ee01d13e9950de403d.tar glibc-e5f88e0ca0d2762ca87263ee01d13e9950de403d.tar.gz glibc-e5f88e0ca0d2762ca87263ee01d13e9950de403d.tar.bz2 glibc-e5f88e0ca0d2762ca87263ee01d13e9950de403d.zip | |
* sysdeps/i386/bp-asm.h (PCOFF): New constant.
(POP_ERRNO_LOCATION_RETURN): Fold insns.
* sysdeps/i386/bits/setjmp.h (JB_SIZE): New constant.
(PUSH_SIGNAL_MASK): New macro.
* sysdeps/i386/__longjmp.S (__longjmp): Wrap symbol in BP_SYM ().
LEAVE is unnecessary. Check bounds of jmp_buf.
* sysdeps/i386/elf/setjmp.S: Call PUSH_SIGNAL_MASK. Wrap symbols
in BP_SYM (). Check bounds of jmp_buf. Don't call LEAVE until
immediately before tail-call.
* sysdeps/i386/setjmp.S: Likewise.
* sysdeps/i386/bsd-_setjmp.S: Likewise.
* sysdeps/i386/bsd-setjmp.S: Likewise.
2000-06-29 Greg McGary <greg@mcgary.org>
* sysdeps/i386/bp-asm.h (PCOFF): New constant.
(POP_ERRNO_LOCATION_RETURN): Fold insns.
* sysdeps/i386/bits/setjmp.h (JB_SIZE): New constant.
(PUSH_SIGNAL_MASK): New macro.
* sysdeps/i386/__longjmp.S (__longjmp): Wrap symbol in BP_SYM ().
LEAVE is unnecessary. Check bounds of jmp_buf.
* sysdeps/i386/elf/setjmp.S: Call PUSH_SIGNAL_MASK. Wrap symbols
in BP_SYM (). Check bounds of jmp_buf. Don't call LEAVE until
immediately before tail-call.
* sysdeps/i386/setjmp.S: Likewise.
* sysdeps/i386/bsd-_setjmp.S: Likewise.
* sysdeps/i386/bsd-setjmp.S: Likewise.
Diffstat (limited to 'sysdeps/i386/bits')
| -rw-r--r-- | sysdeps/i386/bits/setjmp.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/sysdeps/i386/bits/setjmp.h b/sysdeps/i386/bits/setjmp.h index 2f5b44531a..327e5670ac 100644 --- a/sysdeps/i386/bits/setjmp.h +++ b/sysdeps/i386/bits/setjmp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000 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 @@ -29,9 +29,31 @@ # define JB_BP 3 # define JB_SP 4 # define JB_PC 5 +# define JB_SIZE 24 #endif -#ifndef _ASM +#ifdef _ASM +/* We internally convert all setjmp (buf) calls to sigsetjmp (buf, mask), + so we must shift with the call frame to insert the mask argument. */ +# if __BOUNDED_POINTERS__ +# define PUSH_SIGNAL_MASK(MASK) \ + popl %eax; /* return address */ \ + popl %ecx; /* jmp_buf value */ \ + popl %edx; /* jmp_buf low bound */ \ + pushl 0(%esp); /* jmp_buf high bound */ \ + movel $MASK, 4(%esp); \ + pushl %edx; \ + pushl %ecx; \ + pushl %eax +# else +# define PUSH_SIGNAL_MASK(MASK) \ + popl %eax; /* return address */ \ + popl %ecx; /* jmp_buf */ \ + pushl $MASK; \ + pushl %ecx; \ + pushl %eax +# endif +#else typedef int __jmp_buf[6]; #endif |