diff options
| author | Tom Tromey <tromey@redhat.com> | 2010-07-13 15:09:03 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2010-07-13 15:09:03 +0000 |
| commit | 9aa1f1e33995b48c94b8d6833d071751aa02f751 (patch) | |
| tree | bd6c031088dddbd90f9a9d9f23d252354f214846 /gdb/dwarf2loc.c | |
| parent | 6951728764c1d0d95285ea58a2ba2e335b73f4cd (diff) | |
| download | gdb-9aa1f1e33995b48c94b8d6833d071751aa02f751.zip gdb-9aa1f1e33995b48c94b8d6833d071751aa02f751.tar.gz gdb-9aa1f1e33995b48c94b8d6833d071751aa02f751.tar.bz2 | |
* dwarf2loc.h (dwarf2_per_cu_text_offset): Declare.
* dwarf2loc.c (find_location_expression): Use
dwarf2_per_cu_text_offset.
(dwarf2_evaluate_loc_desc): Likewise.
(dwarf2_loc_desc_needs_frame): Likewise.
(compile_dwarf_to_ax): Likewise.
(loclist_describe_location): Likewise.
* dwarf2read.c (dwarf2_per_cu_text_offset): New function.
(dwarf2_per_cu_objfile): Update comment.
Diffstat (limited to 'gdb/dwarf2loc.c')
| -rw-r--r-- | gdb/dwarf2loc.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index 4106b7f..2a8e557 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -70,8 +70,7 @@ find_location_expression (struct dwarf2_loclist_baton *baton, int signed_addr_p = bfd_get_sign_extend_vma (objfile->obfd); CORE_ADDR base_mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1)); /* Adjust base_address for relocatable objects. */ - CORE_ADDR base_offset = ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); + CORE_ADDR base_offset = dwarf2_per_cu_text_offset (baton->per_cu); CORE_ADDR base_address = baton->base_address + base_offset; loc_ptr = baton->data; @@ -909,7 +908,7 @@ dwarf2_evaluate_loc_desc (struct type *type, struct frame_info *frame, ctx->gdbarch = get_objfile_arch (objfile); ctx->addr_size = dwarf2_per_cu_addr_size (per_cu); - ctx->offset = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + ctx->offset = dwarf2_per_cu_text_offset (per_cu); ctx->baton = &baton; ctx->read_reg = dwarf_expr_read_reg; ctx->read_mem = dwarf_expr_read_mem; @@ -1095,7 +1094,7 @@ dwarf2_loc_desc_needs_frame (const gdb_byte *data, unsigned short size, ctx->gdbarch = get_objfile_arch (objfile); ctx->addr_size = dwarf2_per_cu_addr_size (per_cu); - ctx->offset = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + ctx->offset = dwarf2_per_cu_text_offset (per_cu); ctx->baton = &baton; ctx->read_reg = needs_frame_read_reg; ctx->read_mem = needs_frame_read_mem; @@ -1304,12 +1303,7 @@ compile_dwarf_to_ax (struct agent_expr *expr, struct axs_value *loc, index, not an address. We don't support things like branching between the address and the TLS op. */ if (op_ptr >= op_end || *op_ptr != DW_OP_GNU_push_tls_address) - { - struct objfile *objfile = dwarf2_per_cu_objfile (per_cu); - - uoffset += ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); - } + uoffset += dwarf2_per_cu_text_offset (per_cu); ax_const_l (expr, uoffset); break; @@ -2511,8 +2505,7 @@ loclist_describe_location (struct symbol *symbol, CORE_ADDR addr, int signed_addr_p = bfd_get_sign_extend_vma (objfile->obfd); CORE_ADDR base_mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1)); /* Adjust base_address for relocatable objects. */ - CORE_ADDR base_offset = ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); + CORE_ADDR base_offset = dwarf2_per_cu_text_offset (dlbaton->per_cu); CORE_ADDR base_address = dlbaton->base_address + base_offset; loc_ptr = dlbaton->data; |