gdb: make put_frame_register take the next frame

Similar to the previous patches, change put_frame_register to take the
"next frame" instead of "this frame".

Change-Id: I062fd4663b8f54f0fc7bbf39c860b7341363821b
Reviewed-By: John Baldwin <jhb@FreeBSD.org>

diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index eaf2a7e979496aa5f0f2475a9eb071f76b27f5bb..7994417581030feda55151c4f11e5213a805d05d 100644 (file)
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -269,8 +269,9 @@ alpha_value_to_register (frame_info_ptr frame, int regnum,
 
   gdb_byte out[ALPHA_REGISTER_SIZE];
   alpha_lds (get_frame_arch (frame), out, in);
+
   auto out_view = gdb::make_array_view (out, reg_size);
-  put_frame_register (frame, regnum, out_view);
+  put_frame_register (get_next_frame_sentinel_okay (frame), regnum, out_view);
 }
 
 \f

diff --git a/gdb/frame.c b/gdb/frame.c
index 61d6822ecc1aa988aac5488444a10d42bcd16eaf..44c4906e9cc15ead3c921ce3d9c6e78b5210b173 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1398,10 +1398,10 @@ read_frame_register_unsigned (frame_info_ptr frame, int regnum,
 }
 
 void
-put_frame_register (frame_info_ptr frame, int regnum,
-                   gdb::array_view<const gdb_byte> buf)
+put_frame_register (frame_info_ptr next_frame, int regnum,
+                    gdb::array_view<const gdb_byte> buf)
 {
-  struct gdbarch *gdbarch = get_frame_arch (frame);
+  gdbarch *gdbarch = frame_unwind_arch (next_frame);
   int realnum;
   int optim;
   int unavail;
@@ -1411,8 +1411,8 @@ put_frame_register (frame_info_ptr frame, int regnum,
 
   gdb_assert (buf.size () == size);
 
-  frame_register_unwind (get_next_frame_sentinel_okay (frame), regnum, &optim,
-                        &unavail, &lval, &addr, &realnum, nullptr);
+  frame_register_unwind (next_frame, regnum, &optim, &unavail, &lval, &addr,
+                        &realnum, nullptr);
   if (optim)
     error (_("Attempt to assign to a register that was not saved."));
   switch (lval)
@@ -1557,7 +1557,8 @@ put_frame_register_bytes (frame_info_ptr frame, int regnum,
                                    buffer.size ());
 
       if (curr_len == register_size (gdbarch, regnum))
-       put_frame_register (frame, regnum, buffer.slice (0, curr_len));
+       put_frame_register (get_next_frame_sentinel_okay (frame), regnum,
+                           buffer.slice (0, curr_len));
       else
        {
          value *value
@@ -1567,7 +1568,8 @@ put_frame_register_bytes (frame_info_ptr frame, int regnum,
 
          copy (buffer.slice (0, curr_len),
                value->contents_writeable ().slice (offset, curr_len));
-         put_frame_register (frame, regnum, value->contents_raw ());
+         put_frame_register (get_next_frame_sentinel_okay (frame), regnum,
+                             value->contents_raw ());
          release_value (value);
        }
 

diff --git a/gdb/frame.h b/gdb/frame.h
index 4117e169379a654755412ae6a21144603d65b808..1d870d619ca53767fc07b2eee2625042ead1e497 100644 (file)
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -727,10 +727,10 @@ extern ULONGEST get_frame_register_unsigned (frame_info_ptr frame,
 extern bool read_frame_register_unsigned (frame_info_ptr frame,
                                          int regnum, ULONGEST *val);
 
-/* The reverse.  Store a register value relative to the specified
-   frame.  Note: this call makes the frame's state undefined.  The
-   register and frame caches must be flushed.  */
-extern void put_frame_register (frame_info_ptr frame, int regnum,
+/* The reverse.  Store a register value relative to NEXT_FRAME's previous frame.
+   Note: this call makes the frame's state undefined.  The register and frame
+   caches must be flushed.  */
+extern void put_frame_register (frame_info_ptr next_frame, int regnum,
                                gdb::array_view<const gdb_byte> buf);
 
 /* Read LEN bytes from one or multiple registers starting with REGNUM

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 85ab87b9f6fe4a61996e917be98b549033ead229..4377b620392f831305af9c464728572d4dfe153c 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -3918,7 +3918,8 @@ i386_value_to_register (frame_info_ptr frame, int regnum,
       gdb_assert (register_size (get_frame_arch (frame), regnum) == 4);
 
       auto from_view = gdb::make_array_view (from, 4);
-      put_frame_register (frame, regnum, from_view);
+      put_frame_register (get_next_frame_sentinel_okay (frame), regnum,
+                         from_view);
       regnum = i386_next_regnum (regnum);
       len -= 4;
       from += 4;

diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index b39ca2adef5595a68bca5fc318ac5db07b6d69bf..77dc5a008d5f76193fb003d5f427810a5d464961 100644 (file)
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -400,7 +400,7 @@ i387_value_to_register (frame_info_ptr frame, int regnum,
   struct type *to_type = i387_ext_type (gdbarch);
   target_float_convert (from, type, to, to_type);
   auto to_view = gdb::make_array_view (to, to_type->length ());
-  put_frame_register (frame, regnum, to_view);
+  put_frame_register (get_next_frame_sentinel_okay (frame), regnum, to_view);
 }
 \f
 

diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index f778c092537be1e42a867109077623987f02722c..3bede2644c038779d183d9cf8749a82b3d979aad 100644 (file)
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -1248,7 +1248,7 @@ ia64_value_to_register (frame_info_ptr frame, int regnum,
   type *to_type = ia64_ext_type (gdbarch);
   target_float_convert (in, valtype, out, to_type);
   auto out_view = gdb::make_array_view (out, to_type->length ());
-  put_frame_register (frame, regnum, out_view);
+  put_frame_register (get_next_frame_sentinel_okay (frame), regnum, out_view);
 }
 
 

diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index 2e8043af0e061cdf3c2b3191e84dd1350aa2bf79..8bbfa4bd0b10b1631227178562548077f5c96145 100644 (file)
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -250,7 +250,7 @@ m68k_value_to_register (frame_info_ptr frame, int regnum,
   /* Convert from TYPE.  */
   target_float_convert (from, type, to, fpreg_type);
   auto to_view = gdb::make_array_view (to, fpreg_type->length ());
-  put_frame_register (frame, regnum, to_view);
+  put_frame_register (get_next_frame_sentinel_okay (frame), regnum, to_view);
 }
 
 \f

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index adaa091bda148a651efa1b69b9cac4fdef99dcb8..dbdf8a668b8f690e9204c4026fc06d12a730af6c 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -991,8 +991,9 @@ mips_value_to_register (frame_info_ptr frame, int regnum,
   if (mips_convert_register_float_case_p (gdbarch, regnum, type))
     {
       auto from_view = gdb::make_array_view (from, 8);
-      put_frame_register (frame, regnum, from_view.slice (4));
-      put_frame_register (frame, regnum + 1, from_view.slice (0, 4));
+      frame_info_ptr next_frame = get_next_frame_sentinel_okay (frame);
+      put_frame_register (next_frame, regnum, from_view.slice (4));
+      put_frame_register (next_frame, regnum + 1, from_view.slice (0, 4));
     }
   else if (mips_convert_register_gpreg_case_p (gdbarch, regnum, type))
     {

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index cbbaf6d83a19c7fe4820e4a671ca16e407ee212a..c43039302bc383a0defd56f667774ce0b701ab2a 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -2744,7 +2744,7 @@ rs6000_value_to_register (frame_info_ptr frame,
   struct type *to_type = builtin_type (gdbarch)->builtin_double;
   target_float_convert (from, type, to, to_type);
   auto to_view = gdb::make_array_view (to, to_type->length ());
-  put_frame_register (frame, regnum, to_view);
+  put_frame_register (get_next_frame_sentinel_okay (frame), regnum, to_view);
 }
 
 static struct value *