Change to_xfer_partial 'len' type to ULONGEST.

[deliverable/binutils-gdb.git] / gdb / spu-linux-nat.c

diff --git a/gdb/spu-linux-nat.c b/gdb/spu-linux-nat.c
index 9441e02a5e1488afac2e178d65e96d07e7733e56..784939be419e20bfa853f2d5758eaa872dd43174 100644 (file)
--- a/gdb/spu-linux-nat.c
+++ b/gdb/spu-linux-nat.c
@@ -231,7 +231,7 @@ parse_spufs_run (int *fd, ULONGEST *addr)
 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;
@@ -359,7 +359,7 @@ spu_symbol_file_add_from_memory (int inferior_fd)
   ULONGEST addr;
   struct bfd *nbfd;
 
-  char id[128];
+  gdb_byte id[128];
   char annex[32];
   int len;
 
@@ -369,7 +369,7 @@ spu_symbol_file_add_from_memory (int inferior_fd)
   if (len <= 0 || len >= sizeof id)
     return;
   id[len] = 0;
-  addr = strtoulst (id, NULL, 16);
+  addr = strtoulst ((const char *) id, NULL, 16);
   if (!addr)
     return;
 
@@ -379,7 +379,8 @@ spu_symbol_file_add_from_memory (int inferior_fd)
     {
       struct cleanup *cleanup = make_cleanup_bfd_unref (nbfd);
 
-      symbol_file_add_from_bfd (nbfd, SYMFILE_VERBOSE | SYMFILE_MAINLINE,
+      symbol_file_add_from_bfd (nbfd, bfd_get_filename (nbfd),
+                               SYMFILE_VERBOSE | SYMFILE_MAINLINE,
                                NULL, 0, NULL);
       do_cleanups (cleanup);
     }
@@ -562,7 +563,7 @@ 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)
+                 ULONGEST offset, ULONGEST len)
 {
   if (object == TARGET_OBJECT_SPU)
     return spu_proc_xfer_spu (annex, readbuf, writebuf, offset, len);
@@ -595,7 +596,7 @@ spu_xfer_partial (struct target_ops *ops,
       if (spu_proc_xfer_spu (lslr_annex, buf, NULL, 0, sizeof buf) <= 0)
        return ret;
 
-      lslr = strtoulst (buf, NULL, 16);
+      lslr = strtoulst ((const char *) buf, NULL, 16);
       return spu_proc_xfer_spu (mem_annex, readbuf, writebuf,
                                offset & lslr, len);
     }