diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/sparc')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/profil-counter.h (renamed from sysdeps/unix/sysv/linux/sparc/sparc64/profil-counter.h) | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h | 28 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h | 36 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h | 40 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h | 42 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/sigcontextinfo.h | 42 |
6 files changed, 140 insertions, 62 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/profil-counter.h b/sysdeps/unix/sysv/linux/sparc/profil-counter.h index 47f8bf9..ad06a4f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/profil-counter.h +++ b/sysdeps/unix/sysv/linux/sparc/profil-counter.h @@ -18,11 +18,17 @@ #include <signal.h> +#include <sysdeps/unix/sysv/linux/profil-counter.h> + +#ifndef __profil_counter void -__profil_counter (int signo, struct sigcontext *si) +__profil_counter_global (int signo, struct sigcontext *si) { - profil_count ((void *) si->sigc_regs.tpc); +#ifdef __arch64__ + profil_count (si->sigc_regs.tpc); +#else + profil_count (si->si_regs.pc); +#endif } -#ifndef __profil_counter -weak_alias (__profil_counter, profil_counter) +weak_alias (__profil_counter_global, profil_counter) #endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h b/sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h deleted file mode 100644 index 22abf93..0000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Low-level statistical profiling support function. Linux/SPARC version. - Copyright (C) 1997-2019 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/>. */ - -#include <signal.h> - -void -__profil_counter (int signo, struct sigcontext *si) -{ - profil_count ((void *) si->si_regs.pc); -} -#ifndef __profil_counter -weak_alias (__profil_counter, profil_counter) -#endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h b/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h index 209a6c9..ab30e8b 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h @@ -84,16 +84,23 @@ struct __siginfo_sparc64_fpu unsigned int si_fprs; }; +/* Unlike other architectures, sparc32 passes pt_regs32 REGS pointer as + the third argument to a sa_sigaction handler with SA_SIGINFO enabled. */ static void -register_dump (int fd, SIGCONTEXT ctx) +register_dump (int fd, void *ctx) { char regs[36][8]; char fregs[68][8]; struct iovec iov[150]; size_t nr = 0; int i; - unsigned int *r = (unsigned int *) - ctx->si_regs.u_regs[14]; + struct pt_regs32 *ptregs = (struct pt_regs32 *) ctx; + struct compat_sigset_t + { + unsigned int sig[2]; + }; + struct compat_sigset_t *mask = (struct compat_sigset_t *)(ptregs + 1); + unsigned int *r = (unsigned int *) ptregs->u_regs[14]; #define ADD_STRING(str) \ iov[nr].iov_base = (char *) str; \ @@ -105,15 +112,16 @@ register_dump (int fd, SIGCONTEXT ctx) ++nr /* Generate strings of register contents. */ - hexvalue (ctx->si_regs.psr, regs[0], 8); - hexvalue (ctx->si_regs.pc, regs[1], 8); - hexvalue (ctx->si_regs.npc, regs[2], 8); - hexvalue (ctx->si_regs.y, regs[3], 8); + hexvalue (ptregs->psr, regs[0], 8); + hexvalue (ptregs->pc, regs[1], 8); + hexvalue (ptregs->npc, regs[2], 8); + hexvalue (ptregs->y, regs[3], 8); for (i = 1; i <= 15; i++) - hexvalue (ctx->si_regs.u_regs[i], regs[3+i], 8); + hexvalue (ptregs->u_regs[i], regs[3+i], 8); for (i = 0; i <= 15; i++) hexvalue (r[i], regs[19+i], 8); - hexvalue (ctx->si_mask, regs[35], 8); + + hexvalue (mask->sig[0], regs[35], 8); /* Generate the output. */ ADD_STRING ("Register dump:\n\n PSR: "); @@ -189,11 +197,11 @@ register_dump (int fd, SIGCONTEXT ctx) ADD_STRING ("\n\n Old mask: "); ADD_MEM (regs[35], 8); - if ((ctx->si_regs.psr & 0xff000000) == 0xff000000) + if ((ptregs->psr & 0xff000000) == 0xff000000) { - struct __siginfo_sparc64_fpu *f; + struct __siginfo_sparc64_fpu *f = *(struct __siginfo_sparc64_fpu **) + (mask + 1); - f = *(struct __siginfo_sparc64_fpu **) (ctx + 1); if (f != NULL) { for (i = 0; i < 64; i++) @@ -277,9 +285,9 @@ register_dump (int fd, SIGCONTEXT ctx) } else { - struct __siginfo_sparc32_fpu *f; + struct __siginfo_sparc32_fpu *f = *(struct __siginfo_sparc32_fpu **) + (mask + 1); - f = *(struct __siginfo_sparc32_fpu **) (ctx + 1); if (f != NULL) { for (i = 0; i < 32; i++) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h index 9eec807..f505c25 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h @@ -16,5 +16,41 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#define SIGCONTEXT struct sigcontext * -#define GET_PC(__ctx) ((void *) ((__ctx)->si_regs.pc)) +#ifndef _SIGCONTEXTINFO_H +#define _SIGCONTEXTINFO_H + +/* The sparc32 kernel signal frame for SA_SIGINFO is defined as: + + struct rt_signal_frame32 + { + struct sparc_stackf32 ss; + compat_siginfo_t info; + struct pt_regs32 regs; <- void *ctx + compat_sigset_t mask; + u32 fpu_save; + unsigned int insns[2]; + compat_stack_t stack; + unsigned int extra_size; + siginfo_extra_v8plus_t v8plus; + u32 rwin_save; + } __attribute__((aligned(8))); + + Unlike other architectures, sparc32 passes pt_regs32 REGS pointer as + the third argument to a sa_sigaction handler with SA_SIGINFO enabled. */ + +struct pt_regs32 +{ + unsigned int psr; + unsigned int pc; + unsigned int npc; + unsigned int y; + unsigned int u_regs[16]; +}; + +static inline uintptr_t +sigcontext_get_pc (const struct pt_regs32 *ctx) +{ + return ctx->pc; +} + +#endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h b/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h index 0f1078a..23ff364 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h @@ -60,17 +60,36 @@ hexvalue (unsigned long int value, char *buf, size_t len) *--cp = '0'; } +/* The sparc64 kernel signal frame for SA_SIGINFO is defined as: + + struct rt_signal_frame + { + struct sparc_stackf ss; + siginfo_t info; + struct pt_regs regs; <- void *ctx + __siginfo_fpu_t *fpu_save; + stack_t stack; + sigset_t mask; + __siginfo_rwin_t *rwin_save; + }; + + Unlike other architectures, sparc32 passes pt_regs32 REGS pointers as + the third argument to a sa_sigaction handler with SA_SIGINFO enabled. */ + static void -register_dump (int fd, SIGCONTEXT ctx) +register_dump (int fd, void *ctx) { char regs[36][16]; char fregs[68][8]; struct iovec iov[150]; size_t nr = 0; int i; - unsigned long *r = (unsigned long *) - (ctx->sigc_regs.u_regs[14] + STACK_BIAS); - __siginfo_fpu_t *f; + struct pt_regs *ptregs = (struct pt_regs*) ((siginfo_t *)ctx + 1); + unsigned long *r = (unsigned long *) (ptregs->u_regs[14] + STACK_BIAS); + __siginfo_fpu_t *f = (__siginfo_fpu_t *)(ptregs + 1); + struct kernel_sigset_t { + unsigned long sig[1]; + } *mask = (struct kernel_sigset_t *)((stack_t *)(f + 1) + 1); #define ADD_STRING(str) \ iov[nr].iov_base = (char *) str; \ @@ -82,15 +101,15 @@ register_dump (int fd, SIGCONTEXT ctx) ++nr /* Generate strings of register contents. */ - hexvalue (ctx->sigc_regs.tstate, regs[0], 16); - hexvalue (ctx->sigc_regs.tpc, regs[1], 16); - hexvalue (ctx->sigc_regs.tnpc, regs[2], 16); - hexvalue (ctx->sigc_regs.y, regs[3], 8); + hexvalue (ptregs->tstate, regs[0], 16); + hexvalue (ptregs->tpc, regs[1], 16); + hexvalue (ptregs->tnpc, regs[2], 16); + hexvalue (ptregs->y, regs[3], 8); for (i = 1; i <= 15; i++) - hexvalue (ctx->sigc_regs.u_regs[i], regs[3+i], 16); + hexvalue (ptregs->u_regs[i], regs[3+i], 16); for (i = 0; i <= 15; i++) - hexvalue (r[i], regs[19+i], 16); - hexvalue (ctx->sigc_mask, regs[35], 16); + hexvalue (r[i], regs[19+i], 16); + hexvalue (mask->sig[0], regs[35], 16); /* Generate the output. */ ADD_STRING ("Register dump:\n\n TSTATE: "); @@ -166,7 +185,6 @@ register_dump (int fd, SIGCONTEXT ctx) ADD_STRING ("\n\n Mask: "); ADD_MEM (regs[35], 16); - f = ctx->sigc_fpu_save; if (f != NULL) { for (i = 0; i < 64; i++) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sigcontextinfo.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sigcontextinfo.h index a2f2b1f..242b490 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/sigcontextinfo.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sigcontextinfo.h @@ -16,8 +16,46 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef _SIGCONTEXTINFO_H +#define _SIGCONTEXTINFO_H + +#include <bits/types/siginfo_t.h> + +/* The sparc64 kernel signal frame for SA_SIGINFO is defined as: + + struct rt_signal_frame + { + struct sparc_stackf ss; + siginfo_t info; + struct pt_regs regs; + __siginfo_fpu_t *fpu_save; + stack_t stack; + sigset_t mask; + __siginfo_rwin_t *rwin_save; + }; + + Unlike other architectures, sparc64 passe the siginfo_t INFO pointer + as the third argument to a sa_sigaction handler with SA_SIGINFO enabled. */ + #ifndef STACK_BIAS #define STACK_BIAS 2047 #endif -#define SIGCONTEXT struct sigcontext * -#define GET_PC(__ctx) ((void *) ((__ctx)->sigc_regs.tpc)) + +struct pt_regs +{ + unsigned long int u_regs[16]; + unsigned long int tstate; + unsigned long int tpc; + unsigned long int tnpc; + unsigned int y; + unsigned int magic; +}; + +static inline uintptr_t +sigcontext_get_pc (const siginfo_t *ctx) +{ + struct pt_regs *regs = (struct pt_regs*) ((siginfo_t *)(ctx) + 1); + return regs->tpc; +} + +#endif |