Replace the MSYMBOL_*_NAME macros with member functions

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

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index ea6b36e6ed8b99942d2ef9aadb81db1906b926b4..1ac56b273ad82fb1dabeceb93fdd8ed652648cd4 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -46,8 +46,6 @@
 #include "gdbsupport/underlying.h"
 #include "gdbsupport/byte-vector.h"
 
-extern int dwarf_always_disassemble;
-
 static struct value *dwarf2_evaluate_loc_desc_full (struct type *type,
                                                    struct frame_info *frame,
                                                    const gdb_byte *data,
@@ -802,7 +800,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch,
                         _("DW_AT_call_target is not specified at %s in %s"),
                         paddress (call_site_gdbarch, call_site->pc),
                         (msym.minsym == NULL ? "???"
-                         : MSYMBOL_PRINT_NAME (msym.minsym)));
+                         : msym.minsym->print_name ()));
                        
          }
        if (caller_frame == NULL)
@@ -816,7 +814,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch,
                           "available at %s in %s"),
                         paddress (call_site_gdbarch, call_site->pc),
                         (msym.minsym == NULL ? "???"
-                         : MSYMBOL_PRINT_NAME (msym.minsym)));
+                         : msym.minsym->print_name ()));
                        
          }
        caller_arch = get_frame_arch (caller_frame);
@@ -848,7 +846,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch,
                           "at %s in %s"),
                         physname, paddress (call_site_gdbarch, call_site->pc),
                         (msym.minsym == NULL ? "???"
-                         : MSYMBOL_PRINT_NAME (msym.minsym)));
+                         : msym.minsym->print_name ()));
                        
          }
        return BMSYMBOL_VALUE_ADDRESS (msym);
@@ -936,7 +934,7 @@ func_verify_no_selftailcall (struct gdbarch *gdbarch, CORE_ADDR verify_addr)
                             "function \"%s\" at %s can call itself via tail "
                             "calls"),
                           (msym.minsym == NULL ? "???"
-                           : MSYMBOL_PRINT_NAME (msym.minsym)),
+                           : msym.minsym->print_name ()),
                           paddress (gdbarch, verify_addr));
            }
 
@@ -957,7 +955,7 @@ tailcall_dump (struct gdbarch *gdbarch, const struct call_site *call_site)
 
   fprintf_unfiltered (gdb_stdlog, " %s(%s)", paddress (gdbarch, addr),
                      (msym.minsym == NULL ? "???"
-                      : MSYMBOL_PRINT_NAME (msym.minsym)));
+                      : msym.minsym->print_name ()));
 
 }
 
@@ -1175,10 +1173,10 @@ call_site_find_chain_1 (struct gdbarch *gdbarch, CORE_ADDR caller_pc,
                     "callers or callees between caller function \"%s\" at %s "
                     "and callee function \"%s\" at %s"),
                   (msym_caller.minsym == NULL
-                   ? "???" : MSYMBOL_PRINT_NAME (msym_caller.minsym)),
+                   ? "???" : msym_caller.minsym->print_name ()),
                   paddress (gdbarch, caller_pc),
                   (msym_callee.minsym == NULL
-                   ? "???" : MSYMBOL_PRINT_NAME (msym_callee.minsym)),
+                   ? "???" : msym_callee.minsym->print_name ()),
                   paddress (gdbarch, callee_pc));
     }
 
@@ -1278,7 +1276,7 @@ dwarf_expr_reg_to_entry_parameter (struct frame_info *frame,
                   gdbarch_bfd_arch_info (gdbarch)->printable_name,
                   paddress (gdbarch, func_addr),
                   (msym.minsym == NULL ? "???"
-                   : MSYMBOL_PRINT_NAME (msym.minsym)),
+                   : msym.minsym->print_name ()),
                   gdbarch_bfd_arch_info (caller_gdbarch)->printable_name);
     }
 
@@ -1291,7 +1289,7 @@ dwarf_expr_reg_to_entry_parameter (struct frame_info *frame,
                                           "requires caller of %s (%s)"),
                   paddress (gdbarch, func_addr),
                   (msym.minsym == NULL ? "???"
-                   : MSYMBOL_PRINT_NAME (msym.minsym)));
+                   : msym.minsym->print_name ()));
     }
   caller_pc = get_frame_pc (caller_frame);
   call_site = call_site_for_pc (gdbarch, caller_pc);
@@ -1307,9 +1305,9 @@ dwarf_expr_reg_to_entry_parameter (struct frame_info *frame,
                   _("DW_OP_entry_value resolving expects callee %s at %s "
                     "but the called frame is for %s at %s"),
                   (target_msym == NULL ? "???"
-                                       : MSYMBOL_PRINT_NAME (target_msym)),
+                                       : target_msym->print_name ()),
                   paddress (gdbarch, target_addr),
-                  func_msym == NULL ? "???" : MSYMBOL_PRINT_NAME (func_msym),
+                  func_msym == NULL ? "???" : func_msym->print_name (),
                   paddress (gdbarch, func_addr));
     }
 
@@ -1333,7 +1331,7 @@ dwarf_expr_reg_to_entry_parameter (struct frame_info *frame,
       throw_error (NO_ENTRY_VALUE_ERROR, _("Cannot find matching parameter "
                                           "at DW_TAG_call_site %s at %s"),
                   paddress (gdbarch, caller_pc),
-                  msym == NULL ? "???" : MSYMBOL_PRINT_NAME (msym)); 
+                  msym == NULL ? "???" : msym->print_name ()); 
     }
 
   *per_cu_return = call_site->per_cu;
@@ -1603,7 +1601,7 @@ rw_pieced_value (struct value *v, struct value *from)
       bits_to_skip += (8 * value_offset (value_parent (v))
                       + value_bitpos (v));
       if (from != NULL
-         && (gdbarch_byte_order (get_type_arch (value_type (from)))
+         && (type_byte_order (value_type (from))
              == BFD_ENDIAN_BIG))
        {
          /* Use the least significant bits of FROM.  */
@@ -2443,17 +2441,40 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
       {
        const struct dwarf2_property_baton *baton
          = (const struct dwarf2_property_baton *) prop->data.baton;
+       gdb_assert (baton->property_type != NULL);
 
        if (dwarf2_locexpr_baton_eval (&baton->locexpr, frame,
                                       addr_stack ? addr_stack->addr : 0,
                                       value))
          {
-           if (baton->referenced_type)
+           if (baton->locexpr.is_reference)
              {
-               struct value *val = value_at (baton->referenced_type, *value);
-
+               struct value *val = value_at (baton->property_type, *value);
                *value = value_as_address (val);
              }
+           else
+             {
+               gdb_assert (baton->property_type != NULL);
+
+               struct type *type = check_typedef (baton->property_type);
+               if (TYPE_LENGTH (type) < sizeof (CORE_ADDR)
+                   && !TYPE_UNSIGNED (type))
+                 {
+                   /* If we have a valid return candidate and it's value
+                      is signed, we have to sign-extend the value because
+                      CORE_ADDR on 64bit machine has 8 bytes but address
+                      size of an 32bit application is bytes.  */
+                   const int addr_size
+                     = (dwarf2_per_cu_addr_size (baton->locexpr.per_cu)
+                        * TARGET_CHAR_BIT);
+                   const CORE_ADDR neg_mask
+                     = (~((CORE_ADDR) 0) <<  (addr_size - 1));
+
+                   /* Check if signed bit is set and sign-extend values.  */
+                   if (*value & neg_mask)
+                     *value |= neg_mask;
+                 }
+             }
            return true;
          }
       }
@@ -2471,7 +2492,7 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
        data = dwarf2_find_location_expression (&baton->loclist, &size, pc);
        if (data != NULL)
          {
-           val = dwarf2_evaluate_loc_desc (baton->referenced_type, frame, data,
+           val = dwarf2_evaluate_loc_desc (baton->property_type, frame, data,
                                            size, baton->loclist.per_cu);
            if (!value_optimized_out (val))
              {
@@ -2497,7 +2518,7 @@ dwarf2_evaluate_property (const struct dynamic_prop *prop,
          {
            /* This approach lets us avoid checking the qualifiers.  */
            if (TYPE_MAIN_TYPE (pinfo->type)
-               == TYPE_MAIN_TYPE (baton->referenced_type))
+               == TYPE_MAIN_TYPE (baton->property_type))
              break;
          }
        if (pinfo == NULL)