mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-03 10:21:05 +00:00
139904b7e4
Continuing the fixes for namespace issues in sys/ucontext.h, this patch moves various symbols into the implementation namespace in the absence of __USE_MISC. As with previous changes, it is nonexhaustive, just covering more straightforward cases. Structure fields are generally changed to have a prefix __ in the absence of __USE_MISC, via a macro __ctx (used without a space before the open parenthesis, since the result is a single identifier). Various macros such as NGREG also have leading __ added. No changes are made to structure tags (and thus to C++ name mangling), except that in the (unused) file sysdeps/i386/sys/ucontext.h, structures defined inside other structures as the type for a field have their tags removed in the non-__USE_MISC case (those structure tags would not in any case have been visible in C++, because in C++ the scope of such a tag is limited to the containing structure). No changes are made to the contents of bits/sigcontext.h, or to whether it is included. Because of remaining namespace issues, this patch does not yet fix the bug or allow any XFAILs to be removed. Tested for x86_64 and x86, and with build-many-glibcs.py. [BZ #21457] * sysdeps/arm/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (mcontext_t): Use __ctx in defining fields. * sysdeps/i386/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (__ctxt): Likewise. (fpregset_t): Use __ctx and __ctxt in defining fields. (mcontext_t): Likewise. * sysdeps/m68k/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (mcontext_t): Use __ctx in defining fields. * sysdeps/mips/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (fpregset_t): Use __ctx in defining fields. (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/alpha/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (NFPREG): Rename to __NFPREG and define NFPREG to __NFPREG if [__USE_MISC]. (fpregset_t): Define using __NFPREG. * sysdeps/unix/sysv/linux/m68k/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (fpregset_t): Use __ctx in defining fields. (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/mips/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (NFPREG): Rename to __NFPREG and define NFPREG to __NFPREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (fpregset_t): Use __ctx in defining fields. (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/nios2/sys/ucontext.h (__ctx): New macro. (mcontext_t): Use __ctx in defining fields. * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h (__ctx): New macro. [__WORDSIZE == 32] (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. [__WORDSIZE == 32] (gregset_t): Define using __NGREG. [__WORDSIZE == 32] (fpregset_t): Use __ctx in defining fields. (mcontext_t): Likewise. [__WORDSIZE != 32] (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. [__WORDSIZE != 32] (NFPREG): Rename to __NFPREG and define NFPREG to __NFPREG if [__USE_MISC]. [__WORDSIZE != 32] (NVRREG): Rename to __NVRREG and define NVRREG to __NVRREG if [__USE_MISC]. [__WORDSIZE != 32] (gregset_t): Define using __NGREG. [__WORDSIZE != 32] (fpregset_t): Define using __NFPREG. [__WORDSIZE != 32] (vscr_t): Use __ctx in defining fields. [__WORDSIZE != 32] (vrregset_t): Likewise. [__WORDSIZE != 32] (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/s390/sys/ucontext.h (__ctx): New macro. (__psw_t): Use __ctx in defining fields. (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (fpreg_t): Use __ctx in defining fields. (fpregset_t): Likewise. (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/sh/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (NFPREG): Rename to __NFPREG and define NFPREG to __NFPREG if [__USE_MISC]. (fpregset_t): Define using __NFPREG. (__ctx): New macro. (mcontext_t): Use __ctx in defining fields. * sysdeps/unix/sysv/linux/x86/sys/ucontext.h (__ctx): New macro. [__x86_64__] (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. [__x86_64__] (gregset_t): Define using __NGREG. [__x86_64__] (struct _libc_fpxreg): Use __ctx in defining fields. [__x86_64__] (struct _libc_fpstate): Likewise. [__x86_64__] (mcontext_t): Likewise. [!__x86_64__] (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. [!__x86_64__] (gregset_t): Define using __NGREG. [!__x86_64__] (struct _libc_fpreg): Use __ctx in defining fields. [!__x86_64__] (struct _libc_fpstate): Likewise. [!__x86_64__] (mcontext_t): Likewise.
126 lines
3.3 KiB
C
126 lines
3.3 KiB
C
/* Copyright (C) 1997-2017 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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* Don't rely on this, the interface is currently messed up and may need to
|
|
be broken to be fixed. */
|
|
#ifndef _SYS_UCONTEXT_H
|
|
#define _SYS_UCONTEXT_H 1
|
|
|
|
#include <features.h>
|
|
|
|
#include <bits/types/sigset_t.h>
|
|
#include <bits/sigcontext.h>
|
|
#include <bits/types/stack_t.h>
|
|
|
|
#include <sgidefs.h>
|
|
|
|
|
|
/* Type for general register. Even in o32 we assume 64-bit registers,
|
|
like the kernel. */
|
|
__extension__ typedef unsigned long long int greg_t;
|
|
|
|
/* Number of general registers. */
|
|
#define __NGREG 32
|
|
#define __NFPREG 32
|
|
#ifdef __USE_MISC
|
|
# define NGREG __NGREG
|
|
# define NFPREG __NFPREG
|
|
#endif
|
|
|
|
/* Container for all general registers. */
|
|
typedef greg_t gregset_t[__NGREG];
|
|
|
|
#ifdef __USE_MISC
|
|
# define __ctx(fld) fld
|
|
#else
|
|
# define __ctx(fld) __ ## fld
|
|
#endif
|
|
|
|
/* Container for all FPU registers. */
|
|
typedef struct fpregset {
|
|
union {
|
|
double __ctx(fp_dregs)[__NFPREG];
|
|
struct {
|
|
float _fp_fregs;
|
|
unsigned int _fp_pad;
|
|
} __ctx(fp_fregs)[__NFPREG];
|
|
} __ctx(fp_r);
|
|
} fpregset_t;
|
|
|
|
|
|
/* Context to describe whole processor state. */
|
|
#if _MIPS_SIM == _ABIO32
|
|
/* Earlier versions of glibc for mips had an entirely different
|
|
definition of mcontext_t, that didn't even resemble the
|
|
corresponding kernel data structure. Fortunately, makecontext,
|
|
[gs]etcontext et all were not implemented back then, so this can
|
|
still be rectified. */
|
|
typedef struct
|
|
{
|
|
unsigned int __ctx(regmask);
|
|
unsigned int __ctx(status);
|
|
greg_t __ctx(pc);
|
|
gregset_t __ctx(gregs);
|
|
fpregset_t __ctx(fpregs);
|
|
unsigned int __ctx(fp_owned);
|
|
unsigned int __ctx(fpc_csr);
|
|
unsigned int __ctx(fpc_eir);
|
|
unsigned int __ctx(used_math);
|
|
unsigned int __ctx(dsp);
|
|
greg_t __ctx(mdhi);
|
|
greg_t __ctx(mdlo);
|
|
unsigned long __ctx(hi1);
|
|
unsigned long __ctx(lo1);
|
|
unsigned long __ctx(hi2);
|
|
unsigned long __ctx(lo2);
|
|
unsigned long __ctx(hi3);
|
|
unsigned long __ctx(lo3);
|
|
} mcontext_t;
|
|
#else
|
|
typedef struct
|
|
{
|
|
gregset_t __ctx(gregs);
|
|
fpregset_t __ctx(fpregs);
|
|
greg_t __ctx(mdhi);
|
|
greg_t __ctx(hi1);
|
|
greg_t __ctx(hi2);
|
|
greg_t __ctx(hi3);
|
|
greg_t __ctx(mdlo);
|
|
greg_t __ctx(lo1);
|
|
greg_t __ctx(lo2);
|
|
greg_t __ctx(lo3);
|
|
greg_t __ctx(pc);
|
|
unsigned int __ctx(fpc_csr);
|
|
unsigned int __ctx(used_math);
|
|
unsigned int __ctx(dsp);
|
|
unsigned int __glibc_reserved1;
|
|
} mcontext_t;
|
|
#endif
|
|
|
|
#undef __ctx
|
|
|
|
/* 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 */
|