From e5f88e0ca0d2762ca87263ee01d13e9950de403d Mon Sep 17 00:00:00 2001 From: Greg McGary Date: Thu, 29 Jun 2000 22:55:31 +0000 Subject: * 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 * 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. --- sysdeps/i386/bsd-setjmp.S | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'sysdeps/i386/bsd-setjmp.S') diff --git a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S index 411eaf1..b26b0e1 100644 --- a/sysdeps/i386/bsd-setjmp.S +++ b/sysdeps/i386/bsd-setjmp.S @@ -1,5 +1,5 @@ /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version. - Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 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 @@ -22,13 +22,14 @@ in setjmp doesn't clobber the state restored by longjmp. */ #include +#define _ASM +#define _SETJMP_H +#include +#include "bp-sym.h" +#include "bp-asm.h" -ENTRY (setjmp) - popl %eax /* Pop return PC. */ - popl %ecx /* Pop jmp_buf argument. */ - pushl $1 /* Push second argument of one. */ - pushl %ecx /* Push back first argument. */ - pushl %eax /* Push back return PC. */ +ENTRY (BP_SYM (setjmp)) + PUSH_SIGNAL_MASK (1) #ifdef PIC /* We cannot use the PLT, because it requires that %ebx be set, but we can't save and restore our caller's value. Instead, we do an @@ -37,9 +38,9 @@ ENTRY (setjmp) call here here: popl %ecx addl $_GLOBAL_OFFSET_TABLE_+[.-here], %ecx - movl C_SYMBOL_NAME(__sigsetjmp@GOT)(%ecx), %ecx + movl C_SYMBOL_NAME (BP_SYM (__sigsetjmp)@GOT)(%ecx), %ecx jmp *%ecx #else - jmp __sigsetjmp + jmp BP_SYM (__sigsetjmp) #endif -END (setjmp) +END (BP_SYM (setjmp)) -- cgit v1.1