Re: [patch 1/2] DW_OP_call: Provide per_cu in the batons

[Jan Kratochvil <jan dot kratochvil at redhat dot com>]

On Mon, 07 Jun 2010 19:44:03 +0200, Tom Tromey wrote:
> Jan> +  /* Set no non-NULL iff this CU is currently loaded.  When it gets freed out
> 
> s/no/to/

Sorry, fixed.  Checked-in.


Thanks,
Jan


http://sourceware.org/ml/gdb-cvs/2010-06/msg00062.html

--- src/gdb/ChangeLog	2010/06/07 17:50:58	1.11883
+++ src/gdb/ChangeLog	2010/06/07 19:42:58	1.11884
@@ -1,3 +1,14 @@
+2010-06-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* 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) <cu>: Extend the comment.
+
 2010-06-07  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	* cp-support.c (make_symbol_overload_list_namespace): Only search
--- src/gdb/dwarf2loc.c	2010/06/04 02:39:16	1.86
+++ src/gdb/dwarf2loc.c	2010/06/07 19:42:58	1.87
@@ -122,7 +122,7 @@
 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 @@
 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 @@
     }
 
   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 @@
 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 @@
   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);
--- src/gdb/dwarf2read.c	2010/06/05 14:11:54	1.395
+++ src/gdb/dwarf2read.c	2010/06/07 19:42:58	1.396
@@ -337,7 +337,8 @@
      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