aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--setjmp/setjmp.h35
-rw-r--r--sysdeps/i386/bsd-_setjmp.S19
3 files changed, 32 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index c0a6ec3b17..502617a646 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2001-01-16 Ulrich Drepper <drepper@redhat.com>
+ * setjmp/setjmp.h: Cleanup definition of setjmp macro.
+
* sysdeps/i386/elf/bsd-setjmp.S: Real implementation.
* sysdeps/i386/elf/bsd-_setjmp.S: Removed.
* sysdeps/i386/elf/setjmp.S (setjmp): Removed here.
diff --git a/setjmp/setjmp.h b/setjmp/setjmp.h
index 44bd8d7262..af48446688 100644
--- a/setjmp/setjmp.h
+++ b/setjmp/setjmp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2001 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
@@ -34,36 +34,39 @@ __BEGIN_DECLS
typedef struct __jmp_buf_tag /* C++ doesn't like tagless structs. */
{
/* NOTE: The machine-dependent definitions of `__sigsetjmp'
- assume that a `jmp_buf' begins with a `__jmp_buf'.
- Do not move this member or add others before it. */
+ assume that a `jmp_buf' begins with a `__jmp_buf' and that
+ `__mask_was_saved' follows it. Do not move these members
+ or add others before it. */
__jmp_buf __jmpbuf; /* Calling environment. */
int __mask_was_saved; /* Saved the signal mask? */
__sigset_t __saved_mask; /* Saved signal mask. */
} jmp_buf[1];
+/* Store the calling environment in ENV, also saving the signal mask.
+ Return 0. */
+extern int setjmp (jmp_buf __env) __THROW;
+
+/* Store the calling environment in ENV, not saving the signal mask.
+ Return 0. */
+extern int _setjmp (jmp_buf __env) __THROW;
+
/* Store the calling environment in ENV, also saving the
signal mask if SAVEMASK is nonzero. Return 0.
This is the internal name for `sigsetjmp'. */
extern int __sigsetjmp (jmp_buf __env, int __savemask) __THROW;
#ifndef __FAVOR_BSD
-/* Set ENV to the current position and return 0, not saving the signal mask.
- This is just like `sigsetjmp (ENV, 0)'.
- The ISO C standard says `setjmp' is a macro. */
-# define setjmp(env) __sigsetjmp ((env), 0)
+/* Do not save the signal mask. This is equivalent to the `_setjmp'
+ BSD function. */
+# define setjmp(env) _setjmp (env)
#else
/* We are in 4.3 BSD-compatibility mode in which `setjmp'
- saves the signal mask like `sigsetjmp (ENV, 1)'. */
-# define setjmp(env) __sigsetjmp ((env), 1)
+ saves the signal mask like `sigsetjmp (ENV, 1)'. We have to
+ define a macro since ISO C says `setjmp' is one. */
+# define setjmp(env) setjmp (env)
#endif /* Favor BSD. */
-#if defined __USE_BSD || defined __USE_XOPEN
-/* Set ENV to the current position and return 0, not saving the signal mask.
- This is the 4.3 BSD name for ISO `setjmp'. */
-# define _setjmp(env) __sigsetjmp ((env), 0)
-#endif
-
/* Jump to the environment saved in ENV, making the
`setjmp' call there return VAL, or 1 if VAL is 0. */
@@ -86,7 +89,7 @@ typedef jmp_buf sigjmp_buf;
/* Store the calling environment in ENV, also saving the
signal mask if SAVEMASK is nonzero. Return 0. */
-# define sigsetjmp(env, savemask) __sigsetjmp ((env), (savemask))
+# define sigsetjmp(env, savemask) __sigsetjmp (env, savemask)
/* Jump to the environment saved in ENV, making the
sigsetjmp call there return VAL, or 1 if VAL is 0.
diff --git a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S
index aa9b8edfd8..5b215f05f1 100644
--- a/sysdeps/i386/bsd-_setjmp.S
+++ b/sysdeps/i386/bsd-_setjmp.S
@@ -35,18 +35,21 @@
ENTRY (BP_SYM (_setjmp))
ENTER
- movl JMPBUF(%esp), %eax
- CHECK_BOUNDS_BOTH_WIDE (%eax, JMPBUF(%esp), $JB_SIZE)
+ xorl %eax, %eax
+ movl JMPBUF(%esp), %edx
+ CHECK_BOUNDS_BOTH_WIDE (%edx, JMPBUF(%esp), $(JB_SIZE+4))
/* Save registers. */
- movl %ebx, (JB_BX*4)(%eax)
- movl %esi, (JB_SI*4)(%eax)
- movl %edi, (JB_DI*4)(%eax)
+ movl %ebx, (JB_BX*4)(%edx)
+ movl %esi, (JB_SI*4)(%edx)
+ movl %edi, (JB_DI*4)(%edx)
leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return. */
- movl %ecx, (JB_SP*4)(%eax)
+ movl %ecx, (JB_SP*4)(%edx)
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
- movl %ecx, (JB_PC*4)(%eax)
+ movl %ecx, (JB_PC*4)(%edx)
LEAVE
- movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */
+ movl %ebp, (JB_BP*4)(%edx) /* Save caller's frame pointer. */
+
+ movl %eax, JB_SIZE(%edx) /* No signal mask set. */
ret
END (BP_SYM (_setjmp))