2008-11-12 Tristan Gingold <gingold@adacore.com>

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

diff --git a/gdb/auxv.c b/gdb/auxv.c
index d822c7f24aa47544ac09cf3d84e1aef2785a0ae1..121a7497311349da492c559fc4994d088d0968c8 100644 (file)
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -1,12 +1,12 @@
 /* Auxiliary vector support for GDB, the GNU debugger.
 
-   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007, 2008 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "target.h"
@@ -81,10 +79,11 @@ procfs_xfer_auxv (struct target_ops *ops,
    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, gdb_byte **readptr,
+default_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);
+  const int sizeof_auxv_field = gdbarch_ptr_bit (target_gdbarch)
+                               / TARGET_CHAR_BIT;
   gdb_byte *ptr = *readptr;
 
   if (endptr == ptr)
@@ -102,6 +101,22 @@ target_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
   return 1;
 }
 
+/* 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, gdb_byte **readptr,
+                  gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp)
+{
+  struct target_ops *t;
+  for (t = ops; t != NULL; t = t->beneath)
+    if (t->to_auxv_parse != NULL)
+      return t->to_auxv_parse (t, readptr, endptr, typep, valp);
+  
+  return default_auxv_parse (ops, readptr, endptr, typep, valp);
+}
+
 /* Extract the auxiliary vector entry with a_type matching MATCH.
    Return zero if no such entry was found, or -1 if there was
    an error getting the information.  On success, return 1 after
@@ -157,7 +172,6 @@ fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
 
   while (target_auxv_parse (ops, &ptr, data + len, &type, &val) > 0)
     {
-      extern int addressprint;
       const char *name = "???";
       const char *description = "";
       enum { dec, hex, str } flavor = hex;
@@ -210,26 +224,34 @@ fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
               _("Canonicalized file name given to execve"), str);
          TAG (AT_SUN_MMU, _("String for name of MMU module"), str);
          TAG (AT_SUN_LDDATA, _("Dynamic linker's data segment address"), hex);
+         TAG (AT_SUN_AUXFLAGS,
+              _("AF_SUN_ flags passed from the kernel"), hex);
        }
 
       fprintf_filtered (file, "%-4s %-20s %-30s ",
-                       paddr_d (type), name, description);
+                       plongest (type), name, description);
       switch (flavor)
        {
        case dec:
-         fprintf_filtered (file, "%s\n", paddr_d (val));
+         fprintf_filtered (file, "%s\n", plongest (val));
          break;
        case hex:
          fprintf_filtered (file, "0x%s\n", paddr_nz (val));
          break;
        case str:
-         if (addressprint)
-           fprintf_filtered (file, "0x%s", paddr_nz (val));
-         val_print_string (val, -1, 1, file);
-         fprintf_filtered (file, "\n");
+         {
+           struct value_print_options opts;
+           get_user_print_options (&opts);
+           if (opts.addressprint)
+             fprintf_filtered (file, "0x%s", paddr_nz (val));
+           val_print_string (val, -1, 1, file, &opts);
+           fprintf_filtered (file, "\n");
+         }
          break;
        }
       ++ents;
+      if (type == AT_NULL)
+       break;
     }
 
   xfree (data);