gdb/ChangeLog:

* config/alpha/nm-osf.h (PTRACE_XFER_TYPE): Remove.
	* config/mips/nm-linux.h (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Remove.
	* config/sparc/nm-linux.h (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Remove.
	* config/powerpc/nm-ppc64-linux.h: Remove file.
	* config/powerpc/ppc64-linux.mh (NATDEPFILES): Set to nm-linux.h.
	* inferior.h (PTRACE_ARG3_TYPE): Do not define.
	(call_ptrace): Change type of third argument to PTRACE_TYPE_ARG3.
	* infptrace.c (call_ptrace): Likewise.
	* m68klinux-nat.c (PTRACE_XFER_TYPE): Do not define.
	(fetch_register): Replace PTRACE_ARG3_TYPE by PTRACE_TYPE_ARG3
	and PTRACE_XFER_TYPE by PTRACE_TYPE_RET.
	(store_register): Likewise.

gdb/doc/ChangeLog:

	* gdbint.texi (Native Conditionals): Remove PTRACE_ARG3_TYPE.
This commit is contained in:
Ulrich Weigand 2007-03-30 01:18:17 +00:00
parent bbf90c8127
commit 5f4026606b
11 changed files with 30 additions and 67 deletions

View File

@ -1,3 +1,18 @@
2007-03-29 Ulrich Weigand <uweigand@de.ibm.com>
* config/alpha/nm-osf.h (PTRACE_XFER_TYPE): Remove.
* config/mips/nm-linux.h (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Remove.
* config/sparc/nm-linux.h (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Remove.
* config/powerpc/nm-ppc64-linux.h: Remove file.
* config/powerpc/ppc64-linux.mh (NATDEPFILES): Set to nm-linux.h.
* inferior.h (PTRACE_ARG3_TYPE): Do not define.
(call_ptrace): Change type of third argument to PTRACE_TYPE_ARG3.
* infptrace.c (call_ptrace): Likewise.
* m68klinux-nat.c (PTRACE_XFER_TYPE): Do not define.
(fetch_register): Replace PTRACE_ARG3_TYPE by PTRACE_TYPE_ARG3
and PTRACE_XFER_TYPE by PTRACE_TYPE_RET.
(store_register): Likewise.
2007-03-29 Joel Brobecker <brobecker@adacore.com>
* Makefile.in (varobj.o): Add missing dependency.

View File

@ -29,10 +29,6 @@
#define U_REGS_OFFSET 0
/* ptrace transfers longs, the ptrace man page is lying. */
#define PTRACE_XFER_TYPE long
/* Given a pointer to either a gregset_t or fpregset_t, return a
pointer to the first register. */
#define ALPHA_REGSET_BASE(regsetp) ((regsetp)->regs)

View File

@ -33,11 +33,6 @@
#define U_REGS_OFFSET 0
/* ptrace transfers longs, and expects addresses as longs. */
#define PTRACE_ARG3_TYPE long
#define PTRACE_XFER_TYPE long
#define REGISTER_U_ADDR(addr, blockend, regno) \
(addr) = mips_register_addr ((regno),(blockend))

View File

@ -1,27 +0,0 @@
/* IBM PowerPC64 native-dependent macros for GDB, the GNU debugger.
Copyright 2003, 2007 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program 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 General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifndef NM_PPC64_LINUX_H
#include "config/powerpc/nm-linux.h"
#define PTRACE_ARG3_TYPE void *
#define PTRACE_XFER_TYPE long
#endif /* NM_PPC64_LINUX_H */

View File

@ -2,7 +2,7 @@
XM_CLIBS=
NAT_FILE= nm-ppc64-linux.h
NAT_FILE= nm-linux.h
NATDEPFILES= inf-ptrace.o fork-child.o \
ppc-linux-nat.o proc-service.o linux-thread-db.o \
gcore.o linux-nat.o linux-fork.o

View File

@ -25,12 +25,6 @@
#include "config/nm-linux.h"
/* Type of the third argument to the `ptrace' system call. */
#define PTRACE_ARG3_TYPE long
/* Type of the fourth argument to the `ptrace' system call. */
#define PTRACE_XFER_TYPE long
/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */
#define FETCH_INFERIOR_REGISTERS

View File

@ -1,3 +1,7 @@
2007-03-29 Ulrich Weigand <uweigand@de.ibm.com>
* gdbint.texi (Native Conditionals): Remove PTRACE_ARG3_TYPE.
2007-03-27 Ulrich Weigand <uweigand@de.ibm.com>
* gdbint.texinfo (Target Conditionals): Remove mention of

View File

@ -4948,11 +4948,6 @@ Defines the format for the name of a @file{/proc} device. Should be
defined in @file{nm.h} @emph{only} in order to override the default
definition in @file{procfs.c}.
@item PTRACE_ARG3_TYPE
@findex PTRACE_ARG3_TYPE
The type of the third argument to the @code{ptrace} system call, if it
exists and is different from @code{int}.
@item REGISTER_U_ADDR
@findex REGISTER_U_ADDR
Defines the offset of the registers in the ``u area''.

View File

@ -236,11 +236,7 @@ int ptrace_wait (ptid_t, int *);
extern void child_resume (ptid_t, int, enum target_signal);
#ifndef PTRACE_ARG3_TYPE
#define PTRACE_ARG3_TYPE PTRACE_TYPE_ARG3
#endif
extern int call_ptrace (int, int, PTRACE_ARG3_TYPE, int);
extern int call_ptrace (int, int, PTRACE_TYPE_ARG3, int);
extern void pre_fork_inferior (void);

View File

@ -54,7 +54,7 @@ void _initialize_infptrace (void);
int
call_ptrace (int request, int pid, PTRACE_ARG3_TYPE addr, int data)
call_ptrace (int request, int pid, PTRACE_TYPE_ARG3 addr, int data)
{
return ptrace (request, pid, addr, data);
}

View File

@ -118,11 +118,6 @@ m68k_linux_register_u_addr (int blockend, int regnum)
#define PT_WRITE_U PTRACE_POKEUSR
#endif
/* Default the type of the ptrace transfer to int. */
#ifndef PTRACE_XFER_TYPE
#define PTRACE_XFER_TYPE int
#endif
/* Fetch one register. */
static void
@ -152,12 +147,12 @@ fetch_register (int regno)
regaddr = register_addr (regno, offset);
for (i = 0; i < register_size (current_gdbarch, regno);
i += sizeof (PTRACE_XFER_TYPE))
i += sizeof (PTRACE_TYPE_RET))
{
errno = 0;
*(PTRACE_XFER_TYPE *) &buf[i] = ptrace (PT_READ_U, tid,
(PTRACE_ARG3_TYPE) regaddr, 0);
regaddr += sizeof (PTRACE_XFER_TYPE);
*(PTRACE_TYPE_RET *) &buf[i] = ptrace (PT_READ_U, tid,
(PTRACE_TYPE_ARG3) regaddr, 0);
regaddr += sizeof (PTRACE_TYPE_RET);
if (errno != 0)
{
sprintf (mess, "reading register %s (#%d)",
@ -220,12 +215,12 @@ store_register (int regno)
/* Store the local buffer into the inferior a chunk at the time. */
for (i = 0; i < register_size (current_gdbarch, regno);
i += sizeof (PTRACE_XFER_TYPE))
i += sizeof (PTRACE_TYPE_RET))
{
errno = 0;
ptrace (PT_WRITE_U, tid, (PTRACE_ARG3_TYPE) regaddr,
*(PTRACE_XFER_TYPE *) (buf + i));
regaddr += sizeof (PTRACE_XFER_TYPE);
ptrace (PT_WRITE_U, tid, (PTRACE_TYPE_ARG3) regaddr,
*(PTRACE_TYPE_RET *) (buf + i));
regaddr += sizeof (PTRACE_TYPE_RET);
if (errno != 0)
{
sprintf (mess, "writing register %s (#%d)",