X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Finfptrace.c;h=1a1502950b1a876d1bbbb0db15afb9a8b6eab8c6;hb=b1acf338d3974d99af32899092989edeee7fbef4;hp=28419d97f043c4d9ba7ecf981934a08effd1817c;hpb=d966f0cbf54fc58741ba50659f6e48dab6081148;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/infptrace.c b/gdb/infptrace.c index 28419d97f0..1a1502950b 100644 --- a/gdb/infptrace.c +++ b/gdb/infptrace.c @@ -1,6 +1,6 @@ /* Low level Unix child interface to ptrace, for GDB when running under Unix. Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, - 1998, 1999, 2000, 2001, 2002 + 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -21,187 +21,66 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" +#include "command.h" #include "frame.h" +#include "gdbcore.h" #include "inferior.h" -#include "target.h" -#include "gdb_string.h" #include "regcache.h" +#include "target.h" +#include "gdb_assert.h" #include "gdb_wait.h" - -#include "command.h" - -#ifdef USG -#include -#endif +#include "gdb_string.h" #include #include "gdb_dirent.h" #include #include -#ifdef HAVE_PTRACE_H -#include -#else -#ifdef HAVE_SYS_PTRACE_H -#include -#endif -#endif +#include "gdb_ptrace.h" -#if !defined (PT_READ_I) -#define PT_READ_I 1 /* Read word from text space */ -#endif -#if !defined (PT_READ_D) -#define PT_READ_D 2 /* Read word from data space */ -#endif -#if !defined (PT_READ_U) -#define PT_READ_U 3 /* Read word from kernel user struct */ -#endif -#if !defined (PT_WRITE_I) -#define PT_WRITE_I 4 /* Write word to text space */ -#endif -#if !defined (PT_WRITE_D) -#define PT_WRITE_D 5 /* Write word to data space */ -#endif -#if !defined (PT_WRITE_U) -#define PT_WRITE_U 6 /* Write word to kernel user struct */ -#endif -#if !defined (PT_CONTINUE) -#define PT_CONTINUE 7 /* Continue after signal */ -#endif -#if !defined (PT_STEP) -#define PT_STEP 9 /* Set flag for single stepping */ -#endif -#if !defined (PT_KILL) -#define PT_KILL 8 /* Send child a SIGKILL signal */ -#endif - -#include "gdbcore.h" -#ifndef NO_SYS_FILE +#ifdef HAVE_SYS_FILE_H #include #endif -#if 0 -/* Don't think this is used anymore. On the sequent (not sure whether it's - dynix or ptx or both), it is included unconditionally by sys/user.h and - not protected against multiple inclusion. */ -#include "gdb_stat.h" -#endif #if !defined (FETCH_INFERIOR_REGISTERS) #include /* Probably need to poke the user structure */ -#if defined (KERNEL_U_ADDR_BSD) -#include /* For struct nlist */ -#endif /* KERNEL_U_ADDR_BSD. */ #endif /* !FETCH_INFERIOR_REGISTERS */ #if !defined (CHILD_XFER_MEMORY) static void udot_info (char *, int); #endif -#if !defined (FETCH_INFERIOR_REGISTERS) -static void fetch_register (int); -static void store_register (int); -#endif - -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 (int request, int pid, PTRACE_ARG3_TYPE addr, int data) { - int pt_status = 0; - -#if 0 - int saved_errno; - - printf ("call_ptrace(request=%d, pid=%d, addr=0x%x, data=0x%x)", - 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; -#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 0 - printf (" = %d\n", pt_status); -#endif - if (pt_status < 0) - return pt_status; - else - return parent_attach_all (pid, addr, data); - } -#endif - -#if defined(PT_CONTIN1) - /* On HPUX, PT_CONTIN1 is a form of continue that preserves pending - signals. If it's available, use it. */ - if (request == PT_CONTINUE) - request = PT_CONTIN1; -#endif - -#if defined(PT_SINGLE1) - /* On HPUX, PT_SINGLE1 is a form of step that preserves pending - signals. If it's available, use it. */ - if (request == PT_STEP) - request = PT_SINGLE1; -#endif - -#if 0 - saved_errno = errno; - errno = 0; -#endif -#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); - - errno = saved_errno; - printf (" = 0x%x\n", pt_status); -#endif - return pt_status; + return ptrace (request, pid, addr, data); } - -#if defined (DEBUG_PTRACE) || defined (FIVE_ARG_PTRACE) -/* For the rest of the file, use an extra level of indirection */ -/* This lets us breakpoint usefully on call_ptrace. */ -#define ptrace call_ptrace -#endif - /* Wait for a process to finish, possibly running a target-specific hook before returning. */ +/* NOTE: cagney: 2004-09-29: Dependant on the native configuration, + "hppah-nat.c" may either call this or infttrace.c's implementation + of ptrace_wait. See "hppahpux.mh". */ + int ptrace_wait (ptid_t ptid, int *status) { int wstate; wstate = wait (status); - target_post_wait (pid_to_ptid (wstate), *status); return wstate; } -#ifndef KILL_INFERIOR +#ifndef DEPRECATED_KILL_INFERIOR +/* NOTE: cagney/2004-09-12: Instead of definining this macro, code + should call inf_ptrace_target to get a basic ptrace target and then + locally update any necessary methods. See ppcnbsd-nat.c. */ + void kill_inferior (void) { @@ -219,13 +98,16 @@ kill_inferior (void) 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, pid, (PTRACE_ARG3_TYPE) 0, 0); - ptrace_wait (null_ptid, &status); + ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3) 0, 0); + wait (&status); target_mourn_inferior (); } -#endif /* KILL_INFERIOR */ +#endif /* DEPRECATED_KILL_INFERIOR */ -#ifndef CHILD_RESUME +#ifndef DEPRECATED_CHILD_RESUME +/* NOTE: cagney/2004-09-12: Instead of definining this macro, code + should call inf_ptrace_target to get a basic ptrace target and then + locally update any necessary methods. See ppcnbsd-nat.c. */ /* Resume execution of the inferior process. If STEP is nonzero, single-step it. @@ -234,57 +116,48 @@ kill_inferior (void) void child_resume (ptid_t ptid, int step, enum target_signal signal) { + int request = PT_CONTINUE; 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_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 - written a new PC value to the child.) - - If this system does not support PT_STEP, a higher level function will - have called single_step() to transmute the step request into a - continue request (by setting breakpoints on all possible successor - instructions), so we don't have to worry about that here. */ - if (step) { - 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, - target_signal_to_host (signal)); + /* If this system does not support PT_STEP, a higher level + function will have called single_step() to transmute the step + request into a continue request (by setting breakpoints on + all possible successor instructions), so we don't have to + worry about that here. */ + + gdb_assert (!SOFTWARE_SINGLE_STEP_P ()); + request = PT_STEP; } - else - ptrace (PT_CONTINUE, pid, (PTRACE_ARG3_TYPE) 1, - target_signal_to_host (signal)); - if (errno) - { - perror_with_name ("ptrace"); - } + /* An address of (PTRACE_TYPE_ARG3)1 tells ptrace to continue from + where it was. If GDB wanted it to start some other way, we have + already written a new PC value to the child. */ + + errno = 0; + ptrace (request, pid, (PTRACE_TYPE_ARG3)1, target_signal_to_host (signal)); + if (errno != 0) + perror_with_name ("ptrace"); } -#endif /* CHILD_RESUME */ +#endif /* DEPRECATED_CHILD_RESUME */ + /* Start debugging the process whose number is PID. */ + int 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) + errno = 0; + ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3) 0, 0); + if (errno != 0) perror_with_name ("ptrace"); attach_flag = 1; return pid; @@ -293,201 +166,149 @@ attach (int pid) #endif } -/* Stop debugging the process whose number is PID - and continue it with signal number SIGNAL. - SIGNAL = 0 means just continue it. */ +/* Stop debugging the process whose number is PID and continue it with + signal number SIGNAL. SIGNAL = 0 means just continue it. */ void detach (int signal) { - errno = 0; -#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) - print_sys_errmsg ("ptrace", errno); + int pid = PIDGET (inferior_ptid); + + errno = 0; + ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3) 1, signal); + if (errno != 0) + perror_with_name ("ptrace"); attach_flag = 0; #else error ("This system does not support detaching from a process"); #endif } -/* Default the type of the ptrace transfer to int. */ -#ifndef PTRACE_XFER_TYPE -#define PTRACE_XFER_TYPE int -#endif -/* KERNEL_U_ADDR is the amount to subtract from u.u_ar0 - to get the offset in the core file of the register values. */ -#if defined (KERNEL_U_ADDR_BSD) && !defined (FETCH_INFERIOR_REGISTERS) -/* Get kernel_u_addr using BSD-style nlist(). */ -CORE_ADDR kernel_u_addr; -#endif /* KERNEL_U_ADDR_BSD. */ +#ifndef FETCH_INFERIOR_REGISTERS -void -_initialize_kernel_u_addr (void) -{ -#if defined (KERNEL_U_ADDR_BSD) && !defined (FETCH_INFERIOR_REGISTERS) - struct nlist names[2]; - - names[0].n_un.n_name = "_u"; - names[1].n_un.n_name = NULL; - if (nlist ("/vmunix", names) == 0) - kernel_u_addr = names[0].n_value; - else - internal_error (__FILE__, __LINE__, - "Unable to get kernel u area address."); -#endif /* KERNEL_U_ADDR_BSD. */ -} - -#if !defined (FETCH_INFERIOR_REGISTERS) +/* U_REGS_OFFSET is the offset of the registers within the u area. */ +#ifndef U_REGS_OFFSET -#if !defined (offsetof) +#ifndef offsetof #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER) #endif -/* 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, PIDGET (inferior_ptid), \ - (PTRACE_ARG3_TYPE) (offsetof (struct user, u_ar0)), 0) \ + (PTRACE_TYPE_ARG3) (offsetof (struct user, u_ar0)), 0) \ - KERNEL_U_ADDR #endif -/* Fetch one register. */ +/* Fetch register REGNUM from the inferior. */ static void -fetch_register (int regno) +fetch_register (int regnum) { - /* This isn't really an address. But ptrace thinks of it as one. */ - CORE_ADDR regaddr; - char mess[128]; /* For messages */ - int i; - unsigned int offset; /* Offset of registers within the u area. */ - char buf[MAX_REGISTER_SIZE]; - int tid; + CORE_ADDR addr; + size_t size; + PTRACE_TYPE_RET *buf; + int tid, i; - if (CANNOT_FETCH_REGISTER (regno)) + if (CANNOT_FETCH_REGISTER (regnum)) { - memset (buf, '\0', DEPRECATED_REGISTER_RAW_SIZE (regno)); /* Supply zeroes */ - supply_register (regno, buf); + regcache_raw_supply (current_regcache, regnum, NULL); return; } - /* Overload thread id onto process id */ - if ((tid = TIDGET (inferior_ptid)) == 0) - tid = PIDGET (inferior_ptid); /* no thread id, just use process id */ + /* GNU/Linux LWP ID's are process ID's. */ + tid = TIDGET (inferior_ptid); + if (tid == 0) + tid = PIDGET (inferior_ptid); /* Not a threaded program. */ - offset = U_REGS_OFFSET; + /* This isn't really an address. But ptrace thinks of it as one. */ + addr = register_addr (regnum, U_REGS_OFFSET); + size = register_size (current_gdbarch, regnum); + + gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0); + buf = alloca (size); - regaddr = register_addr (regno, offset); - for (i = 0; i < DEPRECATED_REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE)) + /* Read the register contents from the inferior a chuck at the time. */ + for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++) { errno = 0; - *(PTRACE_XFER_TYPE *) & buf[i] = ptrace (PT_READ_U, tid, - (PTRACE_ARG3_TYPE) regaddr, 0); - regaddr += sizeof (PTRACE_XFER_TYPE); + buf[i] = ptrace (PT_READ_U, tid, (PTRACE_TYPE_ARG3) addr, 0); if (errno != 0) - { - sprintf (mess, "reading register %s (#%d)", - REGISTER_NAME (regno), regno); - perror_with_name (mess); - } + error ("Couldn't read register %s (#%d): %s.", REGISTER_NAME (regnum), + regnum, safe_strerror (errno)); + + addr += sizeof (PTRACE_TYPE_RET); } - supply_register (regno, buf); + regcache_raw_supply (current_regcache, regnum, buf); } - -/* Fetch register values from the inferior. - If REGNO is negative, do this for all registers. - Otherwise, REGNO specifies which register (so we can save time). */ +/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this + for all registers. */ void -fetch_inferior_registers (int regno) +fetch_inferior_registers (int regnum) { - if (regno >= 0) - { - fetch_register (regno); - } + if (regnum == -1) + for (regnum = 0; regnum < NUM_REGS; regnum++) + fetch_register (regnum); else - { - for (regno = 0; regno < NUM_REGS; regno++) - { - fetch_register (regno); - } - } + fetch_register (regnum); } -/* Store one register. */ +/* Store register REGNUM into the inferior. */ static void -store_register (int regno) +store_register (int regnum) { - /* This isn't really an address. But ptrace thinks of it as one. */ - CORE_ADDR regaddr; - char mess[128]; /* For messages */ - int i; - unsigned int offset; /* Offset of registers within the u area. */ - int tid; - char buf[MAX_REGISTER_SIZE]; + CORE_ADDR addr; + size_t size; + PTRACE_TYPE_RET *buf; + int tid, i; - 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 */ + if (CANNOT_STORE_REGISTER (regnum)) + return; - offset = U_REGS_OFFSET; + /* GNU/Linux LWP ID's are process ID's. */ + tid = TIDGET (inferior_ptid); + if (tid == 0) + tid = PIDGET (inferior_ptid); /* Not a threaded program. */ - regaddr = register_addr (regno, offset); + /* This isn't really an address. But ptrace thinks of it as one. */ + addr = register_addr (regnum, U_REGS_OFFSET); + size = register_size (current_gdbarch, regnum); - /* Put the contents of regno into a local buffer */ - regcache_collect (regno, buf); + gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0); + buf = alloca (size); - /* 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)) + /* Write the register contents into the inferior a chunk at the time. */ + regcache_raw_collect (current_regcache, regnum, buf); + for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++) { 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) addr, buf[i]); if (errno != 0) - { - sprintf (mess, "writing register %s (#%d)", - REGISTER_NAME (regno), regno); - perror_with_name (mess); - } + error ("Couldn't write register %s (#%d): %s.", REGISTER_NAME (regnum), + regnum, safe_strerror (errno)); + + addr += sizeof (PTRACE_TYPE_RET); } } -/* Store our register values back into the inferior. - If REGNO is negative, do this for all registers. - Otherwise, REGNO specifies which register (so we can save time). */ +/* Store register REGNUM back into the inferior. If REGNUM is -1, do + this for all registers (including the floating point registers). */ void -store_inferior_registers (int regno) +store_inferior_registers (int regnum) { - if (regno >= 0) - { - store_register (regno); - } + if (regnum == -1) + for (regnum = 0; regnum < NUM_REGS; regnum++) + store_register (regnum); else - { - for (regno = 0; regno < NUM_REGS; regno++) - { - store_register (regno); - } - } + store_register (regnum); } -#endif /* !defined (FETCH_INFERIOR_REGISTERS). */ + +#endif /* not FETCH_INFERIOR_REGISTERS. */ /* Set an upper limit on alloca. */ @@ -507,8 +328,8 @@ store_inferior_registers (int regno) 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. */ + deprecated_child_ops doesn't allow memory operations to cross below + us in the target stack anyway. */ int child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, @@ -516,12 +337,12 @@ child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, { int i; /* Round starting address down to longword boundary. */ - CORE_ADDR addr = memaddr & -(CORE_ADDR) sizeof (PTRACE_XFER_TYPE); + CORE_ADDR addr = memaddr & -(CORE_ADDR) sizeof (PTRACE_TYPE_RET); /* Round ending address up; get number of longwords that makes. */ - 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; + int count = ((((memaddr + len) - addr) + sizeof (PTRACE_TYPE_RET) - 1) + / sizeof (PTRACE_TYPE_RET)); + int alloc = count * sizeof (PTRACE_TYPE_RET); + PTRACE_TYPE_RET *buffer; struct cleanup *old_chain = NULL; #ifdef PT_IO @@ -558,11 +379,11 @@ child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, /* Allocate buffer of that many longwords. */ if (len < GDB_MAX_ALLOCA) { - buffer = (PTRACE_XFER_TYPE *) alloca (alloc); + buffer = (PTRACE_TYPE_RET *) alloca (alloc); } else { - buffer = (PTRACE_XFER_TYPE *) xmalloc (alloc); + buffer = (PTRACE_TYPE_RET *) xmalloc (alloc); old_chain = make_cleanup (xfree, buffer); } @@ -570,54 +391,51 @@ child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, { /* Fill start and end extra bytes of buffer with existing memory data. */ - if (addr != memaddr || len < (int) sizeof (PTRACE_XFER_TYPE)) + if (addr != memaddr || len < (int) sizeof (PTRACE_TYPE_RET)) { /* Need part of initial word -- fetch it. */ buffer[0] = ptrace (PT_READ_I, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) addr, 0); + (PTRACE_TYPE_ARG3) addr, 0); } 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); + ((PTRACE_TYPE_ARG3) + (addr + (count - 1) * sizeof (PTRACE_TYPE_RET))), 0); } /* Copy data to be written over corresponding part of buffer. */ - memcpy ((char *) buffer + (memaddr & (sizeof (PTRACE_XFER_TYPE) - 1)), + memcpy ((char *) buffer + (memaddr & (sizeof (PTRACE_TYPE_RET) - 1)), myaddr, len); /* Write the entire buffer. */ - for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE)) + for (i = 0; i < count; i++, addr += sizeof (PTRACE_TYPE_RET)) { errno = 0; ptrace (PT_WRITE_D, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) addr, buffer[i]); + (PTRACE_TYPE_ARG3) addr, buffer[i]); if (errno) { /* Using the appropriate one (I or D) is necessary for Gould NP1, at least. */ errno = 0; ptrace (PT_WRITE_I, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) addr, buffer[i]); + (PTRACE_TYPE_ARG3) addr, buffer[i]); } if (errno) return 0; } -#ifdef CLEAR_INSN_CACHE - CLEAR_INSN_CACHE (); -#endif } else { /* Read all the longwords. */ - for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE)) + for (i = 0; i < count; i++, addr += sizeof (PTRACE_TYPE_RET)) { errno = 0; buffer[i] = ptrace (PT_READ_I, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) addr, 0); + (PTRACE_TYPE_ARG3) addr, 0); if (errno) return 0; QUIT; @@ -625,7 +443,7 @@ child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, /* Copy appropriate bytes out of the buffer. */ memcpy (myaddr, - (char *) buffer + (memaddr & (sizeof (PTRACE_XFER_TYPE) - 1)), + (char *) buffer + (memaddr & (sizeof (PTRACE_TYPE_RET) - 1)), len); } @@ -669,7 +487,7 @@ udot_info (char *dummy1, int dummy2) } printf_filtered ("%s:", paddr (udot_off)); } - udot_val = ptrace (PT_READ_U, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) udot_off, 0); + udot_val = ptrace (PT_READ_U, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) udot_off, 0); if (errno != 0) { sprintf (mess, "\nreading user struct at offset 0x%s",