X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Finfptrace.c;h=f40e6e97703905891437646dcfc3e6c7808c0a2e;hb=2c500098f2a2ade0966e2ac10e0e714474cfcd92;hp=1db7223ea3b5c891eb1e5a3d9e57f92df99c8cc9;hpb=8b0b198558d0fc981f129e2e3dcbe00a0f308449;p=binutils-gdb.git diff --git a/gdb/infptrace.c b/gdb/infptrace.c index 1db7223ea3b..f40e6e97703 100644 --- a/gdb/infptrace.c +++ b/gdb/infptrace.c @@ -1,29 +1,34 @@ /* Low level Unix child interface to ptrace, for GDB when running under Unix. - Copyright 1988, 89, 90, 91, 92, 93, 94, 95, 96, 1998 + Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, + 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -This file is part of GDB. + 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 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. + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "frame.h" #include "inferior.h" #include "target.h" #include "gdb_string.h" -#include "wait.h" +#include "regcache.h" + +#include "gdb_wait.h" + #include "command.h" #ifdef USG @@ -31,16 +36,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #endif #include -#include +#include "gdb_dirent.h" #include #include #ifdef HAVE_PTRACE_H -# include +#include #else -# ifdef HAVE_SYS_PTRACE_H -# include -# endif +#ifdef HAVE_SYS_PTRACE_H +#include +#endif #endif #if !defined (PT_READ_I) @@ -71,13 +76,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define PT_KILL 8 /* Send child a SIGKILL signal */ #endif -#ifndef PT_ATTACH -#define PT_ATTACH PTRACE_ATTACH -#endif -#ifndef PT_DETACH -#define PT_DETACH PTRACE_DETACH -#endif - #include "gdbcore.h" #ifndef NO_SYS_FILE #include @@ -97,26 +95,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #endif /* !FETCH_INFERIOR_REGISTERS */ #if !defined (CHILD_XFER_MEMORY) -static void udot_info PARAMS ((char *, int)); +static void udot_info (char *, int); #endif #if !defined (FETCH_INFERIOR_REGISTERS) -static void fetch_register PARAMS ((int)); -static void store_register PARAMS ((int)); +static void fetch_register (int); +static void store_register (int); #endif -void _initialize_kernel_u_addr PARAMS ((void)); -void _initialize_infptrace PARAMS ((void)); - +void _initialize_kernel_u_addr (void); +void _initialize_infptrace (void); + /* This function simply calls ptrace with the given arguments. It exists so that all calls to ptrace are isolated in this machine-dependent file. */ int -call_ptrace (request, pid, addr, data) - int request, pid; - PTRACE_ARG3_TYPE addr; - int data; +call_ptrace (int request, int pid, PTRACE_ARG3_TYPE addr, int data) { int pt_status = 0; @@ -128,25 +123,26 @@ call_ptrace (request, pid, addr, data) #endif #if defined(PT_SETTRC) /* If the parent can be told to attach to us, try to do it. */ - if (request == PT_SETTRC) { - errno = 0; - pt_status = ptrace (PT_SETTRC, pid, addr, data -#if defined (FIVE_ARG_PTRACE) - /* Deal with HPUX 8.0 braindamage. We never use the - calls which require the fifth argument. */ - , 0 + if (request == PT_SETTRC) + { + errno = 0; +#if !defined (FIVE_ARG_PTRACE) + pt_status = ptrace (PT_SETTRC, pid, addr, data); +#else + /* Deal with HPUX 8.0 braindamage. We never use the + calls which require the fifth argument. */ + pt_status = ptrace (PT_SETTRC, pid, addr, data, 0); #endif - ); - - if (errno) perror_with_name ("ptrace"); + if (errno) + perror_with_name ("ptrace"); #if 0 - printf (" = %d\n", pt_status); + printf (" = %d\n", pt_status); #endif - if (pt_status < 0) - return pt_status; - else - return parent_attach_all (pid, addr, data); - } + if (pt_status < 0) + return pt_status; + else + return parent_attach_all (pid, addr, data); + } #endif #if defined(PT_CONTIN1) @@ -167,13 +163,14 @@ call_ptrace (request, pid, addr, data) saved_errno = errno; errno = 0; #endif - pt_status = ptrace (request, pid, addr, data -#if defined (FIVE_ARG_PTRACE) - /* Deal with HPUX 8.0 braindamage. We never use the - calls which require the fifth argument. */ - , 0 +#if !defined (FIVE_ARG_PTRACE) + pt_status = ptrace (request, pid, addr, data); +#else + /* Deal with HPUX 8.0 braindamage. We never use the + calls which require the fifth argument. */ + pt_status = ptrace (request, pid, addr, data, 0); #endif - ); + #if 0 if (errno) printf (" [errno = %d]", errno); @@ -195,23 +192,23 @@ call_ptrace (request, pid, addr, data) hook before returning. */ int -ptrace_wait (pid, status) - int pid; - int *status; +ptrace_wait (ptid_t ptid, int *status) { int wstate; wstate = wait (status); - target_post_wait (wstate, *status); + target_post_wait (pid_to_ptid (wstate), *status); return wstate; } +#ifndef KILL_INFERIOR void -kill_inferior () +kill_inferior (void) { int status; + int pid = PIDGET (inferior_ptid); - if (inferior_pid == 0) + if (pid == 0) return; /* This once used to call "kill" to kill the inferior just in case @@ -222,10 +219,11 @@ kill_inferior () The kill call causes problems under hpux10, so it's been removed; if this causes problems we'll deal with them as they arise. */ - ptrace (PT_KILL, inferior_pid, (PTRACE_ARG3_TYPE) 0, 0); - ptrace_wait (0, &status); + ptrace (PT_KILL, pid, (PTRACE_ARG3_TYPE) 0, 0); + ptrace_wait (null_ptid, &status); target_mourn_inferior (); } +#endif /* KILL_INFERIOR */ #ifndef CHILD_RESUME @@ -234,18 +232,17 @@ kill_inferior () If SIGNAL is nonzero, give it that signal. */ void -child_resume (pid, step, signal) - int pid; - int step; - enum target_signal signal; +child_resume (ptid_t ptid, int step, enum target_signal signal) { + int pid = PIDGET (ptid); + errno = 0; if (pid == -1) /* Resume all threads. */ /* I think this only gets used in the non-threaded case, where "resume - all threads" and "resume inferior_pid" are the same. */ - pid = inferior_pid; + all threads" and "resume inferior_ptid" are the same. */ + pid = PIDGET (inferior_ptid); /* An address of (PTRACE_ARG3_TYPE)1 tells ptrace to continue from where it was. (If GDB wanted it to start some other way, we have already @@ -258,10 +255,10 @@ child_resume (pid, step, signal) if (step) { - if (SOFTWARE_SINGLE_STEP_P) - abort(); /* Make sure this doesn't happen. */ + if (SOFTWARE_SINGLE_STEP_P ()) + internal_error (__FILE__, __LINE__, "failed internal consistency check"); /* Make sure this doesn't happen. */ else - ptrace (PT_STEP, pid, (PTRACE_ARG3_TYPE) 1, + ptrace (PT_STEP, pid, (PTRACE_ARG3_TYPE) 1, target_signal_to_host (signal)); } else @@ -269,23 +266,31 @@ child_resume (pid, step, signal) target_signal_to_host (signal)); if (errno) - perror_with_name ("ptrace"); + { + perror_with_name ("ptrace"); + } } #endif /* CHILD_RESUME */ - -#ifdef ATTACH_DETACH /* Start debugging the process whose number is PID. */ int -attach (pid) - int pid; +attach (int pid) { errno = 0; +#ifndef PT_ATTACH +#ifdef PTRACE_ATTACH +#define PT_ATTACH PTRACE_ATTACH +#endif +#endif +#ifdef PT_ATTACH ptrace (PT_ATTACH, pid, (PTRACE_ARG3_TYPE) 0, 0); if (errno) perror_with_name ("ptrace"); attach_flag = 1; return pid; +#else + error ("This system does not support attaching to a process"); +#endif } /* Stop debugging the process whose number is PID @@ -293,16 +298,24 @@ attach (pid) SIGNAL = 0 means just continue it. */ void -detach (signal) - int signal; +detach (int signal) { errno = 0; - ptrace (PT_DETACH, inferior_pid, (PTRACE_ARG3_TYPE) 1, signal); +#ifndef PT_DETACH +#ifdef PTRACE_DETACH +#define PT_DETACH PTRACE_DETACH +#endif +#endif +#ifdef PT_DETACH + ptrace (PT_DETACH, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) 1, + signal); if (errno) - perror_with_name ("ptrace"); + print_sys_errmsg ("ptrace", errno); attach_flag = 0; +#else + error ("This system does not support detaching from a process"); +#endif } -#endif /* ATTACH_DETACH */ /* Default the type of the ptrace transfer to int. */ #ifndef PTRACE_XFER_TYPE @@ -317,7 +330,7 @@ CORE_ADDR kernel_u_addr; #endif /* KERNEL_U_ADDR_BSD. */ void -_initialize_kernel_u_addr () +_initialize_kernel_u_addr (void) { #if defined (KERNEL_U_ADDR_BSD) && !defined (FETCH_INFERIOR_REGISTERS) struct nlist names[2]; @@ -327,7 +340,8 @@ _initialize_kernel_u_addr () if (nlist ("/vmunix", names) == 0) kernel_u_addr = names[0].n_value; else - fatal ("Unable to get kernel u area address."); + internal_error (__FILE__, __LINE__, + "Unable to get kernel u area address."); #endif /* KERNEL_U_ADDR_BSD. */ } @@ -340,48 +354,48 @@ _initialize_kernel_u_addr () /* U_REGS_OFFSET is the offset of the registers within the u area. */ #if !defined (U_REGS_OFFSET) #define U_REGS_OFFSET \ - ptrace (PT_READ_U, inferior_pid, \ + ptrace (PT_READ_U, PIDGET (inferior_ptid), \ (PTRACE_ARG3_TYPE) (offsetof (struct user, u_ar0)), 0) \ - KERNEL_U_ADDR #endif -/* Registers we shouldn't try to fetch. */ -#if !defined (CANNOT_FETCH_REGISTER) -#define CANNOT_FETCH_REGISTER(regno) 0 -#endif - /* Fetch one register. */ static void -fetch_register (regno) - int regno; +fetch_register (int regno) { /* This isn't really an address. But ptrace thinks of it as one. */ CORE_ADDR regaddr; - char mess[128]; /* For messages */ - register int i; - unsigned int offset; /* Offset of registers within the u area. */ - char buf[MAX_REGISTER_RAW_SIZE]; + char mess[128]; /* For messages */ + int i; + unsigned int offset; /* Offset of registers within the u area. */ + char buf[MAX_REGISTER_SIZE]; + int tid; if (CANNOT_FETCH_REGISTER (regno)) { - memset (buf, '\0', REGISTER_RAW_SIZE (regno)); /* Supply zeroes */ + memset (buf, '\0', DEPRECATED_REGISTER_RAW_SIZE (regno)); /* Supply zeroes */ supply_register (regno, buf); return; } + /* Overload thread id onto process id */ + if ((tid = TIDGET (inferior_ptid)) == 0) + tid = PIDGET (inferior_ptid); /* no thread id, just use process id */ + offset = U_REGS_OFFSET; regaddr = register_addr (regno, offset); - for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE)) + for (i = 0; i < DEPRECATED_REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE)) { errno = 0; - *(PTRACE_XFER_TYPE *) &buf[i] = ptrace (PT_READ_U, inferior_pid, - (PTRACE_ARG3_TYPE) regaddr, 0); + *(PTRACE_XFER_TYPE *) & buf[i] = ptrace (PT_READ_U, tid, + (PTRACE_ARG3_TYPE) regaddr, 0); regaddr += sizeof (PTRACE_XFER_TYPE); if (errno != 0) { - sprintf (mess, "reading register %s (#%d)", REGISTER_NAME (regno), regno); + sprintf (mess, "reading register %s (#%d)", + REGISTER_NAME (regno), regno); perror_with_name (mess); } } @@ -394,8 +408,7 @@ fetch_register (regno) Otherwise, REGNO specifies which register (so we can save time). */ void -fetch_inferior_registers (regno) - int regno; +fetch_inferior_registers (int regno) { if (regno >= 0) { @@ -403,47 +416,53 @@ fetch_inferior_registers (regno) } else { - for (regno = 0; regno < ARCH_NUM_REGS; regno++) + for (regno = 0; regno < NUM_REGS; regno++) { fetch_register (regno); } } } -/* Registers we shouldn't try to store. */ -#if !defined (CANNOT_STORE_REGISTER) -#define CANNOT_STORE_REGISTER(regno) 0 -#endif - /* Store one register. */ static void -store_register (regno) - int regno; +store_register (int regno) { /* This isn't really an address. But ptrace thinks of it as one. */ CORE_ADDR regaddr; - char mess[128]; /* For messages */ - register int i; - unsigned int offset; /* Offset of registers within the u area. */ + char mess[128]; /* For messages */ + int i; + unsigned int offset; /* Offset of registers within the u area. */ + int tid; + char buf[MAX_REGISTER_SIZE]; if (CANNOT_STORE_REGISTER (regno)) { return; } + /* Overload thread id onto process id */ + if ((tid = TIDGET (inferior_ptid)) == 0) + tid = PIDGET (inferior_ptid); /* no thread id, just use process id */ + offset = U_REGS_OFFSET; regaddr = register_addr (regno, offset); - for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof(PTRACE_XFER_TYPE)) + + /* Put the contents of regno into a local buffer */ + regcache_collect (regno, buf); + + /* Store the local buffer into the inferior a chunk at the time. */ + for (i = 0; i < DEPRECATED_REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE)) { errno = 0; - ptrace (PT_WRITE_U, inferior_pid, (PTRACE_ARG3_TYPE) regaddr, - *(PTRACE_XFER_TYPE *) ®isters[REGISTER_BYTE (regno) + i]); + ptrace (PT_WRITE_U, tid, (PTRACE_ARG3_TYPE) regaddr, + *(PTRACE_XFER_TYPE *) (buf + i)); regaddr += sizeof (PTRACE_XFER_TYPE); if (errno != 0) { - sprintf (mess, "writing register %s (#%d)", REGISTER_NAME (regno), regno); + sprintf (mess, "writing register %s (#%d)", + REGISTER_NAME (regno), regno); perror_with_name (mess); } } @@ -454,8 +473,7 @@ store_register (regno) Otherwise, REGNO specifies which register (so we can save time). */ void -store_inferior_registers (regno) - int regno; +store_inferior_registers (int regno) { if (regno >= 0) { @@ -463,7 +481,7 @@ store_inferior_registers (regno) } else { - for (regno = 0; regno < ARCH_NUM_REGS; regno++) + for (regno = 0; regno < NUM_REGS; regno++) { store_register (regno); } @@ -472,95 +490,130 @@ store_inferior_registers (regno) #endif /* !defined (FETCH_INFERIOR_REGISTERS). */ +/* Set an upper limit on alloca. */ +#ifndef GDB_MAX_ALLOCA +#define GDB_MAX_ALLOCA 0x1000 +#endif + #if !defined (CHILD_XFER_MEMORY) /* NOTE! I tried using PTRACE_READDATA, etc., to read and write memory - in the NEW_SUN_PTRACE case. - It ought to be straightforward. But it appears that writing did - not write the data that I specified. I cannot understand where - it got the data that it actually did write. */ - -/* Copy LEN bytes to or from inferior's memory starting at MEMADDR - to debugger memory starting at MYADDR. Copy to inferior if - WRITE is nonzero. - - Returns the length copied, which is either the LEN argument or zero. - This xfer function does not do partial moves, since child_ops - doesn't allow memory operations to cross below us in the target stack - anyway. */ + in the NEW_SUN_PTRACE case. It ought to be straightforward. But + it appears that writing did not write the data that I specified. I + cannot understand where it got the data that it actually did write. */ + +/* Copy LEN bytes to or from inferior's memory starting at MEMADDR to + debugger memory starting at MYADDR. Copy to inferior if WRITE is + nonzero. TARGET is ignored. + + Returns the length copied, which is either the LEN argument or + zero. This xfer function does not do partial moves, since + child_ops doesn't allow memory operations to cross below us in the + target stack anyway. */ int -child_xfer_memory (memaddr, myaddr, len, write, target) - CORE_ADDR memaddr; - char *myaddr; - int len; - int write; - struct target_ops *target; /* ignored */ +child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, + struct mem_attrib *attrib, struct target_ops *target) { - register int i; + int i; /* Round starting address down to longword boundary. */ - register CORE_ADDR addr = memaddr & - sizeof (PTRACE_XFER_TYPE); + CORE_ADDR addr = memaddr & -(CORE_ADDR) sizeof (PTRACE_XFER_TYPE); /* Round ending address up; get number of longwords that makes. */ - register int count - = (((memaddr + len) - addr) + sizeof (PTRACE_XFER_TYPE) - 1) - / sizeof (PTRACE_XFER_TYPE); + int count = ((((memaddr + len) - addr) + sizeof (PTRACE_XFER_TYPE) - 1) + / sizeof (PTRACE_XFER_TYPE)); + int alloc = count * sizeof (PTRACE_XFER_TYPE); + PTRACE_XFER_TYPE *buffer; + struct cleanup *old_chain = NULL; + +#ifdef PT_IO + /* OpenBSD 3.1, NetBSD 1.6 and FreeBSD 5.0 have a new PT_IO request + that promises to be much more efficient in reading and writing + data in the traced process's address space. */ + + { + struct ptrace_io_desc piod; + + /* NOTE: We assume that there are no distinct address spaces for + instruction and data. */ + piod.piod_op = write ? PIOD_WRITE_D : PIOD_READ_D; + piod.piod_offs = (void *) memaddr; + piod.piod_addr = myaddr; + piod.piod_len = len; + + if (ptrace (PT_IO, PIDGET (inferior_ptid), (caddr_t) &piod, 0) == -1) + { + /* If the PT_IO request is somehow not supported, fallback on + using PT_WRITE_D/PT_READ_D. Otherwise we will return zero + to indicate failure. */ + if (errno != EINVAL) + return 0; + } + else + { + /* Return the actual number of bytes read or written. */ + return piod.piod_len; + } + } +#endif + /* Allocate buffer of that many longwords. */ - register PTRACE_XFER_TYPE *buffer - = (PTRACE_XFER_TYPE *) alloca (count * sizeof (PTRACE_XFER_TYPE)); + if (len < GDB_MAX_ALLOCA) + { + buffer = (PTRACE_XFER_TYPE *) alloca (alloc); + } + else + { + buffer = (PTRACE_XFER_TYPE *) xmalloc (alloc); + old_chain = make_cleanup (xfree, buffer); + } if (write) { - /* Fill start and end extra bytes of buffer with existing memory data. */ - - if (addr != memaddr || len < (int) sizeof (PTRACE_XFER_TYPE)) { - /* Need part of initial word -- fetch it. */ - buffer[0] = ptrace (PT_READ_I, inferior_pid, (PTRACE_ARG3_TYPE) addr, - 0); - } - - if (count > 1) /* FIXME, avoid if even boundary */ + /* Fill start and end extra bytes of buffer with existing memory + data. */ + if (addr != memaddr || len < (int) sizeof (PTRACE_XFER_TYPE)) { - buffer[count - 1] - = ptrace (PT_READ_I, inferior_pid, - ((PTRACE_ARG3_TYPE) - (addr + (count - 1) * sizeof (PTRACE_XFER_TYPE))), - 0); + /* Need part of initial word -- fetch it. */ + buffer[0] = ptrace (PT_READ_I, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) addr, 0); } - /* Copy data to be written over corresponding part of buffer */ + if (count > 1) /* FIXME, avoid if even boundary. */ + { + buffer[count - 1] = + ptrace (PT_READ_I, PIDGET (inferior_ptid), + ((PTRACE_ARG3_TYPE) + (addr + (count - 1) * sizeof (PTRACE_XFER_TYPE))), 0); + } + /* Copy data to be written over corresponding part of buffer. */ memcpy ((char *) buffer + (memaddr & (sizeof (PTRACE_XFER_TYPE) - 1)), - myaddr, - len); + myaddr, len); /* Write the entire buffer. */ - for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE)) { errno = 0; - ptrace (PT_WRITE_D, inferior_pid, (PTRACE_ARG3_TYPE) addr, - buffer[i]); + ptrace (PT_WRITE_D, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) addr, buffer[i]); if (errno) - { + { /* Using the appropriate one (I or D) is necessary for - Gould NP1, at least. */ + Gould NP1, at least. */ errno = 0; - ptrace (PT_WRITE_I, inferior_pid, (PTRACE_ARG3_TYPE) addr, - buffer[i]); + ptrace (PT_WRITE_I, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) addr, buffer[i]); } if (errno) return 0; } -#ifdef CLEAR_INSN_CACHE - CLEAR_INSN_CACHE(); -#endif } else { - /* Read all the longwords */ + /* Read all the longwords. */ for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE)) { errno = 0; - buffer[i] = ptrace (PT_READ_I, inferior_pid, + buffer[i] = ptrace (PT_READ_I, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) addr, 0); if (errno) return 0; @@ -572,25 +625,26 @@ child_xfer_memory (memaddr, myaddr, len, write, target) (char *) buffer + (memaddr & (sizeof (PTRACE_XFER_TYPE) - 1)), len); } + + if (old_chain != NULL) + do_cleanups (old_chain); return len; } - + static void -udot_info (dummy1, dummy2) - char *dummy1; - int dummy2; +udot_info (char *dummy1, int dummy2) { #if defined (KERNEL_U_SIZE) - int udot_off; /* Offset into user struct */ - int udot_val; /* Value from user struct at udot_off */ - char mess[128]; /* For messages */ + long udot_off; /* Offset into user struct */ + int udot_val; /* Value from user struct at udot_off */ + char mess[128]; /* For messages */ #endif - if (!target_has_execution) - { - error ("The program is not being run."); - } + if (!target_has_execution) + { + error ("The program is not being run."); + } #if !defined (KERNEL_U_SIZE) @@ -610,12 +664,13 @@ udot_info (dummy1, dummy2) { printf_filtered ("\n"); } - printf_filtered ("%04x:", udot_off); + printf_filtered ("%s:", paddr (udot_off)); } - udot_val = ptrace (PT_READ_U, inferior_pid, (PTRACE_ARG3_TYPE) udot_off, 0); + udot_val = ptrace (PT_READ_U, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) udot_off, 0); if (errno != 0) { - sprintf (mess, "\nreading user struct at offset 0x%x", udot_off); + sprintf (mess, "\nreading user struct at offset 0x%s", + paddr_nz (udot_off)); perror_with_name (mess); } /* Avoid using nonportable (?) "*" in print specs */ @@ -626,10 +681,10 @@ udot_info (dummy1, dummy2) #endif } #endif /* !defined (CHILD_XFER_MEMORY). */ - + void -_initialize_infptrace () +_initialize_infptrace (void) { #if !defined (CHILD_XFER_MEMORY) add_info ("udot", udot_info,