Display @entry parameter values even for references.
	* ada-valprint.c (ada_val_print_1) <TYPE_CODE_REF>: Try also
	coerce_ref_if_computed.
	* c-valprint.c (c_val_print) <TYPE_CODE_REF>: Likewise.
	* dwarf2expr.c (dwarf_block_to_dwarf_reg_deref): New function.
	(execute_stack_op) <DW_OP_GNU_entry_value>: Add -1 deref_size to the
	existing push_dwarf_reg_entry_value call.  Add new detection calling
	dwarf_block_to_dwarf_reg_deref.  Update the error message.
	(ctx_no_push_dwarf_reg_entry_value): New parameter deref_size.
	* dwarf2expr.h
	(struct dwarf_expr_context_funcs) <push_dwarf_reg_entry_value>: Add new
	parameter deref_size, describe it in the comment.
	(ctx_no_push_dwarf_reg_entry_value): Add new parameter deref_size.
	(dwarf_block_to_dwarf_reg_deref): New declaration.
	* dwarf2loc.c (dwarf_entry_parameter_to_value): Add new parameter
	deref_size, describe it in the function comment.  New variables
	data_src and size, fetch the alternative block accoring to DEREF_SIZE.
	(dwarf_expr_push_dwarf_reg_entry_value): Add new parameter deref_size,
	describe it in the function comment.  Fetch the alternative block
	accoring to DEREF_SIZE.
	(entry_data_value_coerce_ref, entry_data_value_copy_closure)
	(entry_data_value_free_closure, entry_data_value_funcs): New.
	(value_of_dwarf_reg_entry): New variables checked_type, target_type,
	outer_val, target_val, val and addr.  Try to fetch and create also
	referenced value content.
	(pieced_value_funcs): NULL value for coerce_ref.
	(needs_dwarf_reg_entry_value): Add new parameter deref_size.
	* f-valprint.c (f_val_print) <TYPE_CODE_REF>: Try also
	coerce_ref_if_computed.
	* opencl-lang.c (opencl_value_funcs): NULL value for coerce_ref.
	* p-valprint.c (pascal_val_print) <TYPE_CODE_REF>: Likewise.
	* stack.c (read_frame_arg): Compare also dereferenced values.
	* value.c (value_computed_funcs): Make the parameter v const, use
	value_lval_const for it.
	(value_lval_const, coerce_ref_if_computed): New function.
	(coerce_ref): New variable retval.  Call also coerce_ref_if_computed.
	* value.h (struct lval_funcs): New field coerce_ref.
	(value_computed_funcs): Make the parameter v const.
	(value_lval_const, coerce_ref_if_computed): New declarations.

gdb/testsuite/
	Display @entry parameter values even for references.
	* gdb.arch/amd64-entry-value.cc (reference, datap, datap_input): New
	functions.
	(main): New variables regvar, nodatavarp, stackvar1, stackvar2.  Call
	reference and datap_input.
	* gdb.arch/amd64-entry-value.exp (reference, breakhere_reference): New
	breakpoints.
	(continue to breakpoint: entry_reference: reference)
	(entry_reference: bt at entry)
	(continue to breakpoint: entry_reference: breakhere_reference)
	(entry_reference: bt, entry_reference: ptype regparam)
	(entry_reference: p regparam, entry_reference: ptype regparam@entry)
	(entry_reference: p regparam@entry, entry_reference: p &regparam@entry)
	(entry_reference: p regcopy, entry_reference: p nodataparam)
	(entry_reference: p nodataparam@entry): New tests.
This commit is contained in:
Jan Kratochvil
2011-10-09 19:43:41 +00:00
parent 36b11add17
commit a471c5941e
15 changed files with 496 additions and 47 deletions

View File

@ -350,8 +350,50 @@ read_frame_arg (struct symbol *sym, struct frame_info *frame,
if (!value_optimized_out (val)
&& value_available_contents_eq (val, 0, entryval, 0, len))
{
entryval = NULL;
val_equal = 1;
struct value *val_deref, *entryval_deref;
/* DW_AT_GNU_call_site_value does match with the current
value. If it is a reference still try to verify if
dereferenced DW_AT_GNU_call_site_data_value does not
differ. */
TRY_CATCH (except, RETURN_MASK_ERROR)
{
unsigned len_deref;
val_deref = coerce_ref (val);
if (value_lazy (val_deref))
value_fetch_lazy (val_deref);
len_deref = TYPE_LENGTH (value_type (val_deref));
entryval_deref = coerce_ref (entryval);
if (value_lazy (entryval_deref))
value_fetch_lazy (entryval_deref);
/* If the reference addresses match but dereferenced
content does not match print them. */
if (val != val_deref
&& value_available_contents_eq (val_deref, 0,
entryval_deref, 0,
len_deref))
val_equal = 1;
}
/* Value was not a reference; and its content matches. */
if (val == val_deref)
val_equal = 1;
/* If the dereferenced content could not be fetched do not
display anything. */
else if (except.error == NO_ENTRY_VALUE_ERROR)
val_equal = 1;
else if (except.message)
{
entryval_error = alloca (strlen (except.message) + 1);
strcpy (entryval_error, except.message);
}
if (val_equal)
entryval = NULL;
}
}