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

Move dwarf_call to dwarf_expr_context

Browse Source 
Following the idea of merging the evaluators, the dwarf_call and
get_frame_pc method can be moved from dwarf_expr_executor and
dwarf_evaluate_loc_desc classes to their base class dwarf_expr_context.
Once this is done, the get_frame_pc can be replace with lambda
function.

gdb/ChangeLog:

	* dwarf2/expr.c (dwarf_expr_context::dwarf_call): Move from
	dwarf_evaluate_loc_desc.
	(dwarf_expr_context::get_frame_pc): Replace with lambda.
	* dwarf2/expr.h (dwarf_expr_context::get_frame_pc): Remove
	method.
	* dwarf2/frame.c (dwarf_expr_executor::dwarf_call): Remove
	method.
	(dwarf_expr_executor::get_frame_pc): Remove method.
	* dwarf2/loc.c (dwarf_evaluate_loc_desc::get_frame_pc): Remove
	method.
	(dwarf_evaluate_loc_desc::dwarf_call): Move to
	dwarf_expr_context.
	(per_cu_dwarf_call): Inline function.
This commit is contained in:
Zoran Zaric
2020-09-15 10:27:29 +01:00
parent a580d9604b
commit b6d156edd8
4 changed files with 33 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gdb/dwarf2/expr.c
View File

@@ -224,6 +224,31 @@ dwarf_expr_context::get_base_type (cu_offset die_cu_off)
return result;
}
/* See expr.h. */
void
dwarf_expr_context::dwarf_call (cu_offset die_cu_off)
{
ensure_have_per_cu (this->per_cu, "DW_OP_call");
frame_info *frame = this->frame;
auto get_pc_from_frame = [frame] ()
{
ensure_have_frame (frame, "DW_OP_call");
return get_frame_address_in_block (frame);
};
dwarf2_locexpr_baton block
= dwarf2_fetch_die_loc_cu_off (die_cu_off, this->per_cu, this->per_objfile,
get_pc_from_frame);
/* DW_OP_call_ref is currently not supported. */
gdb_assert (block.per_cu == this->per_cu);
this->eval (block.data, block.size);
}
/* Require that TYPE be an integral type; throw an exception if not. */
static void
@@ -1269,7 +1294,8 @@ dwarf_expr_context::execute_stack_op (const gdb_byte *op_ptr,
returned. */
result = value_as_long (fetch (0));
pop ();
result = this->get_tls_address (result);
result = target_translate_tls_address (this->per_objfile->objfile,
result);
result_val = value_from_ulongest (address_type, result);
break;