From 9c316a45840a4277b22d34cbe6d1e221a0d5a00d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 17 Sep 2006 16:06:42 +0000 Subject: [PATCH] * sysdeps/unix/sysv/linux/sys/ptrace.h [PTRACE_SETOPTIONS, PTRACE_GETEVENTMSG, PTRACE_GETSIGINFO, PTRACE_SETSIGINFO]: Define. * sysdeps/unix/sysv/linux/ptrace.c [PTRACE_SETOPTIONS, PTRACE_GETEVENTMSG, PTRACE_GETSIGINFO, PTRACE_SETSIGINFO]: Check. 2006-09-16 Jakub Jelinek * sysdeps/powerpc/powerpc32/register-dump.h (register_dump): Don't write '\0' to the fd. * sysdeps/mach/hurd/powerpc/register-dump.h (register_dump): Likewise. * sysdeps/powerpc/powerpc64/register-dump.h (register_dump): Likewise. Change regs to unsigned long pointer from unsigned int, fix fscr offset. --- ChangeLog | 16 ++++++++++++++++ sysdeps/mach/hurd/powerpc/register-dump.h | 4 ++-- sysdeps/powerpc/powerpc32/register-dump.h | 4 ++-- sysdeps/powerpc/powerpc64/register-dump.h | 8 ++++---- sysdeps/unix/sysv/linux/ptrace.c | 16 +++++++++++++++- sysdeps/unix/sysv/linux/sys/ptrace.h | 20 ++++++++++++++++++-- 6 files changed, 57 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbf739f791..8dbce81784 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2006-09-17 Mike Frysinger + + * sysdeps/unix/sysv/linux/sys/ptrace.h [PTRACE_SETOPTIONS, + PTRACE_GETEVENTMSG, PTRACE_GETSIGINFO, PTRACE_SETSIGINFO]: Define. + * sysdeps/unix/sysv/linux/ptrace.c [PTRACE_SETOPTIONS, + PTRACE_GETEVENTMSG, PTRACE_GETSIGINFO, PTRACE_SETSIGINFO]: Check. + +2006-09-16 Jakub Jelinek + + * sysdeps/powerpc/powerpc32/register-dump.h (register_dump): Don't + write '\0' to the fd. + * sysdeps/mach/hurd/powerpc/register-dump.h (register_dump): Likewise. + * sysdeps/powerpc/powerpc64/register-dump.h (register_dump): Likewise. + Change regs to unsigned long pointer from unsigned int, fix fscr + offset. + 2006-09-14 Jakub Jelinek * io/Makefile (CFLAGS-fstatat.c): Set. diff --git a/sysdeps/mach/hurd/powerpc/register-dump.h b/sysdeps/mach/hurd/powerpc/register-dump.h index 0377175227..c0b1d06236 100644 --- a/sysdeps/mach/hurd/powerpc/register-dump.h +++ b/sysdeps/mach/hurd/powerpc/register-dump.h @@ -1,5 +1,5 @@ /* Dump registers. PowerPC/Hurd version. - Copyright (C) 1998, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 2001, 2006 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 @@ -113,7 +113,7 @@ register_dump (int fd, struct sigcontext *ctx) } /* Write the output. */ - write (fd, buffer, sizeof(buffer)); + write (fd, buffer, sizeof(buffer) - 1); } #define REGISTER_DUMP \ diff --git a/sysdeps/powerpc/powerpc32/register-dump.h b/sysdeps/powerpc/powerpc32/register-dump.h index d341eea8ff..7071632083 100644 --- a/sysdeps/powerpc/powerpc32/register-dump.h +++ b/sysdeps/powerpc/powerpc32/register-dump.h @@ -1,5 +1,5 @@ /* Dump registers. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2006 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 @@ -113,7 +113,7 @@ register_dump (int fd, struct sigcontext *ctx) } /* Write the output. */ - write (fd, buffer, sizeof(buffer)); + write (fd, buffer, sizeof(buffer) - 1); } diff --git a/sysdeps/powerpc/powerpc64/register-dump.h b/sysdeps/powerpc/powerpc64/register-dump.h index dd69af3faf..fc27dcaef3 100644 --- a/sysdeps/powerpc/powerpc64/register-dump.h +++ b/sysdeps/powerpc/powerpc64/register-dump.h @@ -1,5 +1,5 @@ /* Dump registers. - Copyright (C) 1998, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 2002, 2006 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 @@ -34,7 +34,7 @@ gr16-19: 000000000000010% 000000000000011% 000000000000012% 000000000000013%\n\ gr20-23: 000000000000014% 000000000000015% 000000000000016% 000000000000017%\n\ gr24-27: 000000000000018% 000000000000019% 00000000000001a% 00000000000001b%\n\ gr28-31: 00000000000001c% 00000000000001d% 00000000000001e% 00000000000001f%\n\ -fscr=0000071%\n\ +fscr=000000000000050%\n\ fp0-3: 000000000000030% 000000000000031% 000000000000032% 000000000000033%\n\ fp4-7: 000000000000034% 000000000000035% 000000000000036% 000000000000037%\n\ fp8-11: 000000000000038% 000000000000038% 00000000000003a% 00000000000003b%\n\ @@ -104,7 +104,7 @@ register_dump (int fd, struct sigcontext *ctx) char buffer[sizeof(dumpform)]; char *bufferpos; unsigned regno; - unsigned *regs = (unsigned *)(ctx->regs); + unsigned long *regs = (unsigned long *)(ctx->regs); memcpy(buffer, dumpform, sizeof(dumpform)); @@ -117,7 +117,7 @@ register_dump (int fd, struct sigcontext *ctx) } /* Write the output. */ - write (fd, buffer, sizeof(buffer)); + write (fd, buffer, sizeof(buffer) - 1); } diff --git a/sysdeps/unix/sysv/linux/ptrace.c b/sysdeps/unix/sysv/linux/ptrace.c index e33eee0ee8..e149d80477 100644 --- a/sysdeps/unix/sysv/linux/ptrace.c +++ b/sysdeps/unix/sysv/linux/ptrace.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. +/* Copyright (C) 1995-1998,2000,2003,2006 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 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -89,6 +90,19 @@ ptrace (enum __ptrace_request request, ...) #endif break; + case PTRACE_GETSIGINFO: + case PTRACE_SETSIGINFO: + (void) CHECK_1 ((siginfo_t *) data); + break; + + case PTRACE_GETEVENTMSG: + (void) CHECK_1 ((unsigned long *) data); + break; + + case PTRACE_SETOPTIONS: + (void) CHECK_1 ((long *) data); + break; + case PTRACE_TRACEME: case PTRACE_CONT: case PTRACE_KILL: diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h index b4aec4f208..95ea8ec985 100644 --- a/sysdeps/unix/sysv/linux/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/sys/ptrace.h @@ -1,5 +1,5 @@ /* `ptrace' debugger support interface. Linux version. - Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996-1999,2000,2006 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 @@ -109,8 +109,24 @@ enum __ptrace_request #define PT_SETFPXREGS PTRACE_SETFPXREGS /* Continue and stop at the next (return from) syscall. */ - PTRACE_SYSCALL = 24 + PTRACE_SYSCALL = 24, #define PT_SYSCALL PTRACE_SYSCALL + + /* Set ptrace filter options. */ + PTRACE_SETOPTIONS = 0x4200, +#define PT_SETOPTIONS PTRACE_SETOPTIONS + + /* Get last ptrace message. */ + PTRACE_GETEVENTMSG = 0x4201, +#define PT_GETEVENTMSG PT_SETOPTIONS + + /* Get siginfo for process. */ + PTRACE_GETSIGINFO = 0x4202, +#define PT_GETSIGINFO PTRACE_GETSIGINFO + + /* Set new siginfo for process. */ + PTRACE_SETSIGINFO = 0x4203 +#define PT_SETSIGINFO PTRACE_SETSIGINFO }; /* Perform process tracing functions. REQUEST is one of the values