Improve MSP430 section placement.

[deliverable/binutils-gdb.git] / gdb / solib-target.c

diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index e25f6ab2524a6756a2da45cb890c5bebbe20bcc9..71a0da322c79b74412adcc4b456f057128d64f48 100644 (file)
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -25,16 +25,11 @@
 #include "target.h"
 #include "vec.h"
 #include "solib-target.h"
+#include <vector>
 
 /* Private data for each loaded library.  */
 struct lm_info_target : public lm_info_base
 {
-  ~lm_info_target ()
-  {
-    VEC_free (CORE_ADDR, this->segment_bases);
-    VEC_free (CORE_ADDR, this->section_bases);
-  }
-
   /* The library's name.  The name is normally kept in the struct
      so_list; it is only here during XML parsing.  */
   std::string name;
@@ -44,11 +39,11 @@ struct lm_info_target : public lm_info_base
 
   /* The base addresses for each independently relocatable segment of
      this shared library.  */
-  VEC(CORE_ADDR) *segment_bases = NULL;
+  std::vector<CORE_ADDR> segment_bases;
 
   /* The base addresses for each independently allocatable,
      relocatable section of this shared library.  */
-  VEC(CORE_ADDR) *section_bases = NULL;
+  std::vector<CORE_ADDR> section_bases;
 
   /* The cached offsets for each section of this shared library,
      determined from SEGMENT_BASES, or SECTION_BASES.  */
@@ -92,11 +87,11 @@ library_list_start_segment (struct gdb_xml_parser *parser,
     = (ULONGEST *) xml_find_attribute (attributes, "address")->value;
   CORE_ADDR address = (CORE_ADDR) *address_p;
 
-  if (last->section_bases != NULL)
+  if (!last->section_bases.empty ())
     gdb_xml_error (parser,
                   _("Library list with both segments and sections"));
 
-  VEC_safe_push (CORE_ADDR, last->segment_bases, address);
+  last->segment_bases.push_back (address);
 }
 
 static void
@@ -110,11 +105,11 @@ library_list_start_section (struct gdb_xml_parser *parser,
     = (ULONGEST *) xml_find_attribute (attributes, "address")->value;
   CORE_ADDR address = (CORE_ADDR) *address_p;
 
-  if (last->segment_bases != NULL)
+  if (!last->segment_bases.empty ())
     gdb_xml_error (parser,
                   _("Library list with both segments and sections"));
 
-  VEC_safe_push (CORE_ADDR, last->section_bases, address);
+  last->section_bases.push_back (address);
 }
 
 /* Handle the start of a <library> element.  */
@@ -141,10 +136,8 @@ library_list_end_library (struct gdb_xml_parser *parser,
   VEC(lm_info_target_p) **list = (VEC(lm_info_target_p) **) user_data;
   lm_info_target *lm_info = VEC_last (lm_info_target_p, *list);
 
-  if (lm_info->segment_bases == NULL
-      && lm_info->section_bases == NULL)
-    gdb_xml_error (parser,
-                  _("No segment or section bases defined"));
+  if (lm_info->segment_bases.empty () && lm_info->section_bases.empty ())
+    gdb_xml_error (parser, _("No segment or section bases defined"));
 }
 
 
@@ -350,12 +343,10 @@ solib_target_relocate_section_addresses (struct so_list *so,
        = ((struct section_offsets *)
           xzalloc (SIZEOF_N_SECTION_OFFSETS (num_sections)));
 
-      if (li->section_bases)
+      if (!li->section_bases.empty ())
        {
          int i;
          asection *sect;
-         int num_section_bases
-           = VEC_length (CORE_ADDR, li->section_bases);
          int num_alloc_sections = 0;
 
          for (i = 0, sect = so->abfd->sections;
@@ -364,7 +355,7 @@ solib_target_relocate_section_addresses (struct so_list *so,
            if ((bfd_get_section_flags (so->abfd, sect) & SEC_ALLOC))
              num_alloc_sections++;
 
-         if (num_alloc_sections != num_section_bases)
+         if (num_alloc_sections != li->section_bases.size ())
            warning (_("\
 Could not relocate shared library \"%s\": wrong number of ALLOC sections"),
                     so->so_name);
@@ -372,10 +363,6 @@ Could not relocate shared library \"%s\": wrong number of ALLOC sections"),
            {
              int bases_index = 0;
              int found_range = 0;
-             CORE_ADDR *section_bases;
-
-             section_bases = VEC_address (CORE_ADDR,
-                                          li->section_bases);
 
              so->addr_low = ~(CORE_ADDR) 0;
              so->addr_high = 0;
@@ -389,7 +376,7 @@ Could not relocate shared library \"%s\": wrong number of ALLOC sections"),
                    {
                      CORE_ADDR low, high;
 
-                     low = section_bases[i];
+                     low = li->section_bases[i];
                      high = low + bfd_section_size (so->abfd, sect) - 1;
 
                      if (low < so->addr_low)
@@ -399,8 +386,7 @@ Could not relocate shared library \"%s\": wrong number of ALLOC sections"),
                      gdb_assert (so->addr_low <= so->addr_high);
                      found_range = 1;
                    }
-                 li->offsets->offsets[i]
-                   = section_bases[bases_index];
+                 li->offsets->offsets[i] = li->section_bases[bases_index];
                  bases_index++;
                }
              if (!found_range)
@@ -408,7 +394,7 @@ Could not relocate shared library \"%s\": wrong number of ALLOC sections"),
              gdb_assert (so->addr_low <= so->addr_high);
            }
        }
-      else if (li->segment_bases)
+      else if (!li->segment_bases.empty ())
        {
          struct symfile_segment_data *data;
 
@@ -420,37 +406,34 @@ Could not relocate shared library \"%s\": no segments"), so->so_name);
            {
              ULONGEST orig_delta;
              int i;
-             int num_bases;
-             CORE_ADDR *segment_bases;
-
-             num_bases = VEC_length (CORE_ADDR, li->segment_bases);
-             segment_bases = VEC_address (CORE_ADDR, li->segment_bases);
 
              if (!symfile_map_offsets_to_segments (so->abfd, data, li->offsets,
-                                                   num_bases, segment_bases))
+                                                   li->segment_bases.size (),
+                                                   li->segment_bases.data ()))
                warning (_("\
 Could not relocate shared library \"%s\": bad offsets"), so->so_name);
 
              /* Find the range of addresses to report for this library in
                 "info sharedlibrary".  Report any consecutive segments
                 which were relocated as a single unit.  */
-             gdb_assert (num_bases > 0);
-             orig_delta = segment_bases[0] - data->segment_bases[0];
+             gdb_assert (li->segment_bases.size () > 0);
+             orig_delta = li->segment_bases[0] - data->segment_bases[0];
 
              for (i = 1; i < data->num_segments; i++)
                {
                  /* If we have run out of offsets, assume all
                     remaining segments have the same offset.  */
-                 if (i >= num_bases)
+                 if (i >= li->segment_bases.size ())
                    continue;
 
                  /* If this segment does not have the same offset, do
                     not include it in the library's range.  */
-                 if (segment_bases[i] - data->segment_bases[i] != orig_delta)
+                 if (li->segment_bases[i] - data->segment_bases[i]
+                     != orig_delta)
                    break;
                }
 
-             so->addr_low = segment_bases[0];
+             so->addr_low = li->segment_bases[0];
              so->addr_high = (data->segment_bases[i - 1]
                               + data->segment_sizes[i - 1]
                               + orig_delta);