summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/i386
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2001-03-20 15:32:43 +0000
committerManuel Novoa III <mjn3@codepoet.org>2001-03-20 15:32:43 +0000
commitb49e8dfc28b83d925f7eb9e741656e822a8bd31c (patch)
treec20707f97ebd1b93ffc73de14f470c05a7033d98 /libc/sysdeps/linux/i386
parent5e9139d3ad4edb9e5dcf08c8c5e610aab75364ff (diff)
Fix longjmp on i386. Also adds siglongjmp.
Diffstat (limited to 'libc/sysdeps/linux/i386')
-rw-r--r--libc/sysdeps/linux/i386/Makefile4
-rw-r--r--libc/sysdeps/linux/i386/__longjmp.S40
-rw-r--r--libc/sysdeps/linux/i386/jmp-unwind.c29
-rw-r--r--libc/sysdeps/linux/i386/longjmp.c51
4 files changed, 122 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile
index d54c78d8b..45aa84777 100644
--- a/libc/sysdeps/linux/i386/Makefile
+++ b/libc/sysdeps/linux/i386/Makefile
@@ -28,13 +28,13 @@ ASFLAGS=$(CFLAGS)
CRT0=crt0.S
CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0))
-SSRC=longjmp.S setjmp.S vfork.S #_start.S #clone.S
+SSRC=__longjmp.S setjmp.S vfork.S #_start.S #clone.S
ifeq ($(UNIFIED_SYSCALL),true)
SSRC += __uClibc_syscall.S
endif
SOBJS=$(patsubst %.S,%.o, $(SSRC))
-CSRC=__init_brk.c brk.c sbrk.c
+CSRC=__init_brk.c brk.c sbrk.c longjmp.c #jmp-unwind.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
OBJS=$(SOBJS) $(COBJS)
diff --git a/libc/sysdeps/linux/i386/__longjmp.S b/libc/sysdeps/linux/i386/__longjmp.S
new file mode 100644
index 000000000..484a564c3
--- /dev/null
+++ b/libc/sysdeps/linux/i386/__longjmp.S
@@ -0,0 +1,40 @@
+/* longjmp for i386.
+ Copyright (C) 1995, 1996, 1997, 1998 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#define _ASM
+#define _SETJMP_H
+#include <bits/setjmp.h>
+
+.globl __longjmp;
+.type __longjmp,@function
+.align 4; \
+__longjmp:
+ movl 4(%esp), %ecx /* User's jmp_buf in %ecx. */
+ movl 8(%esp), %eax /* Second argument is return value. */
+ /* Save the return address now. */
+ movl (JB_PC*4)(%ecx), %edx
+ /* Restore registers. */
+ movl (JB_BX*4)(%ecx), %ebx
+ movl (JB_SI*4)(%ecx), %esi
+ movl (JB_DI*4)(%ecx), %edi
+ movl (JB_BP*4)(%ecx), %ebp
+ movl (JB_SP*4)(%ecx), %esp
+ /* Jump to saved PC. */
+ jmp *%edx
+.size __longjmp,.-__longjmp;
diff --git a/libc/sysdeps/linux/i386/jmp-unwind.c b/libc/sysdeps/linux/i386/jmp-unwind.c
new file mode 100644
index 000000000..083dc74a8
--- /dev/null
+++ b/libc/sysdeps/linux/i386/jmp-unwind.c
@@ -0,0 +1,29 @@
+/* _longjmp_unwind -- Clean up stack frames unwound by longjmp. Stub version.
+ Copyright (C) 1995, 1997 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <setjmp.h>
+
+void
+_longjmp_unwind (jmp_buf env, int val)
+{
+
+ /* This function can perform any cleanups necessary to safely unwind the
+ stack frames around the current context which ENV unwinds past. */
+
+}
diff --git a/libc/sysdeps/linux/i386/longjmp.c b/libc/sysdeps/linux/i386/longjmp.c
new file mode 100644
index 000000000..97a37e350
--- /dev/null
+++ b/libc/sysdeps/linux/i386/longjmp.c
@@ -0,0 +1,51 @@
+/* Copyright (C) 1991, 92, 94, 95, 97, 98 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <stddef.h>
+#include <setjmp.h>
+#include <signal.h>
+
+
+extern void _longjmp_unwind (jmp_buf env, int val);
+extern void __longjmp(__jmp_buf __env, int __val)
+ __attribute__ ((__noreturn__));
+
+/* Set the signal mask to the one specified in ENV, and jump
+ to the position specified in ENV, causing the setjmp
+ call there to return VAL, or 1 if VAL is 0. */
+void
+__uClibc_siglongjmp (sigjmp_buf env, int val)
+{
+#if 0
+ /* Perform any cleanups needed by the frames being unwound. */
+ _longjmp_unwind (env, val);
+#endif
+
+ if (env[0].__mask_was_saved)
+ /* Restore the saved signal mask. */
+ (void) __sigprocmask (SIG_SETMASK, &env[0].__saved_mask,
+ (sigset_t *) NULL);
+
+ /* Call the machine-dependent function to restore machine state. */
+ __longjmp (env[0].__jmpbuf, val ?: 1);
+}
+
+__asm__(".weak longjmp; longjmp = __uClibc_siglongjmp");
+__asm__(".weak _longjmp; _longjmp = __uClibc_siglongjmp");
+__asm__(".weak siglongjmp; siglongjmp = __uClibc_siglongjmp");
+__asm__(".weak __sigprocmask; __sigprocmask = sigprocmask");