2010-05-14 Michael Snyder <msnyder@vmware.com>

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

diff --git a/gdb/exec.c b/gdb/exec.c
index 4ced96851b16696aaeaa20e0383886ff4f5e2049..f9977a8ed60beb7362c5b66e522e4b8f6a3bd9c4 100644 (file)
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -101,9 +101,7 @@ exec_close (void)
       bfd *abfd = exec_bfd;
       char *name = bfd_get_filename (abfd);
 
-      if (!bfd_close (abfd))
-       warning (_("cannot close \"%s\": %s"),
-                name, bfd_errmsg (bfd_get_error ()));
+      gdb_bfd_close_or_warn (abfd);
       xfree (name);
 
       /* Removing target sections may close the exec_ops target.
@@ -141,9 +139,7 @@ exec_close_1 (int quitting)
        }
       else if (vp->bfd != exec_bfd)
        /* FIXME-leak: We should be freeing vp->name too, I think.  */
-       if (!bfd_close (vp->bfd))
-         warning (_("cannot close \"%s\": %s"),
-                  vp->name, bfd_errmsg (bfd_get_error ()));
+       gdb_bfd_close_or_warn (vp->bfd);
 
       xfree (vp);
     }
@@ -219,6 +215,7 @@ exec_file_attach (char *filename, int from_tty)
       char *scratch_pathname;
       int scratch_chan;
       struct target_section *sections = NULL, *sections_end = NULL;
+      char **matching;
 
       scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, filename,
                   write_files ? O_RDWR | O_BINARY : O_RDONLY | O_BINARY,
@@ -227,6 +224,7 @@ exec_file_attach (char *filename, int from_tty)
       if (scratch_chan < 0)
        {
          char *exename = alloca (strlen (filename) + 5);
+
          strcat (strcpy (exename, filename), ".exe");
          scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, exename,
             write_files ? O_RDWR | O_BINARY : O_RDONLY | O_BINARY,
@@ -253,13 +251,14 @@ exec_file_attach (char *filename, int from_tty)
       scratch_pathname = xstrdup (scratch_pathname);
       cleanups = make_cleanup (xfree, scratch_pathname);
 
-      if (!bfd_check_format (exec_bfd, bfd_object))
+      if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching))
        {
          /* Make sure to close exec_bfd, or else "run" might try to use
             it.  */
          exec_close ();
          error (_("\"%s\": not in executable format: %s"),
-                scratch_pathname, bfd_errmsg (bfd_get_error ()));
+                scratch_pathname,
+                gdb_bfd_errmsg (bfd_get_error (), matching));
        }
 
       /* FIXME - This should only be run for RS6000, but the ifdef is a poor
@@ -460,6 +459,7 @@ add_target_sections (struct target_section *sections,
   if (count > 0)
     {
       int space = resize_section_table (table, count);
+
       memcpy (table->sections + space,
              sections, count * sizeof (sections[0]));
 
@@ -479,7 +479,6 @@ void
 remove_target_sections (bfd *abfd)
 {
   struct target_section *src, *dest;
-
   struct target_section_table *table = current_target_sections;
 
   dest = table->sections;
@@ -671,6 +670,7 @@ print_section_info (struct target_section_table *t, bfd *abfd)
     {
       /* gcc-3.4 does not like the initialization in <p == t->sections_end>.  */
       bfd_vma displacement = 0;
+      bfd_vma entry_point;
 
       for (p = t->sections; p < t->sections_end; p++)
        {
@@ -692,9 +692,11 @@ print_section_info (struct target_section_table *t, bfd *abfd)
        warning (_("Cannot find section for the entry point of %s.\n"),
                 bfd_get_filename (abfd));
 
+      entry_point = gdbarch_addr_bits_remove (gdbarch, 
+                                             bfd_get_start_address (abfd) 
+                                               + displacement);
       printf_filtered (_("\tEntry point: %s\n"),
-                      paddress (gdbarch, (bfd_get_start_address (abfd)
-                                          + displacement)));
+                      paddress (gdbarch, entry_point));
     }
   for (p = t->sections; p < t->sections_end; p++)
     {