Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

gdb: make get_frame_register_bytes take the next frame

Browse Source 
Similar to the previous patches, change get_frame_register_bytes to take
the "next frame" instead of "this frame".

Change-Id: Ie8f35042bfa6e93565fcefaee71b6b3903f0fe9f
Reviewed-By: John Baldwin <jhb@FreeBSD.org>
This commit is contained in:
Simon Marchi
2023-12-01 11:27:25 -05:00
parent 534dcbcb80
commit 9fc79b4236
10 changed files with 50 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gdb/dwarf2/expr.c
View File

@@ -204,8 +204,9 @@ rw_pieced_value (value *v, value *from, bool check_optimized)
{ {
case DWARF_VALUE_REGISTER: case DWARF_VALUE_REGISTER:
{ {
frame_info_ptr frame = frame_find_by_id (c->frame_id); frame_info_ptr next_frame
gdbarch *arch = get_frame_arch (frame); = get_next_frame_sentinel_okay (frame_find_by_id (c->frame_id));
gdbarch *arch = frame_unwind_arch (next_frame);
int gdb_regnum = dwarf_reg_to_regnum_or_error (arch, p->v.regno); int gdb_regnum = dwarf_reg_to_regnum_or_error (arch, p->v.regno);
ULONGEST reg_bits = 8 * register_size (arch, gdb_regnum); ULONGEST reg_bits = 8 * register_size (arch, gdb_regnum);
int optim, unavail; int optim, unavail;
@@ -225,9 +226,9 @@ rw_pieced_value (value *v, value *from, bool check_optimized)
if (from == nullptr) if (from == nullptr)
{ {
/* Read mode. */ /* Read mode. */
if (!get_frame_register_bytes (frame, gdb_regnum, if (!get_frame_register_bytes (next_frame, gdb_regnum,
bits_to_skip / 8, bits_to_skip / 8, buffer,
buffer, &optim, &unavail)) &optim, &unavail))
{ {
if (optim) if (optim)
{ {
@@ -254,9 +255,9 @@ rw_pieced_value (value *v, value *from, bool check_optimized)
{ {
/* Data is copied non-byte-aligned into the register. /* Data is copied non-byte-aligned into the register.
Need some bits from original register value. */ Need some bits from original register value. */
get_frame_register_bytes (frame, gdb_regnum, get_frame_register_bytes (next_frame, gdb_regnum,
bits_to_skip / 8, bits_to_skip / 8, buffer, &optim,
buffer, &optim, &unavail); &unavail);
if (optim) if (optim)
throw_error (OPTIMIZED_OUT_ERROR, throw_error (OPTIMIZED_OUT_ERROR,
_("Can't do read-modify-write to " _("Can't do read-modify-write to "
@@ -272,9 +273,8 @@ rw_pieced_value (value *v, value *from, bool check_optimized)
copy_bitwise (buffer.data (), bits_to_skip % 8, copy_bitwise (buffer.data (), bits_to_skip % 8,
from_contents, offset, from_contents, offset,
this_size_bits, bits_big_endian); this_size_bits, bits_big_endian);
put_frame_register_bytes put_frame_register_bytes (next_frame, gdb_regnum,
(get_next_frame_sentinel_okay (frame), gdb_regnum, bits_to_skip / 8, buffer);
bits_to_skip / 8, buffer);
} }
} }
break; break;

16
gdb/frame.c
View File

@@ -1456,12 +1456,11 @@ deprecated_frame_register_read (frame_info_ptr frame, int regnum,
} }
bool bool
get_frame_register_bytes (frame_info_ptr frame, int regnum, get_frame_register_bytes (frame_info_ptr next_frame, int regnum,
CORE_ADDR offset, CORE_ADDR offset, gdb::array_view<gdb_byte> buffer,
gdb::array_view<gdb_byte> buffer,
int *optimizedp, int *unavailablep) int *optimizedp, int *unavailablep)
{ {
struct gdbarch *gdbarch = get_frame_arch (frame); gdbarch *gdbarch = frame_unwind_arch (next_frame);
/* Skip registers wholly inside of OFFSET. */ /* Skip registers wholly inside of OFFSET. */
while (offset >= register_size (gdbarch, regnum)) while (offset >= register_size (gdbarch, regnum))
@@ -1499,17 +1498,14 @@ get_frame_register_bytes (frame_info_ptr frame, int regnum,
CORE_ADDR addr; CORE_ADDR addr;
int realnum; int realnum;
frame_register_unwind (get_next_frame_sentinel_okay (frame), regnum, frame_register_unwind (next_frame, regnum, optimizedp, unavailablep,
optimizedp, unavailablep, &lval, &addr, &lval, &addr, &realnum, buffer.data ());
&realnum, buffer.data ());
if (*optimizedp || *unavailablep) if (*optimizedp || *unavailablep)
return false; return false;
} }
else else
{ {
struct value *value value *value = frame_unwind_register_value (next_frame, regnum);
= frame_unwind_register_value (frame_info_ptr (frame->next),
regnum);
gdb_assert (value != NULL); gdb_assert (value != NULL);
*optimizedp = value->optimized_out (); *optimizedp = value->optimized_out ();
*unavailablep = !value->entirely_available (); *unavailablep = !value->entirely_available ();

10
gdb/frame.h
View File

@@ -733,11 +733,11 @@ extern bool read_frame_register_unsigned (frame_info_ptr frame,
extern void put_frame_register (frame_info_ptr next_frame, int regnum, extern void put_frame_register (frame_info_ptr next_frame, int regnum,
gdb::array_view<const gdb_byte> buf); gdb::array_view<const gdb_byte> buf);
/* Read LEN bytes from one or multiple registers starting with REGNUM /* Read LEN bytes from one or multiple registers starting with REGNUM in
in frame FRAME, starting at OFFSET, into BUF. If the register NEXT_FRAME's previous frame, starting at OFFSET, into BUF. If the register
contents are optimized out or unavailable, set *OPTIMIZEDP, contents are optimized out or unavailable, set *OPTIMIZEDP, *UNAVAILABLEP
*UNAVAILABLEP accordingly. */ accordingly. */
extern bool get_frame_register_bytes (frame_info_ptr frame, int regnum, extern bool get_frame_register_bytes (frame_info_ptr next_frame, int regnum,
CORE_ADDR offset, CORE_ADDR offset,
gdb::array_view<gdb_byte> buffer, gdb::array_view<gdb_byte> buffer,
int *optimizedp, int *unavailablep); int *optimizedp, int *unavailablep);

8
gdb/i386-tdep.c
View File

@@ -3877,10 +3877,10 @@ i386_register_to_value (frame_info_ptr frame, int regnum,
gdb_assert (regnum != -1); gdb_assert (regnum != -1);
gdb_assert (register_size (gdbarch, regnum) == 4); gdb_assert (register_size (gdbarch, regnum) == 4);
if (!get_frame_register_bytes (frame, regnum, 0, auto to_view
gdb::make_array_view (to, = gdb::make_array_view (to, register_size (gdbarch, regnum));
register_size (gdbarch, frame_info_ptr next_frame = get_next_frame_sentinel_okay (frame);
regnum)), if (!get_frame_register_bytes (next_frame, regnum, 0, to_view,
optimizedp, unavailablep)) optimizedp, unavailablep))
return 0; return 0;

10
gdb/i387-tdep.c
View File

@@ -364,11 +364,11 @@ i387_register_to_value (frame_info_ptr frame, int regnum,
} }
/* Convert to TYPE. */ /* Convert to TYPE. */
if (!get_frame_register_bytes (frame, regnum, 0, auto from_view
gdb::make_array_view (from, = gdb::make_array_view (from, register_size (gdbarch, regnum));
register_size (gdbarch, frame_info_ptr next_frame = get_next_frame_sentinel_okay (frame);
regnum)), if (!get_frame_register_bytes (next_frame, regnum, 0, from_view, optimizedp,
optimizedp, unavailablep)) unavailablep))
return 0; return 0;
target_float_convert (from, i387_ext_type (gdbarch), to, type); target_float_convert (from, i387_ext_type (gdbarch), to, type);

9
gdb/ia64-tdep.c
View File

@@ -1227,11 +1227,10 @@ ia64_register_to_value (frame_info_ptr frame, int regnum,
gdb_byte in[IA64_FP_REGISTER_SIZE]; gdb_byte in[IA64_FP_REGISTER_SIZE];
/* Convert to TYPE. */ /* Convert to TYPE. */
if (!get_frame_register_bytes (frame, regnum, 0, auto in_view = gdb::make_array_view (in, register_size (gdbarch, regnum));
gdb::make_array_view (in, frame_info_ptr next_frame = get_next_frame_sentinel_okay (frame);
register_size (gdbarch, if (!get_frame_register_bytes (next_frame, regnum, 0, in_view, optimizedp,
regnum)), unavailablep))
optimizedp, unavailablep))
return 0; return 0;
target_float_convert (in, ia64_ext_type (gdbarch), out, valtype); target_float_convert (in, ia64_ext_type (gdbarch), out, valtype);

10
gdb/m68k-tdep.c
View File

@@ -216,11 +216,11 @@ m68k_register_to_value (frame_info_ptr frame, int regnum,
gdb_assert (type->code () == TYPE_CODE_FLT); gdb_assert (type->code () == TYPE_CODE_FLT);
/* Convert to TYPE. */ /* Convert to TYPE. */
if (!get_frame_register_bytes (frame, regnum, 0, auto from_view
gdb::make_array_view (from, = gdb::make_array_view (from, register_size (gdbarch, regnum));
register_size (gdbarch, frame_info_ptr next_frame = get_next_frame_sentinel_okay (frame);
regnum)), if (!get_frame_register_bytes (next_frame, regnum, 0, from_view, optimizedp,
optimizedp, unavailablep)) unavailablep))
return 0; return 0;
target_float_convert (from, fpreg_type, to, type); target_float_convert (from, fpreg_type, to, type);

7
gdb/mips-tdep.c
View File

@@ -947,17 +947,18 @@ mips_register_to_value (frame_info_ptr frame, int regnum,
int *optimizedp, int *unavailablep) int *optimizedp, int *unavailablep)
{ {
struct gdbarch *gdbarch = get_frame_arch (frame); struct gdbarch *gdbarch = get_frame_arch (frame);
frame_info_ptr next_frame = get_next_frame_sentinel_okay (frame);
if (mips_convert_register_float_case_p (gdbarch, regnum, type)) if (mips_convert_register_float_case_p (gdbarch, regnum, type))
{ {
get_frame_register (frame, regnum + 0, to + 4); get_frame_register (frame, regnum + 0, to + 4);
get_frame_register (frame, regnum + 1, to + 0); get_frame_register (frame, regnum + 1, to + 0);
if (!get_frame_register_bytes (frame, regnum + 0, 0, {to + 4, 4}, if (!get_frame_register_bytes (next_frame, regnum + 0, 0, { to + 4, 4 },
optimizedp, unavailablep)) optimizedp, unavailablep))
return 0; return 0;
if (!get_frame_register_bytes (frame, regnum + 1, 0, {to + 0, 4}, if (!get_frame_register_bytes (next_frame, regnum + 1, 0, { to + 0, 4 },
optimizedp, unavailablep)) optimizedp, unavailablep))
return 0; return 0;
*optimizedp = *unavailablep = 0; *optimizedp = *unavailablep = 0;
@@ -969,7 +970,7 @@ mips_register_to_value (frame_info_ptr frame, int regnum,
CORE_ADDR offset; CORE_ADDR offset;
offset = gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG ? 8 - len : 0; offset = gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG ? 8 - len : 0;
if (!get_frame_register_bytes (frame, regnum, offset, {to, len}, if (!get_frame_register_bytes (next_frame, regnum, offset, { to, len },
optimizedp, unavailablep)) optimizedp, unavailablep))
return 0; return 0;

10
gdb/rs6000-tdep.c
View File

@@ -2713,11 +2713,11 @@ rs6000_register_to_value (frame_info_ptr frame,
fpr to vsr. */ fpr to vsr. */
regnum = ieee_128_float_regnum_adjust (gdbarch, type, regnum); regnum = ieee_128_float_regnum_adjust (gdbarch, type, regnum);
if (!get_frame_register_bytes (frame, regnum, 0, auto from_view
gdb::make_array_view (from, = gdb::make_array_view (from, register_size (gdbarch, regnum));
register_size (gdbarch, frame_info_ptr next_frame = get_next_frame_sentinel_okay (frame);
regnum)), if (!get_frame_register_bytes (frame, regnum, 0, from_view, optimizedp,
optimizedp, unavailablep)) unavailablep))
return 0; return 0;
target_float_convert (from, builtin_type (gdbarch)->builtin_double, target_float_convert (from, builtin_type (gdbarch)->builtin_double,

3
gdb/valops.c
View File

@@ -1227,8 +1227,7 @@ value_assign (struct value *toval, struct value *fromval)
"don't fit in a %d bit word."), "don't fit in a %d bit word."),
(int) sizeof (LONGEST) * HOST_CHAR_BIT); (int) sizeof (LONGEST) * HOST_CHAR_BIT);
if (!get_frame_register_bytes (get_prev_frame_always (next_frame), if (!get_frame_register_bytes (next_frame, value_reg, offset,
value_reg, offset,
{ buffer, changed_len }, &optim, { buffer, changed_len }, &optim,
&unavail)) &unavail))
{ {