From 5b6e897d01a07f8391351a07321f2bcb7c025a7e Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 22 Feb 2001 05:29:50 +0000 Subject: Patch from Jean-Yves Avenard to add missing siglongjmp entry and fix a bug in setjmp for SH --- libc/sysdeps/linux/sh/Makefile | 4 +-- libc/sysdeps/linux/sh/__longjmp.S | 44 +++++++++++++++++++++++++++++ libc/sysdeps/linux/sh/jmp-unwind.c | 29 +++++++++++++++++++ libc/sysdeps/linux/sh/longjmp.S | 44 ----------------------------- libc/sysdeps/linux/sh/longjmp.c | 58 ++++++++++++++++++++++++++++++++++++++ libc/sysdeps/linux/sh/setjmp.S | 2 +- 6 files changed, 134 insertions(+), 47 deletions(-) create mode 100644 libc/sysdeps/linux/sh/__longjmp.S create mode 100644 libc/sysdeps/linux/sh/jmp-unwind.c delete mode 100644 libc/sysdeps/linux/sh/longjmp.S create mode 100644 libc/sysdeps/linux/sh/longjmp.c (limited to 'libc/sysdeps') diff --git a/libc/sysdeps/linux/sh/Makefile b/libc/sysdeps/linux/sh/Makefile index 684983998..a8a0cbb16 100644 --- a/libc/sysdeps/linux/sh/Makefile +++ b/libc/sysdeps/linux/sh/Makefile @@ -34,10 +34,10 @@ CRT0=crt0.S CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0)) -SSRC=setjmp.S bsd-setjmp.S bsd-_setjmp.S longjmp.S +SSRC=setjmp.S bsd-setjmp.S bsd-_setjmp.S __longjmp.S SOBJS=$(patsubst %.S,%.o, $(SSRC)) -CSRC=fork.c vfork.c _mmap.c +CSRC=fork.c vfork.c _mmap.c longjmp.c jmp-unwind.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(SOBJS) $(MOBJ) $(COBJS) diff --git a/libc/sysdeps/linux/sh/__longjmp.S b/libc/sysdeps/linux/sh/__longjmp.S new file mode 100644 index 000000000..09f829ae3 --- /dev/null +++ b/libc/sysdeps/linux/sh/__longjmp.S @@ -0,0 +1,44 @@ +/* longjmp for SH. + Copyright (C) 1999, 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 + 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 +#define _SETJMP_H +#define _ASM +#include + +/* __longjmp(jmpbuf, val) */ + +ENTRY (__longjmp) + mov.l @r4+, r8 + mov.l @r4+, r9 + mov.l @r4+, r10 + mov.l @r4+, r11 + mov.l @r4+, r12 + mov.l @r4+, r13 + mov.l @r4+, r14 + mov.l @r4+, r15 + mov r5, r0 /* get the return value in place */ + tst r0, r0 + bf.s 1f + lds.l @r4+, pr + mov #1,r0 /* can't let setjmp() return zero! */ +1: + rts + ldc.l @r4+, gbr +END (__longjmp) diff --git a/libc/sysdeps/linux/sh/jmp-unwind.c b/libc/sysdeps/linux/sh/jmp-unwind.c new file mode 100644 index 000000000..083dc74a8 --- /dev/null +++ b/libc/sysdeps/linux/sh/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 + +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/sh/longjmp.S b/libc/sysdeps/linux/sh/longjmp.S deleted file mode 100644 index 8f8832b9a..000000000 --- a/libc/sysdeps/linux/sh/longjmp.S +++ /dev/null @@ -1,44 +0,0 @@ -/* longjmp for SH. - Copyright (C) 1999, 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 - 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 -#define _SETJMP_H -#define _ASM -#include - -/* __longjmp(jmpbuf, val) */ - -ENTRY (longjmp) - mov.l @r4+, r8 - mov.l @r4+, r9 - mov.l @r4+, r10 - mov.l @r4+, r11 - mov.l @r4+, r12 - mov.l @r4+, r13 - mov.l @r4+, r14 - mov.l @r4+, r15 - mov r5, r0 /* get the return value in place */ - tst r0, r0 - bf.s 1f - lds.l @r4+, pr - mov #1,r0 /* can't let setjmp() return zero! */ -1: - rts - ldc.l @r4+, gbr -END (longjmp) diff --git a/libc/sysdeps/linux/sh/longjmp.c b/libc/sysdeps/linux/sh/longjmp.c new file mode 100644 index 000000000..73a8e7504 --- /dev/null +++ b/libc/sysdeps/linux/sh/longjmp.c @@ -0,0 +1,58 @@ +/* Copyright (C) 1991, 92, 94, 95, 97, 98, 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 + 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 +#include +#include + + +/* 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) +{ + /* Perform any cleanups needed by the frames being unwound. */ + _longjmp_unwind (env, val); + + 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); +} + +//strong_alias (__uClibc_siglongjmp, __uClibc_longjmp) + +//_weak_alias (__uClibc_siglongjmp, _longjmp) +asm(".weak _longjmp"); +asm("_longjmp = __uClibc_siglongjmp"); + +//weak_alias (__uClibc_siglongjmp, longjmp) +asm(".weak longjmp"); +asm("longjmp = __uClibc_siglongjmp"); + +//weak_alias (__uClibc_siglongjmp, siglongjmp) +asm(".weak siglongjmp"); +asm("siglongjmp = __uClibc_siglongjmp"); + +asm(".weak __sigprocmask"); +asm("__sigprocmask = sigprocmask"); + diff --git a/libc/sysdeps/linux/sh/setjmp.S b/libc/sysdeps/linux/sh/setjmp.S index 449d936dc..154cef1af 100644 --- a/libc/sysdeps/linux/sh/setjmp.S +++ b/libc/sysdeps/linux/sh/setjmp.S @@ -30,7 +30,7 @@ ENTRY (__sigsetjmp) __sigsetjmp: */ /* Save registers */ - add #(JB_SIZE - 4 * 5), r4 + add #(JB_SIZE), r4 stc.l gbr, @-r4 sts.l pr, @-r4 mov.l r15, @-r4 -- cgit v1.2.3