* corelow.c (core_xfer_partial): Pass writebuf to

[deliverable/binutils-gdb.git] / gdb / auxv.c

diff --git a/gdb/auxv.c b/gdb/auxv.c
index d09fc38b77600b6aba1358887526612c6d52277c..1bc6721cbc2766cb14bb3386ef45d3530286f686 100644 (file)
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -1,12 +1,12 @@
 /* Auxiliary vector support for GDB, the GNU debugger.
 
-   Copyright 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    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
+   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,
@@ -15,9 +15,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 "target.h"
@@ -45,8 +43,8 @@ LONGEST
 procfs_xfer_auxv (struct target_ops *ops,
                  int /* enum target_object */ object,
                  const char *annex,
-                 void *readbuf,
-                 const void *writebuf,
+                 gdb_byte *readbuf,
+                 const gdb_byte *writebuf,
                  ULONGEST offset,
                  LONGEST len)
 {
@@ -76,53 +74,16 @@ procfs_xfer_auxv (struct target_ops *ops,
   return n;
 }
 
-/* Read all the auxv data into a contiguous xmalloc'd buffer,
-   stored in *DATA.  Return the size in bytes of this data.
-   If zero, there is no data and *DATA is null.
-   if < 0, there was an error and *DATA is null.  */
-LONGEST
-target_auxv_read (struct target_ops *ops, char **data)
-{
-  size_t auxv_alloc = 512, auxv_pos = 0;
-  char *auxv = xmalloc (auxv_alloc);
-  int n;
-
-  while (1)
-    {
-      n = target_read_partial (ops, TARGET_OBJECT_AUXV,
-                              NULL, &auxv[auxv_pos], 0,
-                              auxv_alloc - auxv_pos);
-      if (n <= 0)
-       break;
-      auxv_pos += n;
-      if (auxv_pos < auxv_alloc) /* Read all there was.  */
-       break;
-      gdb_assert (auxv_pos == auxv_alloc);
-      auxv_alloc *= 2;
-      auxv = xrealloc (auxv, auxv_alloc);
-    }
-
-  if (auxv_pos == 0)
-    {
-      xfree (auxv);
-      *data = NULL;
-      return n;
-    }
-
-  *data = auxv;
-  return auxv_pos;
-}
-
 /* Read one auxv entry from *READPTR, not reading locations >= ENDPTR.
    Return 0 if *READPTR is already at the end of the buffer.
    Return -1 if there is insufficient buffer for a whole entry.
    Return 1 if an entry was read into *TYPEP and *VALP.  */
 int
-target_auxv_parse (struct target_ops *ops, char **readptr, char *endptr,
-                  CORE_ADDR *typep, CORE_ADDR *valp)
+target_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
+                  gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp)
 {
   const int sizeof_auxv_field = TYPE_LENGTH (builtin_type_void_data_ptr);
-  char *ptr = *readptr;
+  gdb_byte *ptr = *readptr;
 
   if (endptr == ptr)
     return 0;
@@ -147,9 +108,9 @@ int
 target_auxv_search (struct target_ops *ops, CORE_ADDR match, CORE_ADDR *valp)
 {
   CORE_ADDR type, val;
-  char *data;
-  int n = target_auxv_read (ops, &data);
-  char *ptr = data;
+  gdb_byte *data;
+  LONGEST n = target_read_alloc (ops, TARGET_OBJECT_AUXV, NULL, &data);
+  gdb_byte *ptr = data;
   int ents = 0;
 
   if (n <= 0)
@@ -183,9 +144,10 @@ int
 fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
 {
   CORE_ADDR type, val;
-  char *data;
-  int len = target_auxv_read (ops, &data);
-  char *ptr = data;
+  gdb_byte *data;
+  LONGEST len = target_read_alloc (ops, TARGET_OBJECT_AUXV, NULL,
+                                  &data);
+  gdb_byte *ptr = data;
   int ents = 0;
 
   if (len <= 0)