Fix ARI warning about function names in first column.

[deliverable/binutils-gdb.git] / gdb / spu-multiarch.c

diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c
index b5d2ee610fceb64720d3c1b6ec6993a647ea3a27..647cfd1c8387063201f18ceebeb3c81b5576bafa 100644 (file)
--- a/gdb/spu-multiarch.c
+++ b/gdb/spu-multiarch.c
@@ -1,5 +1,5 @@
 /* Cell SPU GNU/Linux multi-architecture debugging support.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    Contributed by Ulrich Weigand <uweigand@de.ibm.com>.
 
@@ -7,7 +7,7 @@
 
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "gdbcore.h"
@@ -261,14 +259,35 @@ spu_xfer_partial (struct target_ops *ops, enum target_object object,
     {
       int fd = SPUADDR_SPU (offset);
       CORE_ADDR addr = SPUADDR_ADDR (offset);
-      char mem_annex[32];
+      char mem_annex[32], lslr_annex[32];
+      gdb_byte buf[32];
+      ULONGEST lslr;
+      LONGEST ret;
 
-      if (fd >= 0 && addr < SPU_LS_SIZE)
+      if (fd >= 0)
        {
          xsnprintf (mem_annex, sizeof mem_annex, "%d/mem", fd);
+         ret = ops_beneath->to_xfer_partial (ops_beneath, TARGET_OBJECT_SPU,
+                                             mem_annex, readbuf, writebuf,
+                                             addr, len);
+         if (ret > 0)
+           return ret;
+
+         /* SPU local store access wraps the address around at the
+            local store limit.  We emulate this here.  To avoid needing
+            an extra access to retrieve the LSLR, we only do that after
+            trying the original address first, and getting end-of-file.  */
+         xsnprintf (lslr_annex, sizeof lslr_annex, "%d/lslr", fd);
+         memset (buf, 0, sizeof buf);
+         if (ops_beneath->to_xfer_partial (ops_beneath, TARGET_OBJECT_SPU,
+                                           lslr_annex, buf, NULL,
+                                           0, sizeof buf) <= 0)
+           return ret;
+
+         lslr = strtoulst (buf, NULL, 16);
          return ops_beneath->to_xfer_partial (ops_beneath, TARGET_OBJECT_SPU,
                                               mem_annex, readbuf, writebuf,
-                                              addr, len);
+                                              addr & lslr, len);
        }
     }