From: Simon Marchi Date: Fri, 1 Dec 2023 16:27:23 +0000 (-0500) Subject: gdb: make put_frame_register take the next frame X-Git-Tag: binutils-2_42~592 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=584468de6c4c305eac9e89801b82406a3fdb3c3b;p=thirdparty%2Fbinutils-gdb.git 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 --- diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index eaf2a7e9794..79944175810 100644 --- 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); } diff --git a/gdb/frame.c b/gdb/frame.c index 61d6822ecc1..44c4906e9cc 100644 --- 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 buf) +put_frame_register (frame_info_ptr next_frame, int regnum, + gdb::array_view 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 4117e169379..1d870d619ca 100644 --- 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 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 85ab87b9f6f..4377b620392 100644 --- 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 b39ca2adef5..77dc5a008d5 100644 --- 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); } diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index f778c092537..3bede2644c0 100644 --- 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 2e8043af0e0..8bbfa4bd0b1 100644 --- 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); } diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index adaa091bda1..dbdf8a668b8 100644 --- 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 cbbaf6d83a1..c43039302bc 100644 --- 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 *