gdb: remove VALUE_NEXT_FRAME_ID, add value::next_frame_id

Remove VALUE_NEXT_FRAME_ID, replace it with a method on struct value.  Set
`m_location.reg.next_frame_id` directly from value::allocate_register_lazy,
which is fine because allocate_register_lazy is a static creation
function for struct value.

Change-Id: Ic9f0f239c166a88dccfee836f9f51871e67548e6

diff --git a/gdb/findvar.c b/gdb/findvar.c
index ba9377e369a96e589112dc1276b7c27b3368a483..91ee2266001877be6f3e98e91f0d6a4971dd7c02 100644 (file)
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -779,7 +779,7 @@ read_frame_register_value (value *value)
 {
   gdb_assert (value->lval () == lval_register);
 
-  frame_info_ptr next_frame = frame_find_by_id (VALUE_NEXT_FRAME_ID (value));
+  frame_info_ptr next_frame = frame_find_by_id (value->next_frame_id ());
   gdb_assert (next_frame != nullptr);
 
   gdbarch *gdbarch = frame_unwind_arch (next_frame);

diff --git a/gdb/valops.c b/gdb/valops.c
index 049314cf7db5d6679bd6e3ddbfa595971321f49a..5a5b3f14ad44f354134c7bacd9e20dc882151b39 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -1193,7 +1193,7 @@ value_assign (struct value *toval, struct value *fromval)
 
     case lval_register:
       {
-       frame_info_ptr next_frame = frame_find_by_id (VALUE_NEXT_FRAME_ID (toval));
+       frame_info_ptr next_frame = frame_find_by_id (toval->next_frame_id ());
 
        int value_reg = VALUE_REGNUM (toval);
 
@@ -1410,11 +1410,10 @@ address_of_variable (struct symbol *var, const struct block *b)
     {
     case lval_register:
       {
-       frame_info_ptr frame;
        const char *regname;
 
-       frame = frame_find_by_id (VALUE_NEXT_FRAME_ID (val));
-       gdb_assert (frame);
+       frame_info_ptr frame = frame_find_by_id (val->next_frame_id ());
+       gdb_assert (frame != nullptr);
 
        regname = gdbarch_register_name (get_frame_arch (frame),
                                         VALUE_REGNUM (val));

diff --git a/gdb/value.c b/gdb/value.c
index 7d51396a0e3a41e85843bdd21804c90b2b55b58e..87eb6ef337fe815d3c6d6a660f63c3332a282ad5 100644 (file)
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -972,7 +972,7 @@ value::allocate_register_lazy (frame_info_ptr next_frame, int regnum,
 
   result->set_lval (lval_register);
   VALUE_REGNUM (result) = regnum;
-  VALUE_NEXT_FRAME_ID (result) = get_frame_id (next_frame);
+  result->m_location.reg.next_frame_id = get_frame_id (next_frame);
 
   return result;
 }
@@ -1421,13 +1421,6 @@ value::set_address (CORE_ADDR addr)
   m_location.address = addr;
 }
 
-struct frame_id *
-value::deprecated_next_frame_id_hack ()
-{
-  gdb_assert (m_lval == lval_register);
-  return &m_location.reg.next_frame_id;
-}
-
 int *
 value::deprecated_regnum_hack ()
 {
@@ -3928,7 +3921,7 @@ value::fetch_lazy_memory ()
 void
 value::fetch_lazy_register ()
 {
-  frame_info_ptr next_frame;
+ 
   int regnum;
   struct type *type = check_typedef (this->type ());
   struct value *new_val = this;
@@ -3941,13 +3934,12 @@ value::fetch_lazy_register ()
 
   while (new_val->lval () == lval_register && new_val->lazy ())
     {
-      struct frame_id next_frame_id = VALUE_NEXT_FRAME_ID (new_val);
+      frame_id next_frame_id = new_val->next_frame_id ();
+      frame_info_ptr next_frame = frame_find_by_id (next_frame_id);
+      gdb_assert (next_frame != NULL);
 
-      next_frame = frame_find_by_id (next_frame_id);
       regnum = VALUE_REGNUM (new_val);
 
-      gdb_assert (next_frame != NULL);
-
       /* Convertible register routines are used for multi-register
         values and for interpretation in different types
         (e.g. float or int from a double register).  Lazy
@@ -3956,12 +3948,6 @@ value::fetch_lazy_register ()
       gdb_assert (!gdbarch_convert_register_p (get_frame_arch (next_frame),
                                               regnum, type));
 
-      /* FRAME was obtained, above, via VALUE_NEXT_FRAME_ID.
-        Since a "->next" operation was performed when setting
-        this field, we do not need to perform a "next" operation
-        again when unwinding the register.  That's why
-        frame_unwind_register_value() is called here instead of
-        get_frame_register_value().  */
       new_val = frame_unwind_register_value (next_frame, regnum);
 
       /* If we get another lazy lval_register value, it means the
@@ -3976,7 +3962,7 @@ value::fetch_lazy_register ()
         in this situation.  */
       if (new_val->lval () == lval_register
          && new_val->lazy ()
-         && VALUE_NEXT_FRAME_ID (new_val) == next_frame_id)
+         && new_val->next_frame_id () == next_frame_id)
        internal_error (_("infinite loop while fetching a register"));
     }
 
@@ -3994,12 +3980,10 @@ value::fetch_lazy_register ()
 
   if (frame_debug)
     {
-      struct gdbarch *gdbarch;
-      frame_info_ptr frame;
-      frame = frame_find_by_id (VALUE_NEXT_FRAME_ID (this));
+      frame_info_ptr frame = frame_find_by_id (this->next_frame_id ());
       frame = get_prev_frame_always (frame);
       regnum = VALUE_REGNUM (this);
-      gdbarch = get_frame_arch (frame);
+      gdbarch *gdbarch = get_frame_arch (frame);
 
       string_file debug_file;
       gdb_printf (&debug_file,

diff --git a/gdb/value.h b/gdb/value.h
index c56504bd738b47e6239c39586c77c3d97d928f72..0e8c7595fe13aebc72d1ccafe24ec0155788a960 100644 (file)
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -373,7 +373,15 @@ public:
   struct internalvar **deprecated_internalvar_hack ()
   { return &m_location.internalvar; }
 
-  struct frame_id *deprecated_next_frame_id_hack ();
+  /* Return this value's next frame id.
+
+     The value must be of lval == lval_register.  */
+  frame_id next_frame_id ()
+  {
+    gdb_assert (m_lval == lval_register);
+
+    return m_location.reg.next_frame_id;
+  }
 
   int *deprecated_regnum_hack ();
 
@@ -964,12 +972,6 @@ extern void error_value_optimized_out (void);
 /* Pointer to internal variable.  */
 #define VALUE_INTERNALVAR(val) (*((val)->deprecated_internalvar_hack ()))
 
-/* Frame ID of "next" frame to which a register value is relative.  A
-   register value is indicated by VALUE_LVAL being set to lval_register.
-   So, if the register value is found relative to frame F, then the
-   frame id of F->next will be stored in VALUE_NEXT_FRAME_ID.  */
-#define VALUE_NEXT_FRAME_ID(val) (*((val)->deprecated_next_frame_id_hack ()))
-
 /* Register number if the value is from a register.  */
 #define VALUE_REGNUM(val) (*((val)->deprecated_regnum_hack ()))