From b64f50a1aee2274fa2ec530a8ad191ae0f27706c Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 19 Mar 2012 19:59:19 +0000 Subject: gdb/ Code cleanupp: Use cu_offset and sect_offset compile time type checking. * dwarf2expr.c (add_piece, dwarf_get_base_type, execute_stack_op) (ctx_no_dwarf_call, ctx_no_get_base_type): Use cu_offset and sect_offset. * dwarf2expr.h (cu_offset, sect_offset): New types. (struct dwarf_expr_context_funcs) (struct dwarf_expr_context_funcs) : Use cu_offset and sect_offset. (struct dwarf_expr_context) : Improve the comment. (struct dwarf_expr_piece, ctx_no_dwarf_call, ctx_no_get_base_type): Use cu_offset and sect_offset. * dwarf2loc.c (per_cu_dwarf_call, dwarf_expr_dwarf_call) (dwarf_expr_get_base_type, needs_frame_dwarf_call) (dwarf2_compile_expr_to_ax, disassemble_dwarf_expression): Likewise. * dwarf2loc.h: Include dwarf2expr.h. (dwarf2_fetch_die_location_block, dwarf2_get_die_type): Use cu_offset and sect_offset. * dwarf2read.c (struct dwarf2_per_objfile) : Improve the comment. (struct comp_unit_head, struct dwarf2_cu, struct dwarf2_per_cu_data) (struct signatured_type, struct line_header, struct partial_die_info) (struct die_info, find_partial_die, dwarf2_get_ref_die_offset) (lookup_signatured_type_at_offset, dwarf2_find_containing_comp_unit) (get_die_type_at_offset, create_cus_from_index) (create_signatured_type_table_from_index, dw2_get_file_names) (offset_in_cu_p, read_comp_unit_head, error_check_comp_unit_head) (read_and_check_comp_unit_head, read_and_check_type_unit_head) (create_debug_types_hash_table, process_psymtab_comp_unit) (load_partial_comp_unit, create_all_comp_units) (partial_die_parent_scope, partial_die_full_name, skip_one_die) (load_full_comp_unit, dwarf2_physname, read_import_statement) (inherit_abstract_dies, read_func_scope, read_call_site_scope) (dwarf2_add_member_fn, process_enumeration_scope, read_module_type) (read_typedef, die_hash, die_eq, read_full_die, dwarf2_read_abbrevs) (load_partial_dies, read_partial_die, find_partial_die_in_comp_unit) (find_partial_die, read_attribute_value, lookup_die_type) (dump_die_shallow, store_in_ref_table): Use cu_offset and sect_offset. (is_ref_attr): New function comment. (dwarf2_get_ref_die_offset): New function comment, new variable retval. Use cu_offset and sect_offset. (follow_die_offset, follow_die_ref, dwarf2_fetch_die_location_block) (dwarf2_get_die_type, follow_die_sig, lookup_signatured_type_at_offset) (load_full_type_unit, read_signatured_type, per_cu_header_read_in) (dwarf2_find_containing_comp_unit, struct dwarf2_offset_and_type) (offset_and_type_hash, offset_and_type_eq, set_die_type) (get_die_type_at_offset, partial_die_hash, partial_die_eq) (write_one_signatured_type, write_psymtabs_to_index): Use cu_offset and sect_offset. --- gdb/dwarf2expr.c | 52 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) (limited to 'gdb/dwarf2expr.c') diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c index 6757204..700d8cc 100644 --- a/gdb/dwarf2expr.c +++ b/gdb/dwarf2expr.c @@ -342,7 +342,7 @@ add_piece (struct dwarf_expr_context *ctx, ULONGEST size, ULONGEST offset) } else if (p->location == DWARF_VALUE_IMPLICIT_POINTER) { - p->v.ptr.die = ctx->len; + p->v.ptr.die.cu_off = ctx->len; p->v.ptr.offset = value_as_long (dwarf_expr_fetch (ctx, 0)); } else if (p->location == DWARF_VALUE_REGISTER) @@ -464,7 +464,7 @@ base_types_equal_p (struct type *t1, struct type *t2) size. */ static struct type * -dwarf_get_base_type (struct dwarf_expr_context *ctx, ULONGEST die, int size) +dwarf_get_base_type (struct dwarf_expr_context *ctx, cu_offset die, int size) { struct type *result; @@ -869,7 +869,7 @@ execute_stack_op (struct dwarf_expr_context *ctx, error (_("DWARF-2 expression error: DW_OP_GNU_implicit_pointer " "is not allowed in frame context")); - /* The referred-to DIE. */ + /* The referred-to DIE of cu_offset kind. */ ctx->len = extract_unsigned_integer (op_ptr, ctx->ref_addr_size, byte_order); op_ptr += ctx->ref_addr_size; @@ -1031,9 +1031,10 @@ execute_stack_op (struct dwarf_expr_context *ctx, if (op == DW_OP_GNU_deref_type) { - ULONGEST type_die; + cu_offset type_die; - op_ptr = read_uleb128 (op_ptr, op_end, &type_die); + op_ptr = read_uleb128 (op_ptr, op_end, &uoffset); + type_die.cu_off = uoffset; type = dwarf_get_base_type (ctx, type_die, 0); } else @@ -1335,15 +1336,23 @@ execute_stack_op (struct dwarf_expr_context *ctx, goto no_push; case DW_OP_call2: - result = extract_unsigned_integer (op_ptr, 2, byte_order); - op_ptr += 2; - ctx->funcs->dwarf_call (ctx, result); + { + cu_offset offset; + + offset.cu_off = extract_unsigned_integer (op_ptr, 2, byte_order); + op_ptr += 2; + ctx->funcs->dwarf_call (ctx, offset); + } goto no_push; case DW_OP_call4: - result = extract_unsigned_integer (op_ptr, 4, byte_order); - op_ptr += 4; - ctx->funcs->dwarf_call (ctx, result); + { + cu_offset offset; + + offset.cu_off = extract_unsigned_integer (op_ptr, 4, byte_order); + op_ptr += 4; + ctx->funcs->dwarf_call (ctx, offset); + } goto no_push; case DW_OP_GNU_entry_value: @@ -1386,12 +1395,13 @@ execute_stack_op (struct dwarf_expr_context *ctx, case DW_OP_GNU_const_type: { - ULONGEST type_die; + cu_offset type_die; int n; const gdb_byte *data; struct type *type; - op_ptr = read_uleb128 (op_ptr, op_end, &type_die); + op_ptr = read_uleb128 (op_ptr, op_end, &uoffset); + type_die.cu_off = uoffset; n = *op_ptr++; data = op_ptr; op_ptr += n; @@ -1403,11 +1413,12 @@ execute_stack_op (struct dwarf_expr_context *ctx, case DW_OP_GNU_regval_type: { - ULONGEST type_die; + cu_offset type_die; struct type *type; op_ptr = read_uleb128 (op_ptr, op_end, ®); - op_ptr = read_uleb128 (op_ptr, op_end, &type_die); + op_ptr = read_uleb128 (op_ptr, op_end, &uoffset); + type_die.cu_off = uoffset; type = dwarf_get_base_type (ctx, type_die, 0); result = (ctx->funcs->read_reg) (ctx->baton, reg); @@ -1420,12 +1431,13 @@ execute_stack_op (struct dwarf_expr_context *ctx, case DW_OP_GNU_convert: case DW_OP_GNU_reinterpret: { - ULONGEST type_die; + cu_offset type_die; struct type *type; - op_ptr = read_uleb128 (op_ptr, op_end, &type_die); + op_ptr = read_uleb128 (op_ptr, op_end, &uoffset); + type_die.cu_off = uoffset; - if (type_die == 0) + if (type_die.cu_off == 0) type = address_type; else type = dwarf_get_base_type (ctx, type_die, 0); @@ -1506,7 +1518,7 @@ ctx_no_get_tls_address (void *baton, CORE_ADDR offset) /* Stub dwarf_expr_context_funcs.dwarf_call implementation. */ void -ctx_no_dwarf_call (struct dwarf_expr_context *ctx, size_t die_offset) +ctx_no_dwarf_call (struct dwarf_expr_context *ctx, cu_offset die_offset) { error (_("%s is invalid in this context"), "DW_OP_call*"); } @@ -1514,7 +1526,7 @@ ctx_no_dwarf_call (struct dwarf_expr_context *ctx, size_t die_offset) /* Stub dwarf_expr_context_funcs.get_base_type implementation. */ struct type * -ctx_no_get_base_type (struct dwarf_expr_context *ctx, size_t die) +ctx_no_get_base_type (struct dwarf_expr_context *ctx, cu_offset die) { error (_("Support for typed DWARF is not supported in this context")); } -- cgit v1.1