From c097f7325346ef7f258084fa78263a6f18c10213 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 8 Nov 2000 07:03:52 +0000 Subject: Update. * sysdeps/sh/sh3/setjmp.S (__sigsetjmp): Skip FPU fields. --- sysdeps/sh/bits/setjmp.h | 50 ++++++++++++++++++++++++++++++++++++++++++++ sysdeps/sh/sh3/bits/setjmp.h | 44 -------------------------------------- sysdeps/sh/sh3/setjmp.S | 4 ++-- sysdeps/sh/sh4/bits/setjmp.h | 50 -------------------------------------------- 4 files changed, 52 insertions(+), 96 deletions(-) create mode 100644 sysdeps/sh/bits/setjmp.h delete mode 100644 sysdeps/sh/sh3/bits/setjmp.h delete mode 100644 sysdeps/sh/sh4/bits/setjmp.h (limited to 'sysdeps') diff --git a/sysdeps/sh/bits/setjmp.h b/sysdeps/sh/bits/setjmp.h new file mode 100644 index 0000000000..d5918f2ad0 --- /dev/null +++ b/sysdeps/sh/bits/setjmp.h @@ -0,0 +1,50 @@ +/* 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. */ + +/* Define the machine-dependent type `jmp_buf'. SH version. */ + +#ifndef _SETJMP_H +# error "Never include directly; use instead." +#endif + +#ifndef _ASM +typedef struct + { + /* Callee-saved registers r8 through r15. */ + int __regs[8]; + + /* Program counter. */ + void * __pc; + + /* The global pointer. */ + void * __gbr; + + /* Floating point status register. */ + int __fpscr; + + /* Callee-saved floating point registers fr12 through fr15. */ + int __fpregs[4]; + } __jmp_buf[1]; +#endif + +#define JB_SIZE (4 * 15) + +/* Test if longjmp to JMPBUF would unwind the frame + containing a local variable at ADDRESS. */ +#define _JMPBUF_UNWINDS(jmpbuf, address) \ + ((void *) (address) < &(jmpbuf)[0].__regs[7]) diff --git a/sysdeps/sh/sh3/bits/setjmp.h b/sysdeps/sh/sh3/bits/setjmp.h deleted file mode 100644 index 782704ddd6..0000000000 --- a/sysdeps/sh/sh3/bits/setjmp.h +++ /dev/null @@ -1,44 +0,0 @@ -/* 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. */ - -/* Define the machine-dependent type `jmp_buf'. SH version. */ - -#ifndef _SETJMP_H -# error "Never include directly; use instead." -#endif - -#ifndef _ASM -typedef struct - { - /* Callee-saved registers r8 through r15. */ - int __regs[8]; - - /* Program counter. */ - void * __pc; - - /* The global pointer. */ - void * __gbr; - } __jmp_buf[1]; -#endif - -#define JB_SIZE (4 * 10) - -/* Test if longjmp to JMPBUF would unwind the frame - containing a local variable at ADDRESS. */ -#define _JMPBUF_UNWINDS(jmpbuf, address) \ - ((void *) (address) < &(jmpbuf)[0].__regs[7]) diff --git a/sysdeps/sh/sh3/setjmp.S b/sysdeps/sh/sh3/setjmp.S index ea41f459de..74c7f707ec 100644 --- a/sysdeps/sh/sh3/setjmp.S +++ b/sysdeps/sh/sh3/setjmp.S @@ -1,4 +1,4 @@ -/* setjmp for SH4. +/* setjmp for SH3. Copyright (C) 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -27,7 +27,7 @@ ENTRY (__setjmp) mov #0, r5 ENTRY (__sigsetjmp) /* Save registers */ - add #JB_SIZE, r4 + add #(JB_SIZE - 4 * 5), r4 stc.l gbr, @-r4 sts.l pr, @-r4 mov.l r15, @-r4 diff --git a/sysdeps/sh/sh4/bits/setjmp.h b/sysdeps/sh/sh4/bits/setjmp.h deleted file mode 100644 index d5918f2ad0..0000000000 --- a/sysdeps/sh/sh4/bits/setjmp.h +++ /dev/null @@ -1,50 +0,0 @@ -/* 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. */ - -/* Define the machine-dependent type `jmp_buf'. SH version. */ - -#ifndef _SETJMP_H -# error "Never include directly; use instead." -#endif - -#ifndef _ASM -typedef struct - { - /* Callee-saved registers r8 through r15. */ - int __regs[8]; - - /* Program counter. */ - void * __pc; - - /* The global pointer. */ - void * __gbr; - - /* Floating point status register. */ - int __fpscr; - - /* Callee-saved floating point registers fr12 through fr15. */ - int __fpregs[4]; - } __jmp_buf[1]; -#endif - -#define JB_SIZE (4 * 15) - -/* Test if longjmp to JMPBUF would unwind the frame - containing a local variable at ADDRESS. */ -#define _JMPBUF_UNWINDS(jmpbuf, address) \ - ((void *) (address) < &(jmpbuf)[0].__regs[7]) -- cgit 1.4.1