The BSD setjmp() implementation was not at all BeOS compatible. This one

is now.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9195 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/kernel/libroot/posix/arch/x86/Jamfile

@@ -1,8 +1,10 @@
 SubDir OBOS_TOP src kernel libroot posix arch x86 ;
 
 KernelMergeObject posix_arch_$(OBOS_ARCH).o :
-	_setjmp.S
+	setjmp.c
-	setjmp.S
+	setjmp_save_sigs.c
 	sigsetjmp.S
+	siglongjmp.S
+
 	: -fPIC -DPIC
 	;

src/kernel/libroot/posix/arch/x86/_setjmp.S

@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "asm.h"
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	_setjmp(a)
- * by restoring registers from the environment 'a'.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	movl	4(%esp),%eax
-	movl	0(%esp),%edx
-	movl	%edx, 0(%eax)		/* rta */
-	movl	%ebx, 4(%eax)
-	movl	%esp, 8(%eax)
-	movl	%ebp,12(%eax)
-	movl	%esi,16(%eax)
-	movl	%edi,20(%eax)
-	fnstcw	24(%eax)
-	xorl	%eax,%eax
-	ret
-
-	.weak	CNAME(_longjmp)
-	.set	CNAME(_longjmp),CNAME(___longjmp)
-ENTRY(___longjmp)
-	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	fninit
-	fldcw	24(%edx)
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret

src/kernel/libroot/posix/arch/x86/asm.h

@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _MACHINE_ASM_H_
-#define	_MACHINE_ASM_H_
-
-#ifdef PIC
-#define	PIC_PROLOGUE	\
-	pushl	%ebx;	\
-	call	1f;	\
-1:			\
-	popl	%ebx;	\
-	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b],%ebx
-#define	PIC_EPILOGUE	\
-	popl	%ebx
-#define	PIC_PLT(x)	x@PLT
-#define	PIC_GOT(x)	x@GOT(%ebx)
-#else
-#define	PIC_PROLOGUE
-#define	PIC_EPILOGUE
-#define	PIC_PLT(x)	x
-#define	PIC_GOT(x)	x
-#endif
-
-/*
- * CNAME and HIDENAME manage the relationship between symbol names in C
- * and the equivalent assembly language names.  CNAME is given a name as
- * it would be used in a C program.  It expands to the equivalent assembly
- * language name.  HIDENAME is given an assembly-language name, and expands
- * to a possibly-modified form that will be invisible to C programs.
- */
-#define CNAME(csym)		csym
-#define HIDENAME(asmsym)	__CONCAT(.,asmsym)
-
-/* XXX should use .p2align 4,0x90 for -m486. */
-#define _START_ENTRY	.text; .p2align 2,0x90
-
-#define _ENTRY(x)	_START_ENTRY; \
-			.globl CNAME(x); .type CNAME(x),@function; CNAME(x):
-
-#ifdef PROF
-#define	ALTENTRY(x)	_ENTRY(x); \
-			pushl %ebp; movl %esp,%ebp; \
-			call PIC_PLT(HIDENAME(mcount)); \
-			popl %ebp; \
-			jmp 9f
-#define	ENTRY(x)	_ENTRY(x); \
-			pushl %ebp; movl %esp,%ebp; \
-			call PIC_PLT(HIDENAME(mcount)); \
-			popl %ebp; \
-			9:
-#else
-#define	ALTENTRY(x)	_ENTRY(x)
-#define	ENTRY(x)	_ENTRY(x)
-#endif
-
-#define RCSID(x)	.text; .asciz x
-
-#undef __FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
-#define __FBSDID(s)	.ident s
-#else
-#define __FBSDID(s)	/* nothing */
-#endif /* not lint and not STRIP_FBSDID */
-
-#ifdef _ARCH_INDIRECT
-/*
- * Generate code to select between the generic functions and _ARCH_INDIRECT
- * specific ones.
- * XXX nested __CONCATs don't work with non-ANSI cpp's.
- */
-#define	ANAME(x)	CNAME(__CONCAT(__CONCAT(__,_ARCH_INDIRECT),x))
-#define	ASELNAME(x)	CNAME(__CONCAT(__arch_select_,x))
-#define	AVECNAME(x)	CNAME(__CONCAT(__arch_,x))
-#define	GNAME(x)	CNAME(__CONCAT(__generic_,x))
-
-/* Don't bother profiling this. */
-#ifdef PIC
-#define	ARCH_DISPATCH(x) \
-			_START_ENTRY; \
-			.globl CNAME(x); .type CNAME(x),@function; CNAME(x): ; \
-			PIC_PROLOGUE; \
-			movl PIC_GOT(AVECNAME(x)),%eax; \
-			PIC_EPILOGUE; \
-			jmpl *(%eax)
-
-#define	ARCH_SELECT(x)	_START_ENTRY; \
-			.type ASELNAME(x),@function; \
-			ASELNAME(x): \
-			PIC_PROLOGUE; \
-			call PIC_PLT(CNAME(__get_hw_float)); \
-			testl %eax,%eax; \
-			movl PIC_GOT(ANAME(x)),%eax; \
-			jne 8f; \
-			movl PIC_GOT(GNAME(x)),%eax; \
-			8: \
-			movl PIC_GOT(AVECNAME(x)),%edx; \
-			movl %eax,(%edx); \
-			PIC_EPILOGUE; \
-			jmpl *%eax
-#else /* !PIC */
-#define	ARCH_DISPATCH(x) \
-			_START_ENTRY; \
-			.globl CNAME(x); .type CNAME(x),@function; CNAME(x): ; \
-			jmpl *AVECNAME(x)
-
-#define	ARCH_SELECT(x)	_START_ENTRY; \
-			.type ASELNAME(x),@function; \
-			ASELNAME(x): \
-			call CNAME(__get_hw_float); \
-			testl %eax,%eax; \
-			movl $ANAME(x),%eax; \
-			jne 8f; \
-			movl $GNAME(x),%eax; \
-			8: \
-			movl %eax,AVECNAME(x); \
-			jmpl *%eax
-#endif /* PIC */
-
-#define	ARCH_VECTOR(x)	.data; .p2align 2; \
-			.globl AVECNAME(x); \
-			.type AVECNAME(x),@object; \
-			.size AVECNAME(x),4; \
-			AVECNAME(x): .long ASELNAME(x)
-
-#undef _ENTRY
-#define	_ENTRY(x)	ARCH_VECTOR(x); ARCH_SELECT(x); ARCH_DISPATCH(x); \
-			_START_ENTRY; \
-			.globl ANAME(x); .type ANAME(x),@function; ANAME(x):
-
-#endif /* _ARCH_INDIRECT */
-
-#endif /* !_MACHINE_ASM_H_ */

src/kernel/libroot/posix/arch/x86/setjmp.S

@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "asm.h"
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	setjmp(a)
- * by restoring registers from the environment 'a'.
- * The previous signal state is restored.
- */
-
-ENTRY(setjmp)
-	movl	4(%esp),%ecx
-	PIC_PROLOGUE
-	leal	28(%ecx), %eax
-	pushl	%eax			/* (sigset_t*)oset */
-	pushl	$0			/* (sigset_t*)set  */
-	pushl	$1			/* SIG_BLOCK       */
-	call	PIC_PLT(CNAME(sigprocmask))
-	addl	$12,%esp
-	PIC_EPILOGUE
-	movl	4(%esp),%ecx
-	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-	fnstcw	24(%ecx)
-	xorl	%eax,%eax
-	ret
-
-	.weak CNAME(longjmp)
-	.set CNAME(longjmp),CNAME(__longjmp)
-ENTRY(__longjmp)
-	movl	4(%esp),%edx
-	PIC_PROLOGUE
-	pushl	$0			/* (sigset_t*)oset */
-	leal	28(%edx), %eax
-	pushl	%eax			/* (sigset_t*)set  */
-	pushl	$3			/* SIG_SETMASK     */
-	call	PIC_PLT(CNAME(sigprocmask))
-	addl	$12,%esp
-	PIC_EPILOGUE
-	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	fninit
-	fldcw	24(%edx)
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret

src/kernel/libroot/posix/arch/x86/setjmp.c

@@ -0,0 +1,16 @@
+/* 
+** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
+** Distributed under the terms of the Haiku License.
+*/
+
+
+#include <setjmp.h>
+
+
+int
+setjmp(jmp_buf buffer)
+{
+	return sigsetjmp(buffer, 0);
+}
+
+#pragma weak _setjmp = setjmp

src/kernel/libroot/posix/arch/x86/setjmp_internal.h

@@ -0,0 +1,19 @@
+/* 
+** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
+** Distributed under the terms of the Haiku License.
+*/
+#ifndef SETJMP_INTERNAL_H
+#define SETJMP_INTERNAL_H
+
+/* These are the fields of the __jmp_regs structure */
+
+#define JMP_REGS_EBX	0
+#define JMP_REGS_ESI	4
+#define JMP_REGS_EDI	8
+#define JMP_REGS_EBP	12
+#define JMP_REGS_ESP	16
+#define JMP_REGS_PC		20
+
+#define FUNCTION(x) .global x; .type x,@function; x
+
+#endif	/* SETJMP_INTERNAL_H */

src/kernel/libroot/posix/arch/x86/setjmp_save_sigs.c

@@ -0,0 +1,21 @@
+/* 
+** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
+** Distributed under the terms of the Haiku License.
+*/
+
+
+#include <setjmp.h>
+
+
+/** This function is called by __sigsetjmp() only */
+
+int __setjmp_save_sigs(jmp_buf buffer, int saveMask);
+
+int
+__setjmp_save_sigs(jmp_buf buffer, int saveMask)
+{
+	buffer[0].mask_was_saved = saveMask && sigprocmask(SIG_BLOCK, NULL, &buffer[0].saved_mask) == 0;
+		// only set __mask_was_saved if sigprocmask() was successful
+
+	return 0;
+}

src/kernel/libroot/posix/arch/x86/siglongjmp.S

@@ -0,0 +1,33 @@
+/* 
+** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+** Distributed under the terms of the Haiku License.
+*/
+
+
+#include "setjmp_internal.h"
+
+
+/**	This is a BeOS compatible siglongjmp() implementation;
+ *	longjmp() and _longjmp() are both calling this function.
+ */
+
+
+/* int __siglongjmp(jmp_buf buffer, int value) */
+FUNCTION(siglongjmp):
+FUNCTION(longjmp):
+FUNCTION(_longjmp):
+	mov		4(%esp,1), %ecx
+	mov		8(%esp,1), %eax
+
+	// restore registers
+	mov		JMP_REGS_EBX(%ecx), %ebx
+	mov		JMP_REGS_ESI(%ecx), %esi
+	mov		JMP_REGS_EDI(%ecx), %edi
+	mov		JMP_REGS_EBP(%ecx), %ebp
+	mov		JMP_REGS_ESP(%ecx), %esp
+
+	// jump back to the old program location
+	mov		JMP_REGS_PC(%ecx), %edx
+	jmp		*%edx
+
+#pragma weak longjmp=siglongjmp

src/kernel/libroot/posix/arch/x86/sigsetjmp.S

@@ -1,105 +1,35 @@
-/*
+/* 
- * Copyright (c) 1990 The Regents of the University of California.
+** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
- * All rights reserved.
+** Distributed under the terms of the Haiku License.
+*/
+
+
+#include "setjmp_internal.h"
+
+
+/**	This is a BeOS compatible __sigsetjmp() implementation; there,
+ *	setjmp() and sigsetjmp() are both macros to this function.
  *
- * This code is derived from software contributed to Berkeley by
+ *	It first saves the register/stack environment of the running thread,
- * William Jolitz.
+ *	and then calls __setjmp_save_sigs() which will save the signal state
- *
+ *	if it was asked to do this.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
  */
 
-#include "asm.h"
 
-/* TODO:
+/* int sigsetjmp(jmp_buf buffer, int saveMask) */
- *	Rename sigsetjmp to __sigsetjmp and siglongjmp to __siglongjmp,
+FUNCTION(__sigsetjmp):
- *	remove the other *jmp functions and define everything in terms
+FUNCTION(sigsetjmp):
- *	of the renamed functions.  This requires compiler support for
+	mov		4(%esp), %eax
- *	the renamed functions (introduced in gcc-2.5.3; previous versions
- *	only supported *jmp with 0 or 1 leading underscores).
- *
- *	Restore _all_ the registers and the signal mask atomically.  Can
- *	use sigreturn() if sigreturn() works.
- */
 
-ENTRY(__sigsetjmp)
+	// fill __jmp_buf structure with current registers (%ecx can be clobbered)
-//ENTRY(sigsetjmp)
+	mov		%ebx, JMP_REGS_EBX(%eax)
-	movl	8(%esp),%eax
+	mov		%esi, JMP_REGS_ESI(%eax)
-	movl	4(%esp),%ecx
+	mov		%edi, JMP_REGS_EDI(%eax)
-	movl	%eax,44(%ecx)
-	testl	%eax,%eax
-	jz	2f
-	PIC_PROLOGUE
-	leal	28(%ecx), %eax
-	pushl	%eax			/* (sigset_t*)oset */
-	pushl	$0			/* (sigset_t*)set  */
-	pushl	$1			/* SIG_BLOCK       */
-	call	PIC_PLT(CNAME(sigprocmask))
-	addl	$12,%esp
-	PIC_EPILOGUE
-	movl	4(%esp),%ecx
-2:	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-	fnstcw	24(%ecx)
-	xorl	%eax,%eax
-	ret
 
-	.weak CNAME(siglongjmp);
+	// save stack and return address (because that's where we intend to jump to)
-	.set CNAME(siglongjmp),CNAME(__siglongjmp);
+	lea		4(%esp,1), %ecx
-ENTRY(__siglongjmp);
+	mov		%ecx, JMP_REGS_ESP(%eax)
-	movl	4(%esp),%edx
+	mov		0(%esp,1), %ecx
-	cmpl	$0,44(%edx)
+	mov		%ecx, JMP_REGS_PC(%eax)
-	jz	2f
+
-	PIC_PROLOGUE
+	jmp		__setjmp_save_sigs
-	pushl	$0			/* (sigset_t*)oset */
-	leal	28(%edx), %eax
-	pushl	%eax			/* (sigset_t*)set  */
-	pushl	$3			/* SIG_SETMASK     */
-	call	PIC_PLT(CNAME(sigprocmask))
-	addl	$12,%esp
-	PIC_EPILOGUE
-	movl	4(%esp),%edx
-2:	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	fninit
-	fldcw	24(%edx)
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret