+2014-01-14  Yao Qi  <yao@codesourcery.com>
+
+       * target.h (target_xfer_partial_ftype): Update.
+       (struct target_ops) <to_xfer_partial>: Change 'len' type to
+       ULONGEST.
+       * aix-thread.c (aix_thread_xfer_partial): Change type of
+       argument 'len' to ULONGEST.
+       * auxv.c (procfs_xfer_auxv): Likewise.
+       (ld_so_xfer_auxv): Likewise.
+       (memory_xfer_auxv): Likewise.
+       * bfd-target.c (target_bfd_xfer_partial): Likewise.
+       * bsd-kvm.c (bsd_kvm_xfer_partial): Likewise.
+       * bsd-uthread.c (bsd_uthread_xfer_partial): Likewise.
+       * corelow.c (core_xfer_partial): Likewise.
+       * ctf.c (ctf_xfer_partial): Likewise.
+       * darwin-nat.c (darwin_read_write_inferior): Likewise.  Use
+       '%u'.
+       (darwin_read_dyld_info): Likewise.
+       (darwin_xfer_partial): Likewise.
+       * exec.c (section_table_xfer_memory_partial): Likewise.
+       (exec_xfer_partial): Likewise.
+       * exec.h (section_table_xfer_memory_partial): Update
+       declaration.
+       * gnu-nat.c (gnu_xfer_memory): Likewise.  Call pulongest
+       instead of plongest.
+       (gnu_xfer_partial): Likewise.
+       * ia64-hpux-nat.c (ia64_hpux_xfer_memory): Likewise.
+       (ia64_hpux_xfer_solib_got): Likewise.
+       (ia64_hpux_xfer_partial): Likewise.
+       * ia64-linux-nat.c (ia64_linux_xfer_partial):
+       * inf-ptrace.c (inf_ptrace_xfer_partial):
+       * inf-ttrace.c (inf_ttrace_xfer_partial):
+       * linux-nat.c (linux_xfer_siginfo): Likewise.
+       (linux_nat_xfer_partial): Likewise.
+       (spu_enumerate_spu_ids, linux_proc_xfer_spu): Likewise.
+       (linux_nat_xfer_osdata, linux_xfer_partial): Likewise.
+       * monitor.c (monitor_xfer_memory): Likewise.
+       (monitor_xfer_partial): Likewise.
+       * procfs.c (procfs_xfer_partial): Likewise.
+       * record-full.c (record_full_xfer_partial): Likewise.
+       (record_full_core_xfer_partial): Likewise.
+       * remote-sim.c (gdbsim_xfer_memory): Likewise.  Call pulongest
+       instead of plongest.
+       (gdbsim_xfer_partial): Likewise.
+       * remote.c (remote_xfer_partial): Likewise.
+       * rs6000-aix-tdep.c (rs6000_aix_ld_info_to_xml): Likewise.
+       * rs6000-aix-tdep.h (rs6000_aix_ld_info_to_xml): Update
+       declaration.
+       * rs6000-nat.c (rs6000_xfer_partial): Likewise.
+       (rs6000_xfer_shared_libraries): Likewise.
+       * sol-thread.c (sol_thread_xfer_partial): Likewise.
+       * sparc-nat.c (sparc_xfer_wcookie): Likewise.
+       (sparc_xfer_partial): Likewise.
+       * spu-linux-nat.c (spu_proc_xfer_spu): Likewise.
+       (spu_xfer_partial): Likewise.
+       * spu-multiarch.c (spu_xfer_partial): Likewise.
+       * target.c (target_read_live_memory): Likewise.
+       (memory_xfer_live_readonly_partial): Likewise.
+       (memory_xfer_partial, memory_xfer_partial_1): Likewise.
+       (target_xfer_partial, default_xfer_partial): Likewise.
+       (current_xfer_partial): Likewise.
+       * tracepoint.c (tfile_xfer_partial): Likewise.
+       * windows-nat.c (windows_xfer_memory): Likewise.  Call
+       pulongest instead of plongest.
+       (windows_xfer_partial): Likewise.
+       (windows_xfer_shared_libraries): Likewise.
+
 2014-01-14  Yao Qi  <yao@codesourcery.com>
 
        * rs6000-nat.c (rs6000_xfer_shared_libraries): Use
 
 aix_thread_xfer_partial (struct target_ops *ops, enum target_object object,
                         const char *annex, gdb_byte *readbuf,
                         const gdb_byte *writebuf,
-                        ULONGEST offset, LONGEST len)
+                        ULONGEST offset, ULONGEST len)
 {
   struct cleanup *old_chain = save_inferior_ptid ();
   LONGEST xfer;
 
 procfs_xfer_auxv (gdb_byte *readbuf,
                  const gdb_byte *writebuf,
                  ULONGEST offset,
-                 LONGEST len)
+                 ULONGEST len)
 {
   char *pathname;
   int fd;
 ld_so_xfer_auxv (gdb_byte *readbuf,
                 const gdb_byte *writebuf,
                 ULONGEST offset,
-                LONGEST len)
+                ULONGEST len)
 {
   struct minimal_symbol *msym;
   CORE_ADDR data_address, pointer_address;
                  gdb_byte *readbuf,
                  const gdb_byte *writebuf,
                  ULONGEST offset,
-                 LONGEST len)
+                 ULONGEST len)
 {
   gdb_assert (object == TARGET_OBJECT_AUXV);
   gdb_assert (readbuf || writebuf);
 
                         enum target_object object,
                         const char *annex, gdb_byte *readbuf,
                         const gdb_byte *writebuf,
-                        ULONGEST offset, LONGEST len)
+                        ULONGEST offset, ULONGEST len)
 {
   switch (object)
     {
 
 bsd_kvm_xfer_partial (struct target_ops *ops, enum target_object object,
                      const char *annex, gdb_byte *readbuf,
                      const gdb_byte *writebuf,
-                     ULONGEST offset, LONGEST len)
+                     ULONGEST offset, ULONGEST len)
 {
   switch (object)
     {
 
 bsd_uthread_xfer_partial (struct target_ops *ops, enum target_object object,
                          const char *annex, gdb_byte *readbuf,
                          const gdb_byte *writebuf,
-                         ULONGEST offset, LONGEST len)
+                         ULONGEST offset, ULONGEST len)
 {
   gdb_assert (ops->beneath->to_xfer_partial);
   return ops->beneath->to_xfer_partial (ops->beneath, object, annex, readbuf,
 
 core_xfer_partial (struct target_ops *ops, enum target_object object,
                   const char *annex, gdb_byte *readbuf,
                   const gdb_byte *writebuf, ULONGEST offset,
-                  LONGEST len)
+                  ULONGEST len)
 {
   switch (object)
     {
 
 ctf_xfer_partial (struct target_ops *ops, enum target_object object,
                  const char *annex, gdb_byte *readbuf,
                  const gdb_byte *writebuf, ULONGEST offset,
-                 LONGEST len)
+                 ULONGEST len)
 {
   /* We're only doing regular memory for now.  */
   if (object != TARGET_OBJECT_MEMORY)
 
 static int
 darwin_read_write_inferior (task_t task, CORE_ADDR addr,
                            gdb_byte *rdaddr, const gdb_byte *wraddr,
-                           int length)
+                           ULONGEST length)
 {
   kern_return_t kret;
   mach_vm_address_t offset = addr & (mach_page_size - 1);
   mach_vm_address_t region_address;
   mach_vm_size_t region_length;
 
-  inferior_debug (8, _("darwin_read_write_inferior(task=0x%x, %s, len=%d)\n"),
-                 task, core_addr_to_string (addr), length);
+  inferior_debug (8, _("darwin_read_write_inferior(task=0x%x, %s, len=%s)\n"),
+                 task, core_addr_to_string (addr), pulongest (length));
 
   /* Get memory from inferior with page aligned addresses.  */
   kret = mach_vm_read (task, low_address, aligned_length,
 /* This is not available in Darwin 9.  */
 static int
 darwin_read_dyld_info (task_t task, CORE_ADDR addr, gdb_byte *rdaddr,
-                      int length)
+                      ULONGEST length)
 {
   struct task_dyld_info task_dyld_info;
   mach_msg_type_number_t count = TASK_DYLD_INFO_COUNT;
 darwin_xfer_partial (struct target_ops *ops,
                     enum target_object object, const char *annex,
                     gdb_byte *readbuf, const gdb_byte *writebuf,
-                    ULONGEST offset, LONGEST len)
+                    ULONGEST offset, ULONGEST len)
 {
   struct inferior *inf = current_inferior ();
 
   inferior_debug
-    (8, _("darwin_xfer_partial(%s, %d, rbuf=%s, wbuf=%s) pid=%u\n"),
-     core_addr_to_string (offset), (int)len,
+    (8, _("darwin_xfer_partial(%s, %s, rbuf=%s, wbuf=%s) pid=%u\n"),
+     core_addr_to_string (offset), pulongest (len),
      host_address_to_string (readbuf), host_address_to_string (writebuf),
      inf->pid);
 
 
 
 int
 section_table_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf,
-                                  ULONGEST offset, LONGEST len,
+                                  ULONGEST offset, ULONGEST len,
                                   struct target_section *sections,
                                   struct target_section *sections_end,
                                   const char *section_name)
   ULONGEST memaddr = offset;
   ULONGEST memend = memaddr + len;
 
-  if (len <= 0)
+  if (len == 0)
     internal_error (__FILE__, __LINE__,
                    _("failed internal consistency check"));
 
 exec_xfer_partial (struct target_ops *ops, enum target_object object,
                   const char *annex, gdb_byte *readbuf,
                   const gdb_byte *writebuf,
-                  ULONGEST offset, LONGEST len)
+                  ULONGEST offset, ULONGEST len)
 {
   struct target_section_table *table = target_get_section_table (ops);
 
 
    One, and only one, of readbuf or writebuf must be non-NULL.  */
 
 extern int section_table_xfer_memory_partial (gdb_byte *, const gdb_byte *,
-                                             ULONGEST, LONGEST,
+                                             ULONGEST, ULONGEST,
                                              struct target_section *,
                                              struct target_section *,
                                              const char *);
 
 
 static LONGEST
 gnu_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf,
-                CORE_ADDR memaddr, LONGEST len)
+                CORE_ADDR memaddr, ULONGEST len)
 {
   task_t task = (gnu_current_inf
                 ? (gnu_current_inf->task
   if (writebuf != NULL)
     {
       inf_debug (gnu_current_inf, "writing %s[%s] <-- %s",
-                paddress (target_gdbarch (), memaddr), plongest (len),
+                paddress (target_gdbarch (), memaddr), pulongest (len),
                 host_address_to_string (writebuf));
       res = gnu_write_inferior (task, memaddr, writebuf, len);
     }
   else
     {
       inf_debug (gnu_current_inf, "reading %s[%s] --> %s",
-                paddress (target_gdbarch (), memaddr), plongest (len),
+                paddress (target_gdbarch (), memaddr), pulongest (len),
                 host_address_to_string (readbuf));
       res = gnu_read_inferior (task, memaddr, readbuf, len);
     }
 static LONGEST
 gnu_xfer_partial (struct target_ops *ops, enum target_object object,
                  const char *annex, gdb_byte *readbuf,
-                 const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                 const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   switch (object)
     {
 
 static LONGEST
 ia64_hpux_xfer_memory (struct target_ops *ops, const char *annex,
                       gdb_byte *readbuf, const gdb_byte *writebuf,
-                      CORE_ADDR addr, LONGEST len)
+                      CORE_ADDR addr, ULONGEST len)
 {
   CORE_ADDR bsp, bspstore;
   CORE_ADDR start_addr, short_len;
 static LONGEST
 ia64_hpux_xfer_solib_got (struct target_ops *ops, const char *annex,
                          gdb_byte *readbuf, const gdb_byte *writebuf,
-                         ULONGEST offset, LONGEST len)
+                         ULONGEST offset, ULONGEST len)
 {
   CORE_ADDR fun_addr;
   /* The linkage pointer.  We use a uint64_t to make sure that the size
 static LONGEST
 ia64_hpux_xfer_partial (struct target_ops *ops, enum target_object object,
                        const char *annex, gdb_byte *readbuf,
-                       const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                       const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   LONGEST val;
 
 
                         enum target_object object,
                         const char *annex,
                         gdb_byte *readbuf, const gdb_byte *writebuf,
-                        ULONGEST offset, LONGEST len)
+                        ULONGEST offset, ULONGEST len)
 {
   if (object == TARGET_OBJECT_UNWIND_TABLE && writebuf == NULL && offset == 0)
     return syscall (__NR_getunwind, readbuf, len);
 
 inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
                         const char *annex, gdb_byte *readbuf,
                         const gdb_byte *writebuf,
-                        ULONGEST offset, LONGEST len)
+                        ULONGEST offset, ULONGEST len)
 {
   pid_t pid = ptid_get_pid (inferior_ptid);
 
 
 inf_ttrace_xfer_partial (struct target_ops *ops, enum target_object object,
                         const char *annex, gdb_byte *readbuf,
                         const gdb_byte *writebuf,
-                        ULONGEST offset, LONGEST len)
+                        ULONGEST offset, ULONGEST len)
 {
   switch (object)
     {
 
 static LONGEST
 linux_xfer_siginfo (struct target_ops *ops, enum target_object object,
                     const char *annex, gdb_byte *readbuf,
-                   const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                   const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   int pid;
   siginfo_t siginfo;
 linux_nat_xfer_partial (struct target_ops *ops, enum target_object object,
                        const char *annex, gdb_byte *readbuf,
                        const gdb_byte *writebuf,
-                       ULONGEST offset, LONGEST len)
+                       ULONGEST offset, ULONGEST len)
 {
   struct cleanup *old_chain;
   LONGEST xfer;
 
 /* Enumerate spufs IDs for process PID.  */
 static LONGEST
-spu_enumerate_spu_ids (int pid, gdb_byte *buf, ULONGEST offset, LONGEST len)
+spu_enumerate_spu_ids (int pid, gdb_byte *buf, ULONGEST offset, ULONGEST len)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
   LONGEST pos = 0;
 linux_proc_xfer_spu (struct target_ops *ops, enum target_object object,
                     const char *annex, gdb_byte *readbuf,
                     const gdb_byte *writebuf,
-                    ULONGEST offset, LONGEST len)
+                    ULONGEST offset, ULONGEST len)
 {
   char buf[128];
   int fd = 0;
 static LONGEST
 linux_nat_xfer_osdata (struct target_ops *ops, enum target_object object,
                       const char *annex, gdb_byte *readbuf,
-                      const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                      const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   gdb_assert (object == TARGET_OBJECT_OSDATA);
 
 static LONGEST
 linux_xfer_partial (struct target_ops *ops, enum target_object object,
                     const char *annex, gdb_byte *readbuf,
-                   const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                   const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   LONGEST xfer;
 
 
 
 static LONGEST
 monitor_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf,
-                    ULONGEST memaddr, LONGEST len)
+                    ULONGEST memaddr, ULONGEST len)
 {
   int res;
 
 static LONGEST
 monitor_xfer_partial (struct target_ops *ops, enum target_object object,
                      const char *annex, gdb_byte *readbuf,
-                     const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                     const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   switch (object)
     {
 
 static LONGEST
 procfs_xfer_partial (struct target_ops *ops, enum target_object object,
                     const char *annex, gdb_byte *readbuf,
-                    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                    const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   switch (object)
     {
 
 record_full_xfer_partial (struct target_ops *ops, enum target_object object,
                          const char *annex, gdb_byte *readbuf,
                          const gdb_byte *writebuf, ULONGEST offset,
-                         LONGEST len)
+                         ULONGEST len)
 {
   if (!record_full_gdb_operation_disable
       && (object == TARGET_OBJECT_MEMORY
                               enum target_object object,
                               const char *annex, gdb_byte *readbuf,
                               const gdb_byte *writebuf, ULONGEST offset,
-                              LONGEST len)
+                              ULONGEST len)
 {
   if (object == TARGET_OBJECT_MEMORY)
     {
 
 static LONGEST
 gdbsim_xfer_memory (struct target_ops *target,
                    gdb_byte *readbuf, const gdb_byte *writebuf,
-                   ULONGEST memaddr, LONGEST len)
+                   ULONGEST memaddr, ULONGEST len)
 {
   struct sim_inferior_data *sim_data
     = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
+  int l;
 
   /* If this target doesn't have memory yet, return 0 causing the
      request to be passed to a lower target, hopefully an exec
                        host_address_to_string (readbuf),
                        host_address_to_string (writebuf),
                        paddress (target_gdbarch (), memaddr),
-                       plongest (len));
+                       pulongest (len));
 
   if (writebuf)
     {
       if (remote_debug && len > 0)
        dump_mem (writebuf, len);
-      len = sim_write (sim_data->gdbsim_desc, memaddr, writebuf, len);
+      l = sim_write (sim_data->gdbsim_desc, memaddr, writebuf, len);
     }
   else
     {
-      len = sim_read (sim_data->gdbsim_desc, memaddr, readbuf, len);
+      l = sim_read (sim_data->gdbsim_desc, memaddr, readbuf, len);
       if (remote_debug && len > 0)
        dump_mem (readbuf, len);
     }
-  return len;
+  return l;
 }
 
 /* Target to_xfer_partial implementation.  */
 static LONGEST
 gdbsim_xfer_partial (struct target_ops *ops, enum target_object object,
                     const char *annex, gdb_byte *readbuf,
-                    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                    const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   switch (object)
     {
 
 static LONGEST
 remote_xfer_partial (struct target_ops *ops, enum target_object object,
                     const char *annex, gdb_byte *readbuf,
-                    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                    const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   struct remote_state *rs;
   int i;
 
 
 LONGEST
 rs6000_aix_ld_info_to_xml (struct gdbarch *gdbarch, const gdb_byte *ldi_buf,
-                          gdb_byte *readbuf, ULONGEST offset, LONGEST len,
+                          gdb_byte *readbuf, ULONGEST offset, ULONGEST len,
                           int close_ldinfo_fd)
 {
   struct obstack obstack;
 
                                          const gdb_byte *ldi_buf,
                                          gdb_byte *readbuf,
                                          ULONGEST offset,
-                                         LONGEST len,
+                                         ULONGEST len,
                                          int close_ldinfo_fd);
 
 #endif /* RS6000_AIX_TDEP_H */
 
 rs6000_xfer_partial (struct target_ops *ops, enum target_object object,
                     const char *annex, gdb_byte *readbuf,
                     const gdb_byte *writebuf,
-                    ULONGEST offset, LONGEST len)
+                    ULONGEST offset, ULONGEST len)
 {
   pid_t pid = ptid_get_pid (inferior_ptid);
   int arch64 = ARCH64 ();
 rs6000_xfer_shared_libraries
   (struct target_ops *ops, enum target_object object,
    const char *annex, gdb_byte *readbuf, const gdb_byte *writebuf,
-   ULONGEST offset, LONGEST len)
+   ULONGEST offset, ULONGEST len)
 {
   gdb_byte *ldi_buf;
   ULONGEST result;
 
 sol_thread_xfer_partial (struct target_ops *ops, enum target_object object,
                          const char *annex, gdb_byte *readbuf,
                          const gdb_byte *writebuf,
-                        ULONGEST offset, LONGEST len)
+                        ULONGEST offset, ULONGEST len)
 {
   int retval;
   struct cleanup *old_chain;
 
 static LONGEST
 sparc_xfer_wcookie (struct target_ops *ops, enum target_object object,
                    const char *annex, gdb_byte *readbuf,
-                   const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                   const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   unsigned long wcookie = 0;
   char *buf = (char *)&wcookie;
 static LONGEST
 sparc_xfer_partial (struct target_ops *ops, enum target_object object,
                    const char *annex, gdb_byte *readbuf,
-                   const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                   const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   if (object == TARGET_OBJECT_WCOOKIE)
     return sparc_xfer_wcookie (ops, object, annex, readbuf, writebuf, 
 
 static LONGEST
 spu_proc_xfer_spu (const char *annex, gdb_byte *readbuf,
                   const gdb_byte *writebuf,
-                  ULONGEST offset, LONGEST len)
+                  ULONGEST offset, ULONGEST len)
 {
   char buf[128];
   int fd = 0;
 spu_xfer_partial (struct target_ops *ops,
                  enum target_object object, const char *annex,
                  gdb_byte *readbuf, const gdb_byte *writebuf,
-                 ULONGEST offset, LONGEST len)
+                 ULONGEST offset, ULONGEST len)
 {
   if (object == TARGET_OBJECT_SPU)
     return spu_proc_xfer_spu (annex, readbuf, writebuf, offset, len);
 
 static LONGEST
 spu_xfer_partial (struct target_ops *ops, enum target_object object,
                  const char *annex, gdb_byte *readbuf,
-                 const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                 const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   struct target_ops *ops_beneath = find_target_beneath (ops);
   while (ops_beneath && !ops_beneath->to_xfer_partial)
 
 
 static LONGEST
 target_read_live_memory (enum target_object object,
-                        ULONGEST memaddr, gdb_byte *myaddr, LONGEST len)
+                        ULONGEST memaddr, gdb_byte *myaddr, ULONGEST len)
 {
   LONGEST ret;
   struct cleanup *cleanup;
 memory_xfer_live_readonly_partial (struct target_ops *ops,
                                   enum target_object object,
                                   gdb_byte *readbuf, ULONGEST memaddr,
-                                  LONGEST len)
+                                  ULONGEST len)
 {
   struct target_section *secp;
   struct target_section_table *table;
 static LONGEST
 memory_xfer_partial_1 (struct target_ops *ops, enum target_object object,
                       void *readbuf, const void *writebuf, ULONGEST memaddr,
-                      LONGEST len)
+                      ULONGEST len)
 {
   LONGEST res;
   int reg_len;
 static LONGEST
 memory_xfer_partial (struct target_ops *ops, enum target_object object,
                     void *readbuf, const void *writebuf, ULONGEST memaddr,
-                    LONGEST len)
+                    ULONGEST len)
 {
   int res;
 
 target_xfer_partial (struct target_ops *ops,
                     enum target_object object, const char *annex,
                     gdb_byte *readbuf, const gdb_byte *writebuf,
-                    ULONGEST offset, LONGEST len)
+                    ULONGEST offset, ULONGEST len)
 {
   LONGEST retval;
 
                          host_address_to_string (readbuf),
                          host_address_to_string (writebuf),
                          core_addr_to_string_nz (offset),
-                         plongest (len), plongest (retval));
+                         pulongest (len), plongest (retval));
 
       if (readbuf)
        myaddr = readbuf;
 static LONGEST
 default_xfer_partial (struct target_ops *ops, enum target_object object,
                      const char *annex, gdb_byte *readbuf,
-                     const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                     const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   if (object == TARGET_OBJECT_MEMORY
       && ops->deprecated_xfer_memory != NULL)
 static LONGEST
 current_xfer_partial (struct target_ops *ops, enum target_object object,
                      const char *annex, gdb_byte *readbuf,
-                     const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                     const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   if (ops->beneath != NULL)
     return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
 
                             gdb_byte *readbuf,
                             const gdb_byte *writebuf,
                             ULONGEST offset,
-                            LONGEST len);
+                            ULONGEST len);
 
 /* Request that OPS transfer up to LEN 8-bit bytes of the target's
    OBJECT.  The OFFSET, for a seekable object, specifies the
     LONGEST (*to_xfer_partial) (struct target_ops *ops,
                                enum target_object object, const char *annex,
                                gdb_byte *readbuf, const gdb_byte *writebuf,
-                               ULONGEST offset, LONGEST len);
+                               ULONGEST offset, ULONGEST len);
 
     /* Returns the memory map for the target.  A return value of NULL
        means that no memory map is available.  If a memory address
 
 static LONGEST
 tfile_xfer_partial (struct target_ops *ops, enum target_object object,
                    const char *annex, gdb_byte *readbuf,
-                   const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                   const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   /* We're only doing regular memory for now.  */
   if (object != TARGET_OBJECT_MEMORY)
 
 
 static LONGEST
 windows_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf,
-                    ULONGEST memaddr, LONGEST len)
+                    ULONGEST memaddr, ULONGEST len)
 {
   SIZE_T done = 0;
   BOOL success;
   if (writebuf != NULL)
     {
       DEBUG_MEM (("gdb: write target memory, %s bytes at %s\n",
-                 plongest (len), core_addr_to_string (memaddr)));
+                 pulongest (len), core_addr_to_string (memaddr)));
       success = WriteProcessMemory (current_process_handle,
                                    (LPVOID) (uintptr_t) memaddr, writebuf,
                                    len, &done);
   else
     {
       DEBUG_MEM (("gdb: read target memory, %s bytes at %s\n",
-                 plongest (len), core_addr_to_string (memaddr)));
+                 pulongest (len), core_addr_to_string (memaddr)));
       success = ReadProcessMemory (current_process_handle,
                                   (LPCVOID) (uintptr_t) memaddr, readbuf,
                                   len, &done);
 windows_xfer_shared_libraries (struct target_ops *ops,
                             enum target_object object, const char *annex,
                             gdb_byte *readbuf, const gdb_byte *writebuf,
-                            ULONGEST offset, LONGEST len)
+                            ULONGEST offset, ULONGEST len)
 {
   struct obstack obstack;
   const char *buf;
 static LONGEST
 windows_xfer_partial (struct target_ops *ops, enum target_object object,
                    const char *annex, gdb_byte *readbuf,
-                   const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+                   const gdb_byte *writebuf, ULONGEST offset, ULONGEST len)
 {
   switch (object)
     {