diff options
author | Andreas Arnez <arnez@linux.vnet.ibm.com> | 2017-06-13 15:20:26 +0200 |
---|---|---|
committer | Andreas Arnez <arnez@linux.vnet.ibm.com> | 2017-06-13 15:20:26 +0200 |
commit | e93523245b704bc126705620969b4736b00350c5 (patch) | |
tree | 3dd486229466121329888fa591dfd0f45feb22d8 /gdb/dwarf2loc.c | |
parent | d5d1163eff2415a01895f1cff8bbee32b3f0ab66 (diff) | |
download | gdb-e93523245b704bc126705620969b4736b00350c5.zip gdb-e93523245b704bc126705620969b4736b00350c5.tar.gz gdb-e93523245b704bc126705620969b4736b00350c5.tar.bz2 |
PR gdb/21226: Take DWARF stack value pieces from LSB end
When taking a DW_OP_piece or DW_OP_bit_piece from a DW_OP_stack_value, the
existing logic always takes the piece from the lowest-addressed end, which
is wrong on big-endian targets. The DWARF standard states that the
"DW_OP_bit_piece operation describes a sequence of bits using the least
significant bits of that value", and this also matches the current logic
in GCC. For instance, the GCC guality test case pr54970.c fails on s390x
because of this.
This fix adjusts the piece accordingly on big-endian targets. It is
assumed that:
* DW_OP_piece shall take the piece from the LSB end as well;
* pieces reaching outside the stack value bits are considered undefined,
and a zero value can be used instead.
gdb/ChangeLog:
PR gdb/21226
* dwarf2loc.c (read_pieced_value): Anchor stack value pieces at
the LSB end, independent of endianness.
gdb/testsuite/ChangeLog:
PR gdb/21226
* gdb.dwarf2/nonvar-access.exp: Add checks for verifying that
stack value pieces are taken from the LSB end.
Diffstat (limited to 'gdb/dwarf2loc.c')
-rw-r--r-- | gdb/dwarf2loc.c | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index 2a45a79..061ec6d 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -1858,6 +1858,10 @@ read_pieced_value (struct value *v) if (unavail) mark_value_bits_unavailable (v, offset, this_size_bits); } + + copy_bitwise (contents, dest_offset_bits, + intermediate_buffer, source_offset_bits % 8, + this_size_bits, bits_big_endian); } break; @@ -1866,26 +1870,30 @@ read_pieced_value (struct value *v) p->v.mem.in_stack_memory, p->v.mem.addr + source_offset, buffer.data (), this_size); + copy_bitwise (contents, dest_offset_bits, + intermediate_buffer, source_offset_bits % 8, + this_size_bits, bits_big_endian); break; case DWARF_VALUE_STACK: { - size_t n = this_size; + struct objfile *objfile = dwarf2_per_cu_objfile (c->per_cu); + struct gdbarch *objfile_gdbarch = get_objfile_arch (objfile); + ULONGEST stack_value_size_bits + = 8 * TYPE_LENGTH (value_type (p->v.value)); - if (n > c->addr_size - source_offset) - n = (c->addr_size >= source_offset - ? c->addr_size - source_offset - : 0); - if (n == 0) - { - /* Nothing. */ - } - else - { - const gdb_byte *val_bytes = value_contents_all (p->v.value); + /* Use zeroes if piece reaches beyond stack value. */ + if (p->size > stack_value_size_bits) + break; - intermediate_buffer = val_bytes + source_offset; - } + /* Piece is anchored at least significant bit end. */ + if (gdbarch_byte_order (objfile_gdbarch) == BFD_ENDIAN_BIG) + source_offset_bits += stack_value_size_bits - p->size; + + copy_bitwise (contents, dest_offset_bits, + value_contents_all (p->v.value), + source_offset_bits, + this_size_bits, bits_big_endian); } break; @@ -1899,6 +1907,10 @@ read_pieced_value (struct value *v) : 0); if (n != 0) intermediate_buffer = p->v.literal.data + source_offset; + + copy_bitwise (contents, dest_offset_bits, + intermediate_buffer, source_offset_bits % 8, + this_size_bits, bits_big_endian); } break; @@ -1915,12 +1927,6 @@ read_pieced_value (struct value *v) internal_error (__FILE__, __LINE__, _("invalid location type")); } - if (p->location != DWARF_VALUE_OPTIMIZED_OUT - && p->location != DWARF_VALUE_IMPLICIT_POINTER) - copy_bitwise (contents, dest_offset_bits, - intermediate_buffer, source_offset_bits % 8, - this_size_bits, bits_big_endian); - offset += this_size_bits; } } |