*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / dwarf2loc.c

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 8a7d7e9ef9397a4a2e711536a96ee32a1480cb04..863a5fa3347494e586fdc749a5ba7fbe1aed5ca4 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -1,7 +1,6 @@
 /* DWARF 2 location expression support for GDB.
 
-   Copyright (C) 2003, 2005, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2007-2012 Free Software Foundation, Inc.
 
    Contributed by Daniel Jacobowitz, MontaVista Software, Inc.
 
@@ -43,6 +42,8 @@
 #include "gdb_string.h"
 #include "gdb_assert.h"
 
+DEF_VEC_I(int);
+
 extern int dwarf2_always_disassemble;
 
 static void dwarf_expr_frame_base_1 (struct symbol *framefunc, CORE_ADDR pc,
@@ -283,7 +284,7 @@ dwarf_expr_tls_address (void *baton, CORE_ADDR offset)
    call and return.  */
 
 static void
-per_cu_dwarf_call (struct dwarf_expr_context *ctx, size_t die_offset,
+per_cu_dwarf_call (struct dwarf_expr_context *ctx, cu_offset die_offset,
                   struct dwarf2_per_cu_data *per_cu,
                   CORE_ADDR (*get_frame_pc) (void *baton),
                   void *baton)
@@ -302,7 +303,7 @@ per_cu_dwarf_call (struct dwarf_expr_context *ctx, size_t die_offset,
 /* Helper interface of per_cu_dwarf_call for dwarf2_evaluate_loc_desc.  */
 
 static void
-dwarf_expr_dwarf_call (struct dwarf_expr_context *ctx, size_t die_offset)
+dwarf_expr_dwarf_call (struct dwarf_expr_context *ctx, cu_offset die_offset)
 {
   struct dwarf_expr_baton *debaton = ctx->baton;
 
@@ -313,7 +314,8 @@ dwarf_expr_dwarf_call (struct dwarf_expr_context *ctx, size_t die_offset)
 /* Callback function for dwarf2_evaluate_loc_desc.  */
 
 static struct type *
-dwarf_expr_get_base_type (struct dwarf_expr_context *ctx, size_t die_offset)
+dwarf_expr_get_base_type (struct dwarf_expr_context *ctx,
+                         cu_offset die_offset)
 {
   struct dwarf_expr_baton *debaton = ctx->baton;
 
@@ -443,9 +445,6 @@ func_addr_to_tail_call_list (struct gdbarch *gdbarch, CORE_ADDR addr)
   return sym;
 }
 
-/* Define VEC (CORE_ADDR) functions.  */
-DEF_VEC_I (CORE_ADDR);
-
 /* Verify function with entry point exact address ADDR can never call itself
    via its tail calls (incl. transitively).  Throw NO_ENTRY_VALUE_ERROR if it
    can call itself via tail calls.
@@ -2223,7 +2222,7 @@ needs_frame_tls_address (void *baton, CORE_ADDR offset)
 /* Helper interface of per_cu_dwarf_call for dwarf2_loc_desc_needs_frame.  */
 
 static void
-needs_frame_dwarf_call (struct dwarf_expr_context *ctx, size_t die_offset)
+needs_frame_dwarf_call (struct dwarf_expr_context *ctx, cu_offset die_offset)
 {
   struct needs_frame_baton *nf_baton = ctx->baton;
 
@@ -3016,11 +3015,13 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr, struct axs_value *loc,
          {
            struct dwarf2_locexpr_baton block;
            int size = (op == DW_OP_call2 ? 2 : 4);
+           cu_offset offset;
 
            uoffset = extract_unsigned_integer (op_ptr, size, byte_order);
            op_ptr += size;
 
-           block = dwarf2_fetch_die_location_block (uoffset, per_cu,
+           offset.cu_off = uoffset;
+           block = dwarf2_fetch_die_location_block (offset, per_cu,
                                                     get_ax_pc, expr);
 
            /* DW_OP_call_ref is currently not supported.  */
@@ -3519,43 +3520,48 @@ disassemble_dwarf_expression (struct ui_file *stream,
        case DW_OP_GNU_deref_type:
          {
            int addr_size = *data++;
-           ULONGEST offset;
+           cu_offset offset;
            struct type *type;
 
-           data = read_uleb128 (data, end, &offset);
+           data = read_uleb128 (data, end, &ul);
+           offset.cu_off = ul;
            type = dwarf2_get_die_type (offset, per_cu);
            fprintf_filtered (stream, "<");
            type_print (type, "", stream, -1);
-           fprintf_filtered (stream, " [0x%s]> %d", phex_nz (offset, 0),
+           fprintf_filtered (stream, " [0x%s]> %d", phex_nz (offset.cu_off, 0),
                              addr_size);
          }
          break;
 
        case DW_OP_GNU_const_type:
          {
-           ULONGEST type_die;
+           cu_offset type_die;
            struct type *type;
 
-           data = read_uleb128 (data, end, &type_die);
+           data = read_uleb128 (data, end, &ul);
+           type_die.cu_off = ul;
            type = dwarf2_get_die_type (type_die, per_cu);
            fprintf_filtered (stream, "<");
            type_print (type, "", stream, -1);
-           fprintf_filtered (stream, " [0x%s]>", phex_nz (type_die, 0));
+           fprintf_filtered (stream, " [0x%s]>", phex_nz (type_die.cu_off, 0));
          }
          break;
 
        case DW_OP_GNU_regval_type:
          {
-           ULONGEST type_die, reg;
+           ULONGEST reg;
+           cu_offset type_die;
            struct type *type;
 
            data = read_uleb128 (data, end, &reg);
-           data = read_uleb128 (data, end, &type_die);
+           data = read_uleb128 (data, end, &ul);
+           type_die.cu_off = ul;
 
            type = dwarf2_get_die_type (type_die, per_cu);
            fprintf_filtered (stream, "<");
            type_print (type, "", stream, -1);
-           fprintf_filtered (stream, " [0x%s]> [$%s]", phex_nz (type_die, 0),
+           fprintf_filtered (stream, " [0x%s]> [$%s]",
+                             phex_nz (type_die.cu_off, 0),
                              locexpr_regname (arch, reg));
          }
          break;
@@ -3563,11 +3569,12 @@ disassemble_dwarf_expression (struct ui_file *stream,
        case DW_OP_GNU_convert:
        case DW_OP_GNU_reinterpret:
          {
-           ULONGEST type_die;
+           cu_offset type_die;
 
-           data = read_uleb128 (data, end, &type_die);
+           data = read_uleb128 (data, end, &ul);
+           type_die.cu_off = ul;
 
-           if (type_die == 0)
+           if (type_die.cu_off == 0)
              fprintf_filtered (stream, "<0>");
            else
              {
@@ -3576,7 +3583,7 @@ disassemble_dwarf_expression (struct ui_file *stream,
                type = dwarf2_get_die_type (type_die, per_cu);
                fprintf_filtered (stream, "<");
                type_print (type, "", stream, -1);
-               fprintf_filtered (stream, " [0x%s]>", phex_nz (type_die, 0));
+               fprintf_filtered (stream, " [0x%s]>", phex_nz (type_die.cu_off, 0));
              }
          }
          break;
@@ -3910,6 +3917,9 @@ const struct symbol_computed_ops dwarf2_loclist_funcs = {
   loclist_tracepoint_var_ref
 };
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_dwarf2loc;
+
 void
 _initialize_dwarf2loc (void)
 {