static struct value *dwarf2_evaluate_loc_desc_full (struct type *type,
struct frame_info *frame,
const gdb_byte *data,
- unsigned short size,
- struct dwarf2_per_cu_data *per_cu,
+ size_t size,
+ struct dwarf2_per_cu_data *per_cu,
LONGEST byte_offset);
/* Until these have formal names, we define these here.
/* See dwarf2loc.h. */
-int entry_values_debug = 0;
+unsigned int entry_values_debug = 0;
/* Helper to set entry_values_debug. */
return kind_u.dwarf_reg == parameter->u.dwarf_reg;
case CALL_SITE_PARAMETER_FB_OFFSET:
return kind_u.fb_offset == parameter->u.fb_offset;
+ case CALL_SITE_PARAMETER_PARAM_OFFSET:
+ return kind_u.param_offset.cu_off == parameter->u.param_offset.cu_off;
}
return 0;
}
union call_site_parameter_u kind_u,
struct dwarf2_per_cu_data **per_cu_return)
{
- CORE_ADDR func_addr = get_frame_func (frame);
- CORE_ADDR caller_pc;
- struct gdbarch *gdbarch = get_frame_arch (frame);
- struct frame_info *caller_frame = get_prev_frame (frame);
+ CORE_ADDR func_addr, caller_pc;
+ struct gdbarch *gdbarch;
+ struct frame_info *caller_frame;
struct call_site *call_site;
int iparams;
/* Initialize it just to avoid a GCC false warning. */
struct call_site_parameter *parameter = NULL;
CORE_ADDR target_addr;
+ while (get_frame_type (frame) == INLINE_FRAME)
+ {
+ frame = get_prev_frame (frame);
+ gdb_assert (frame != NULL);
+ }
+
+ func_addr = get_frame_func (frame);
+ gdbarch = get_frame_arch (frame);
+ caller_frame = get_prev_frame (frame);
if (gdbarch != frame_unwind_arch (frame))
{
struct minimal_symbol *msym = lookup_minimal_symbol_by_pc (func_addr);
static struct value *
dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
- const gdb_byte *data, unsigned short size,
+ const gdb_byte *data, size_t size,
struct dwarf2_per_cu_data *per_cu,
LONGEST byte_offset)
{
struct value *
dwarf2_evaluate_loc_desc (struct type *type, struct frame_info *frame,
- const gdb_byte *data, unsigned short size,
+ const gdb_byte *data, size_t size,
struct dwarf2_per_cu_data *per_cu)
{
return dwarf2_evaluate_loc_desc_full (type, frame, data, size, per_cu, 0);
struct needs_frame_baton *nf_baton = ctx->baton;
nf_baton->needs_frame = 1;
+
+ /* The expression may require some stub values on DWARF stack. */
+ dwarf_expr_push_address (ctx, 0, 0);
}
/* DW_OP_GNU_addr_index doesn't require a frame. */
requires a frame to evaluate. */
static int
-dwarf2_loc_desc_needs_frame (const gdb_byte *data, unsigned short size,
+dwarf2_loc_desc_needs_frame (const gdb_byte *data, size_t size,
struct dwarf2_per_cu_data *per_cu)
{
struct needs_frame_baton baton;
static const gdb_byte *
locexpr_describe_location_piece (struct symbol *symbol, struct ui_file *stream,
CORE_ADDR addr, struct objfile *objfile,
+ struct dwarf2_per_cu_data *per_cu,
const gdb_byte *data, const gdb_byte *end,
unsigned int addr_size)
{
struct gdbarch *gdbarch = get_objfile_arch (objfile);
+ size_t leb128_size;
if (data[0] >= DW_OP_reg0 && data[0] <= DW_OP_reg31)
{
data += 1 + addr_size + 1;
}
+
+ /* With -gsplit-dwarf a TLS variable can also look like this:
+ DW_AT_location : 3 byte block: fc 4 e0
+ (DW_OP_GNU_const_index: 4;
+ DW_OP_GNU_push_tls_address) */
+ else if (data + 3 <= end
+ && data + 1 + (leb128_size = skip_leb128 (data + 1, end)) < end
+ && data[0] == DW_OP_GNU_const_index
+ && leb128_size > 0
+ && data[1 + leb128_size] == DW_OP_GNU_push_tls_address
+ && piece_end_p (data + 2 + leb128_size, end))
+ {
+ uint64_t offset;
+
+ data = safe_read_uleb128 (data + 1, end, &offset);
+ offset = dwarf2_read_addr_index (per_cu, offset);
+ fprintf_filtered (stream,
+ _("a thread-local variable at offset 0x%s "
+ "in the thread-local storage for `%s'"),
+ phex_nz (offset, addr_size), objfile->name);
+ ++data;
+ }
+
else if (data[0] >= DW_OP_lit0
&& data[0] <= DW_OP_lit31
&& data + 1 < end
all, per_cu);
data += ul;
continue;
+
+ case DW_OP_GNU_parameter_ref:
+ ul = extract_unsigned_integer (data, 4, gdbarch_byte_order (arch));
+ data += 4;
+ fprintf_filtered (stream, " offset %s", phex_nz (ul, 4));
+ break;
+
+ case DW_OP_GNU_addr_index:
+ data = safe_read_uleb128 (data, end, &ul);
+ ul = dwarf2_read_addr_index (per_cu, ul);
+ fprintf_filtered (stream, " 0x%s", phex_nz (ul, addr_size));
+ break;
+ case DW_OP_GNU_const_index:
+ data = safe_read_uleb128 (data, end, &ul);
+ ul = dwarf2_read_addr_index (per_cu, ul);
+ fprintf_filtered (stream, " %s", pulongest (ul));
+ break;
}
fprintf_filtered (stream, "\n");
static void
locexpr_describe_location_1 (struct symbol *symbol, CORE_ADDR addr,
struct ui_file *stream,
- const gdb_byte *data, int size,
+ const gdb_byte *data, size_t size,
struct objfile *objfile, unsigned int addr_size,
int offset_size, struct dwarf2_per_cu_data *per_cu)
{
if (!dwarf2_always_disassemble)
{
data = locexpr_describe_location_piece (symbol, stream,
- addr, objfile,
+ addr, objfile, per_cu,
data, end, addr_size);
/* If we printed anything, or if we have an empty piece,
then don't disassemble. */
void
_initialize_dwarf2loc (void)
{
- add_setshow_zinteger_cmd ("entry-values", class_maintenance,
- &entry_values_debug,
- _("Set entry values and tail call frames "
- "debugging."),
- _("Show entry values and tail call frames "
- "debugging."),
- _("When non-zero, the process of determining "
- "parameter values from function entry point "
- "and tail call frames will be printed."),
- NULL,
- show_entry_values_debug,
- &setdebuglist, &showdebuglist);
+ add_setshow_zuinteger_cmd ("entry-values", class_maintenance,
+ &entry_values_debug,
+ _("Set entry values and tail call frames "
+ "debugging."),
+ _("Show entry values and tail call frames "
+ "debugging."),
+ _("When non-zero, the process of determining "
+ "parameter values from function entry point "
+ "and tail call frames will be printed."),
+ NULL,
+ show_entry_values_debug,
+ &setdebuglist, &showdebuglist);
}