This is the mail archive of the libc-hacker@sourceware.org mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
> All archs should get a definition of the TEST macro in the ucontext_i.h > files. Look at the x86-64 and i386 examples. Arch maintainers, please > send appropriate patches. The attached patch is to add ucontext_i.h with TEST macro for SH and the definition of MREMAP_FIXED. I've found also that sh/sys/ucontext.h handles only sh4 case and the definition of mcontext_t doesn't match with the real context. I remove it and add sh/sh3/sys/ucontext.h and sh/sh4/sys/ucontext.h instead. Regards, kaz -- 2005-10-15 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/bits/mman.h: Define MREMAP_FIXED. * sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.h: New file. * sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.h: Likewise. * sysdeps/unix/sysv/linux/sh/sys/ucontext.h: Removed. * sysdeps/unix/sysv/linux/sh/sh3/sys/ucontext.h: New file. * sysdeps/unix/sysv/linux/sh/sh4/sys/ucontext.h: Likewise. diff -uprN ORIG/libc/sysdeps/unix/sysv/linux/sh/bits/mman.h LOCAL/libc/sysdeps/unix/sysv/linux/sh/bits/mman.h --- ORIG/libc/sysdeps/unix/sysv/linux/sh/bits/mman.h 2005-03-14 10:01:37.000000000 +0900 +++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/bits/mman.h 2005-10-15 12:12:03.000000000 +0900 @@ -78,6 +78,7 @@ /* Flags for `mremap'. */ #ifdef __USE_GNU # define MREMAP_MAYMOVE 1 +# define MREMAP_FIXED 2 #endif /* Advice to `madvise'. */ diff -uprN ORIG/libc/sysdeps/unix/sysv/linux/sh/sh3/sys/ucontext.h LOCAL/libc/sysdeps/unix/sysv/linux/sh/sh3/sys/ucontext.h --- ORIG/libc/sysdeps/unix/sysv/linux/sh/sh3/sys/ucontext.h 1970-01-01 09:00:00.000000000 +0900 +++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/sh3/sys/ucontext.h 2005-10-15 12:54:14.000000000 +0900 @@ -0,0 +1,102 @@ +/* Copyright (C) 1999, 2000, 2001, 2005 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* Where is System V/SH ABI? */ + +#ifndef _SYS_UCONTEXT_H +#define _SYS_UCONTEXT_H 1 + +#include <features.h> +#include <signal.h> + +/* We need the signal context definitions even if they are not used + included in <signal.h>. */ +#include <bits/sigcontext.h> + + +typedef int greg_t; + +/* Number of general registers. */ +#define NFPREG 16 + +/* Container for all general registers. */ +typedef greg_t gregset_t[NFPREG]; + +#ifdef __USE_GNU +/* Number of each register is the `gregset_t' array. */ +enum +{ + R0 = 0, +#define R0 R0 + R1 = 1, +#define R1 R1 + R2 = 2, +#define R2 R2 + R3 = 3, +#define R3 R3 + R4 = 4, +#define R4 R4 + R5 = 5, +#define R5 R5 + R6 = 6, +#define R6 R6 + R7 = 7, +#define R7 R7 + R8 = 8, +#define R8 R8 + R9 = 9, +#define R9 R9 + R10 = 10, +#define R10 R10 + R11 = 11, +#define R11 R11 + R12 = 12, +#define R12 R12 + R13 = 13, +#define R13 R13 + R14 = 14, +#define R14 R14 + R15 = 15, +#define R15 R15 +}; +#endif + +/* Context to describe whole processor state. */ +typedef struct + { + unsigned int oldmask; + gregset_t gregs; + unsigned int pc; + unsigned int pr; + unsigned int sr; + unsigned int gbr; + unsigned int mach; + unsigned int macl; + } mcontext_t; + +/* Userlevel context. */ +typedef struct ucontext + { + unsigned long int uc_flags; + struct ucontext *uc_link; + stack_t uc_stack; + mcontext_t uc_mcontext; + __sigset_t uc_sigmask; + } ucontext_t; + +#endif /* sys/ucontext.h */ diff -uprN ORIG/libc/sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.h LOCAL/libc/sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.h --- ORIG/libc/sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.h 1970-01-01 09:00:00.000000000 +0900 +++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.h 2005-10-15 12:59:12.000000000 +0900 @@ -0,0 +1,79 @@ +/* Offsets and other constants needed in the *context() function + implementation. + Copyright (C) 2005 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#define SIG_BLOCK 0 +#define SIG_SETMASK 2 + +/* Offsets of the fields in the ucontext_t structure. */ +#define oLINK 4 +#define oSS_SP 8 +#define oSS_SIZE 16 +#define oR0 24 +#define oR1 28 +#define oR2 32 +#define oR3 36 +#define oR4 40 +#define oR5 44 +#define oR6 48 +#define oR7 52 +#define oR8 56 +#define oR9 60 +#define oR10 64 +#define oR11 68 +#define oR12 72 +#define oR13 76 +#define oR14 80 +#define oR15 84 +#define oPC 88 +#define oPR 92 +#define oSR 96 +#define oGBR 100 +#define oMACH 104 +#define oMACL 108 +#define oSIGMASK 112 + +/* Tests run in stdlib/tst-ucontext-off. */ +#define TESTS \ + TEST (uc_link, oLINK); \ + TEST (uc_stack.ss_sp, oSS_SP); \ + TEST (uc_stack.ss_size, oSS_SIZE); \ + TEST (uc_mcontext.gregs[R0], oR0); \ + TEST (uc_mcontext.gregs[R1], oR1); \ + TEST (uc_mcontext.gregs[R2], oR2); \ + TEST (uc_mcontext.gregs[R3], oR3); \ + TEST (uc_mcontext.gregs[R4], oR4); \ + TEST (uc_mcontext.gregs[R5], oR5); \ + TEST (uc_mcontext.gregs[R6], oR6); \ + TEST (uc_mcontext.gregs[R7], oR7); \ + TEST (uc_mcontext.gregs[R8], oR8); \ + TEST (uc_mcontext.gregs[R9], oR9); \ + TEST (uc_mcontext.gregs[R10], oR10); \ + TEST (uc_mcontext.gregs[R11], oR11); \ + TEST (uc_mcontext.gregs[R12], oR12); \ + TEST (uc_mcontext.gregs[R13], oR13); \ + TEST (uc_mcontext.gregs[R14], oR14); \ + TEST (uc_mcontext.gregs[R15], oR15); \ + TEST (uc_mcontext.pc, oPC); \ + TEST (uc_mcontext.pr, oPR); \ + TEST (uc_mcontext.sr, oSR); \ + TEST (uc_mcontext.gbr, oGBR); \ + TEST (uc_mcontext.mach, oMACH); \ + TEST (uc_mcontext.macl, oMACL); \ + TEST (uc_sigmask, oSIGMASK); diff -uprN ORIG/libc/sysdeps/unix/sysv/linux/sh/sh4/sys/ucontext.h LOCAL/libc/sysdeps/unix/sysv/linux/sh/sh4/sys/ucontext.h --- ORIG/libc/sysdeps/unix/sysv/linux/sh/sh4/sys/ucontext.h 1970-01-01 09:00:00.000000000 +0900 +++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/sh4/sys/ucontext.h 2005-10-15 13:23:11.000000000 +0900 @@ -0,0 +1,115 @@ +/* Copyright (C) 1999, 2000, 2001, 2005 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* Where is System V/SH ABI? */ + +#ifndef _SYS_UCONTEXT_H +#define _SYS_UCONTEXT_H 1 + +#include <features.h> +#include <signal.h> + +/* We need the signal context definitions even if they are not used + included in <signal.h>. */ +#include <bits/sigcontext.h> + + +typedef int greg_t; + +/* Number of general registers. */ +#define NFPREG 16 + +/* Container for all general registers. */ +typedef greg_t gregset_t[NFPREG]; + +#ifdef __USE_GNU +/* Number of each register is the `gregset_t' array. */ +enum +{ + R0 = 0, +#define R0 R0 + R1 = 1, +#define R1 R1 + R2 = 2, +#define R2 R2 + R3 = 3, +#define R3 R3 + R4 = 4, +#define R4 R4 + R5 = 5, +#define R5 R5 + R6 = 6, +#define R6 R6 + R7 = 7, +#define R7 R7 + R8 = 8, +#define R8 R8 + R9 = 9, +#define R9 R9 + R10 = 10, +#define R10 R10 + R11 = 11, +#define R11 R11 + R12 = 12, +#define R12 R12 + R13 = 13, +#define R13 R13 + R14 = 14, +#define R14 R14 + R15 = 15, +#define R15 R15 +}; +#endif + +typedef int freg_t; + +/* Number of FPU registers. */ +#define NFPREG 16 + +/* Structure to describe FPU registers. */ +typedef freg_t fpregset_t[NFPREG]; + +/* Context to describe whole processor state. */ +typedef struct + { + unsigned int oldmask; + gregset_t gregs; + unsigned int pc; + unsigned int pr; + unsigned int sr; + unsigned int gbr; + unsigned int mach; + unsigned int macl; + fpregset_t fpregs; + fpregset_t xfpregs; + unsigned int fpscr; + unsigned int fpul; + unsigned int ownedfp; + } mcontext_t; + +/* Userlevel context. */ +typedef struct ucontext + { + unsigned long int uc_flags; + struct ucontext *uc_link; + stack_t uc_stack; + mcontext_t uc_mcontext; + __sigset_t uc_sigmask; + } ucontext_t; + +#endif /* sys/ucontext.h */ diff -uprN ORIG/libc/sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.h LOCAL/libc/sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.h --- ORIG/libc/sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.h 1970-01-01 09:00:00.000000000 +0900 +++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.h 2005-10-15 13:21:45.000000000 +0900 @@ -0,0 +1,149 @@ +/* Offsets and other constants needed in the *context() function + implementation. + Copyright (C) 2005 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#define SIG_BLOCK 0 +#define SIG_SETMASK 2 + +/* Offsets of the fields in the ucontext_t structure. */ +#define oLINK 4 +#define oSS_SP 8 +#define oSS_SIZE 16 +#define oR0 24 +#define oR1 28 +#define oR2 32 +#define oR3 36 +#define oR4 40 +#define oR5 44 +#define oR6 48 +#define oR7 52 +#define oR8 56 +#define oR9 60 +#define oR10 64 +#define oR11 68 +#define oR12 72 +#define oR13 76 +#define oR14 80 +#define oR15 84 +#define oPC 88 +#define oPR 92 +#define oSR 96 +#define oGBR 100 +#define oMACH 104 +#define oMACL 108 +#define oFR0 112 +#define oFR1 116 +#define oFR2 120 +#define oFR3 124 +#define oFR4 128 +#define oFR5 132 +#define oFR6 136 +#define oFR7 140 +#define oFR8 144 +#define oFR9 148 +#define oFR10 152 +#define oFR11 156 +#define oFR12 160 +#define oFR13 164 +#define oFR14 168 +#define oFR15 172 +#define oXFR0 176 +#define oXFR1 180 +#define oXFR2 184 +#define oXFR3 188 +#define oXFR4 192 +#define oXFR5 196 +#define oXFR6 200 +#define oXFR7 204 +#define oXFR8 208 +#define oXFR9 212 +#define oXFR10 216 +#define oXFR11 220 +#define oXFR12 224 +#define oXFR13 228 +#define oXFR14 232 +#define oXFR15 236 +#define oFPSCR 240 +#define oFPUL 244 +#define oOWNEDFP 248 +#define oSIGMASK 252 + +/* Tests run in stdlib/tst-ucontext-off. */ +#define TESTS \ + TEST (uc_link, oLINK); \ + TEST (uc_stack.ss_sp, oSS_SP); \ + TEST (uc_stack.ss_size, oSS_SIZE); \ + TEST (uc_mcontext.gregs[R0], oR0); \ + TEST (uc_mcontext.gregs[R1], oR1); \ + TEST (uc_mcontext.gregs[R2], oR2); \ + TEST (uc_mcontext.gregs[R3], oR3); \ + TEST (uc_mcontext.gregs[R4], oR4); \ + TEST (uc_mcontext.gregs[R5], oR5); \ + TEST (uc_mcontext.gregs[R6], oR6); \ + TEST (uc_mcontext.gregs[R7], oR7); \ + TEST (uc_mcontext.gregs[R8], oR8); \ + TEST (uc_mcontext.gregs[R9], oR9); \ + TEST (uc_mcontext.gregs[R10], oR10); \ + TEST (uc_mcontext.gregs[R11], oR11); \ + TEST (uc_mcontext.gregs[R12], oR12); \ + TEST (uc_mcontext.gregs[R13], oR13); \ + TEST (uc_mcontext.gregs[R14], oR14); \ + TEST (uc_mcontext.gregs[R15], oR15); \ + TEST (uc_mcontext.pc, oPC); \ + TEST (uc_mcontext.pr, oPR); \ + TEST (uc_mcontext.sr, oSR); \ + TEST (uc_mcontext.gbr, oGBR); \ + TEST (uc_mcontext.mach, oMACH); \ + TEST (uc_mcontext.macl, oMACL); \ + TEST (uc_mcontext.fpregs[0], oFR0); \ + TEST (uc_mcontext.fpregs[1], oFR1); \ + TEST (uc_mcontext.fpregs[2], oFR2); \ + TEST (uc_mcontext.fpregs[3], oFR3); \ + TEST (uc_mcontext.fpregs[4], oFR4); \ + TEST (uc_mcontext.fpregs[5], oFR5); \ + TEST (uc_mcontext.fpregs[6], oFR6); \ + TEST (uc_mcontext.fpregs[7], oFR7); \ + TEST (uc_mcontext.fpregs[8], oFR8); \ + TEST (uc_mcontext.fpregs[9], oFR9); \ + TEST (uc_mcontext.fpregs[10], oFR10); \ + TEST (uc_mcontext.fpregs[11], oFR11); \ + TEST (uc_mcontext.fpregs[12], oFR12); \ + TEST (uc_mcontext.fpregs[13], oFR13); \ + TEST (uc_mcontext.fpregs[14], oFR14); \ + TEST (uc_mcontext.fpregs[15], oFR15); \ + TEST (uc_mcontext.xfpregs[0], oXFR0); \ + TEST (uc_mcontext.xfpregs[1], oXFR1); \ + TEST (uc_mcontext.xfpregs[2], oXFR2); \ + TEST (uc_mcontext.xfpregs[3], oXFR3); \ + TEST (uc_mcontext.xfpregs[4], oXFR4); \ + TEST (uc_mcontext.xfpregs[5], oXFR5); \ + TEST (uc_mcontext.xfpregs[6], oXFR6); \ + TEST (uc_mcontext.xfpregs[7], oXFR7); \ + TEST (uc_mcontext.xfpregs[8], oXFR8); \ + TEST (uc_mcontext.xfpregs[9], oXFR9); \ + TEST (uc_mcontext.xfpregs[10], oXFR10); \ + TEST (uc_mcontext.xfpregs[11], oXFR11); \ + TEST (uc_mcontext.xfpregs[12], oXFR12); \ + TEST (uc_mcontext.xfpregs[13], oXFR13); \ + TEST (uc_mcontext.xfpregs[14], oXFR14); \ + TEST (uc_mcontext.xfpregs[15], oXFR15); \ + TEST (uc_mcontext.fpscr, oFPSCR); \ + TEST (uc_mcontext.fpul, oFPUL); \ + TEST (uc_mcontext.ownedfp, oOWNEDFP); \ + TEST (uc_sigmask, oSIGMASK); diff -uprN ORIG/libc/sysdeps/unix/sysv/linux/sh/sys/ucontext.h LOCAL/libc/sysdeps/unix/sysv/linux/sh/sys/ucontext.h --- ORIG/libc/sysdeps/unix/sysv/linux/sh/sys/ucontext.h 2001-07-06 13:56:20.000000000 +0900 +++ LOCAL/libc/sysdeps/unix/sysv/linux/sh/sys/ucontext.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,109 +0,0 @@ -/* Copyright (C) 1999, 2000, 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -/* Where is System V/SH ABI? */ - -#ifndef _SYS_UCONTEXT_H -#define _SYS_UCONTEXT_H 1 - -#include <features.h> -#include <signal.h> - -/* We need the signal context definitions even if they are not used - included in <signal.h>. */ -#include <bits/sigcontext.h> - - -typedef int greg_t; - -/* Number of general registers. */ -#define NFPREG 16 - -/* Container for all general registers. */ -typedef greg_t gregset_t[NFPREG]; - -#ifdef __USE_GNU -/* Number of each register is the `gregset_t' array. */ -enum -{ - R0 = 0, -#define R0 R0 - R1 = 1, -#define R1 R1 - R2 = 2, -#define R2 R2 - R3 = 3, -#define R3 R3 - R4 = 4, -#define R4 R4 - R5 = 5, -#define R5 R5 - R6 = 6, -#define R6 R6 - R7 = 7, -#define R7 R7 - R8 = 8, -#define R8 R8 - R9 = 9, -#define R9 R9 - R10 = 10, -#define R10 R10 - R11 = 11, -#define R11 R11 - R12 = 12, -#define R12 R12 - R13 = 13, -#define R13 R13 - R14 = 14, -#define R14 R14 - R15 = 15, -#define R15 R15 -}; -#endif - -typedef int freg_t; - -/* Number of FPU registers. */ -#define NFPREG 16 - -/* Structure to describe FPU registers. */ -typedef freg_t fpregset_t[NFPREG]; - -/* Context to describe whole processor state. */ -typedef struct - { - gregset_t gregs; - fpregset_t fpregs; - fpregset_t xfpregs; - unsigned int fpscr; - unsigned int fpul; - unsigned int macl; - unsigned int mach; - } mcontext_t; - -/* Userlevel context. */ -typedef struct ucontext - { - unsigned long int uc_flags; - struct ucontext *uc_link; - stack_t uc_stack; - mcontext_t uc_mcontext; - __sigset_t uc_sigmask; - } ucontext_t; - -#endif /* sys/ucontext.h */
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |