2010-12-31 Michael Snyder <msnyder@vmware.com>

[deliverable/binutils-gdb.git] / gdb / user-regs.c

diff --git a/gdb/user-regs.c b/gdb/user-regs.c
index 9de177f2843cc6a8bd4421cf804d56bec2986a7a..01073771af54ce4662ebae391b9b95bd936ee384 100644 (file)
--- a/gdb/user-regs.c
+++ b/gdb/user-regs.c
@@ -1,6 +1,7 @@
 /* User visible, per-frame registers, for GDB, the GNU debugger.
 
-   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
 
    Contributed by Red Hat.
 
@@ -8,7 +9,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,
@@ -17,9 +18,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 "user-regs.h"
@@ -31,17 +30,19 @@
 /* A table of user registers.
 
    User registers have regnum's that live above of the range [0
-   .. NUM_REGS + NUM_PSEUDO_REGS) (which is controlled by the target).
+   .. gdbarch_num_regs + gdbarch_num_pseudo_regs)
+   (which is controlled by the target).
    The target should never see a user register's regnum value.
 
    Always append, never delete.  By doing this, the relative regnum
-   (offset from NUM_REGS + NUM_PSEUDO_REGS) assigned to each user
-   register never changes.  */
+   (offset from gdbarch_num_regs + gdbarch_num_pseudo_regs)
+    assigned to each user  register never changes.  */
 
 struct user_reg
 {
   const char *name;
-  struct value *(*read) (struct frame_info * frame);
+  struct value *(*read) (struct frame_info * frame, const void *baton);
+  const void *baton;
   struct user_reg *next;
 };
 
@@ -59,7 +60,8 @@ struct gdb_user_regs
 
 static void
 append_user_reg (struct gdb_user_regs *regs, const char *name,
-                user_reg_read_ftype *read, struct user_reg *reg)
+                user_reg_read_ftype *read, const void *baton,
+                struct user_reg *reg)
 {
   /* The caller is responsible for allocating memory needed to store
      the register.  By doing this, the function can operate on a
@@ -67,6 +69,7 @@ append_user_reg (struct gdb_user_regs *regs, const char *name,
   gdb_assert (reg != NULL);
   reg->name = name;
   reg->read = read;
+  reg->baton = baton;
   reg->next = NULL;
   (*regs->last) = reg;
   regs->last = &(*regs->last)->next;
@@ -77,9 +80,10 @@ append_user_reg (struct gdb_user_regs *regs, const char *name,
 static struct gdb_user_regs builtin_user_regs = { NULL, &builtin_user_regs.first };
 
 void
-user_reg_add_builtin (const char *name, user_reg_read_ftype *read)
+user_reg_add_builtin (const char *name, user_reg_read_ftype *read,
+                     const void *baton)
 {
-  append_user_reg (&builtin_user_regs, name, read,
+  append_user_reg (&builtin_user_regs, name, read, baton,
                   XMALLOC (struct user_reg));
 }
 
@@ -92,27 +96,30 @@ static void *
 user_regs_init (struct gdbarch *gdbarch)
 {
   struct user_reg *reg;
-  struct gdb_user_regs *regs = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct gdb_user_regs);
+  struct gdb_user_regs *regs 
+    = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct gdb_user_regs);
+
   regs->last = &regs->first;
   for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next)
-    append_user_reg (regs, reg->name, reg->read,
+    append_user_reg (regs, reg->name, reg->read, reg->baton,
                     GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
   return regs;
 }
 
 void
 user_reg_add (struct gdbarch *gdbarch, const char *name,
-                user_reg_read_ftype *read)
+             user_reg_read_ftype *read, const void *baton)
 {
   struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+
   if (regs == NULL)
     {
       /* ULGH, called during architecture initialization.  Patch
          things up.  */
       regs = user_regs_init (gdbarch);
-      set_gdbarch_data (gdbarch, user_regs_data, regs);
+      deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs);
     }
-  append_user_reg (regs, name, read,
+  append_user_reg (regs, name, read, baton,
                   GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
 }
 
@@ -130,9 +137,11 @@ user_reg_map_name_to_regnum (struct gdbarch *gdbarch, const char *name,
     int i;
     int maxregs = (gdbarch_num_regs (gdbarch)
                   + gdbarch_num_pseudo_regs (gdbarch));
+
     for (i = 0; i < maxregs; i++)
       {
        const char *regname = gdbarch_register_name (gdbarch, i);
+
        if (regname != NULL && len == strlen (regname)
            && strncmp (regname, name, len) == 0)
          {
@@ -146,12 +155,14 @@ user_reg_map_name_to_regnum (struct gdbarch *gdbarch, const char *name,
     struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
     struct user_reg *reg;
     int nr;
+
     for (nr = 0, reg = regs->first; reg != NULL; reg = reg->next, nr++)
       {
        if ((len < 0 && strcmp (reg->name, name))
            || (len == strlen (reg->name)
                && strncmp (reg->name, name, len) == 0))
-         return NUM_REGS + NUM_PSEUDO_REGS + nr;
+         return gdbarch_num_regs (gdbarch)
+                + gdbarch_num_pseudo_regs (gdbarch) + nr;
       }
   }
 
@@ -163,6 +174,7 @@ usernum_to_user_reg (struct gdbarch *gdbarch, int usernum)
 {
   struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
   struct user_reg *reg;
+
   for (reg = regs->first; reg != NULL; reg = reg->next)
     {
       if (usernum == 0)
@@ -177,6 +189,7 @@ user_reg_map_regnum_to_name (struct gdbarch *gdbarch, int regnum)
 {
   int maxregs = (gdbarch_num_regs (gdbarch)
                 + gdbarch_num_pseudo_regs (gdbarch));
+
   if (regnum < 0)
     return NULL;
   else if (regnum < maxregs)
@@ -198,8 +211,9 @@ value_of_user_reg (int regnum, struct frame_info *frame)
   int maxregs = (gdbarch_num_regs (gdbarch)
                 + gdbarch_num_pseudo_regs (gdbarch));
   struct user_reg *reg = usernum_to_user_reg (gdbarch, regnum - maxregs);
+
   gdb_assert (reg != NULL);
-  return reg->read (frame);
+  return reg->read (frame, reg->baton);
 }
 
 extern initialize_file_ftype _initialize_user_regs; /* -Wmissing-prototypes */
@@ -207,5 +221,5 @@ extern initialize_file_ftype _initialize_user_regs; /* -Wmissing-prototypes */
 void
 _initialize_user_regs (void)
 {
-  user_regs_data = register_gdbarch_data (user_regs_init);
+  user_regs_data = gdbarch_data_register_post_init (user_regs_init);
 }