From 17ea53c331199c560a28089d4c5757caa1517d33 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 7 Jun 2010 19:42:58 +0000 Subject: [PATCH] gdb/ * dwarf2loc.c (struct dwarf_expr_baton) Replace objfile by per_cu. (dwarf_expr_tls_address): Use per_cu instead of objfile. (dwarf2_evaluate_loc_desc): Drop initialization of BATON.OBJFILE. Initialize new BATON.PER_CU. Adjust CTX->GDBARCH initialization for this change. (struct needs_frame_baton): New field per_cu. (dwarf2_loc_desc_needs_frame): Initialize new BATON.PER_CU. * dwarf2read.c (struct dwarf2_per_cu_data) : Extend the comment. --- gdb/ChangeLog | 11 +++++++++++ gdb/dwarf2loc.c | 11 +++++++---- gdb/dwarf2read.c | 3 ++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9544c617feb..7113eb4db46 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2010-06-07 Jan Kratochvil + + * dwarf2loc.c (struct dwarf_expr_baton) Replace objfile by per_cu. + (dwarf_expr_tls_address): Use per_cu instead of objfile. + (dwarf2_evaluate_loc_desc): Drop initialization of BATON.OBJFILE. + Initialize new BATON.PER_CU. Adjust CTX->GDBARCH initialization for + this change. + (struct needs_frame_baton): New field per_cu. + (dwarf2_loc_desc_needs_frame): Initialize new BATON.PER_CU. + * dwarf2read.c (struct dwarf2_per_cu_data) : Extend the comment. + 2010-06-07 Sami Wagiaalla * cp-support.c (make_symbol_overload_list_namespace): Only search diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index b14a4ac9b82..9864c466a9f 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -122,7 +122,7 @@ find_location_expression (struct dwarf2_loclist_baton *baton, struct dwarf_expr_baton { struct frame_info *frame; - struct objfile *objfile; + struct dwarf2_per_cu_data *per_cu; }; /* Helper functions for dwarf2_evaluate_loc_desc. */ @@ -227,8 +227,9 @@ static CORE_ADDR dwarf_expr_tls_address (void *baton, CORE_ADDR offset) { struct dwarf_expr_baton *debaton = (struct dwarf_expr_baton *) baton; + struct objfile *objfile = dwarf2_per_cu_objfile (debaton->per_cu); - return target_translate_tls_address (debaton->objfile, offset); + return target_translate_tls_address (objfile, offset); } struct piece_closure @@ -801,12 +802,12 @@ dwarf2_evaluate_loc_desc (struct type *type, struct frame_info *frame, } baton.frame = frame; - baton.objfile = dwarf2_per_cu_objfile (per_cu); + baton.per_cu = per_cu; ctx = new_dwarf_expr_context (); old_chain = make_cleanup_free_dwarf_expr_context (ctx); - ctx->gdbarch = get_objfile_arch (baton.objfile); + ctx->gdbarch = get_objfile_arch (dwarf2_per_cu_objfile (per_cu)); ctx->addr_size = dwarf2_per_cu_addr_size (per_cu); ctx->baton = &baton; ctx->read_reg = dwarf_expr_read_reg; @@ -907,6 +908,7 @@ dwarf2_evaluate_loc_desc (struct type *type, struct frame_info *frame, struct needs_frame_baton { int needs_frame; + struct dwarf2_per_cu_data *per_cu; }; /* Reads from registers do require a frame. */ @@ -973,6 +975,7 @@ dwarf2_loc_desc_needs_frame (const gdb_byte *data, unsigned short size, struct cleanup *old_chain; baton.needs_frame = 0; + baton.per_cu = per_cu; ctx = new_dwarf_expr_context (); old_chain = make_cleanup_free_dwarf_expr_context (ctx); diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 61159390f48..6a6f1cb2b42 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -337,7 +337,8 @@ struct dwarf2_per_cu_data Otherwise it's from .debug_info. */ unsigned int from_debug_types : 1; - /* Set iff currently read in. */ + /* Set to non-NULL iff this CU is currently loaded. When it gets freed out + of the CU cache it gets reset to NULL again. */ struct dwarf2_cu *cu; /* If full symbols for this CU have been read in, then this field -- 2.30.2