Allow for the possibility that the local labels won't be in the objdump output.

[deliverable/binutils-gdb.git] / gdb / arch-utils.c

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 8af1373ffeac61239998e0eddac7949ade5c00d6..bfa548b5f951420d7257178ea6a9862ba6a2fa1d 100644 (file)
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -1,5 +1,5 @@
 /* Dynamic architecture support for GDB, the GNU debugger.
-   Copyright 1998-1999, Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -27,7 +27,6 @@
 /* Just include everything in sight so that the every old definition
    of macro is visible. */
 #include "gdb_string.h"
-#include <ctype.h>
 #include "symtab.h"
 #include "frame.h"
 #include "inferior.h"
@@ -117,7 +116,8 @@ legacy_register_name (int i)
   else
     return names[i];
 #else
-  internal_error ("legacy_register_name: called.");
+  internal_error (__FILE__, __LINE__,
+                 "legacy_register_name: called.");
   return NULL;
 #endif
 }
@@ -180,7 +180,8 @@ default_float_format (struct gdbarch *gdbarch)
     case LITTLE_ENDIAN:
       return &floatformat_ieee_single_little;
     default:
-      internal_error ("default_float_format: bad byte order");
+      internal_error (__FILE__, __LINE__,
+                     "default_float_format: bad byte order");
     }
 }
 
@@ -200,7 +201,8 @@ default_double_format (struct gdbarch *gdbarch)
     case LITTLE_ENDIAN:
       return &floatformat_ieee_double_little;
     default:
-      internal_error ("default_double_format: bad byte order");
+      internal_error (__FILE__, __LINE__,
+                     "default_double_format: bad byte order");
     }
 }
 
@@ -220,6 +222,32 @@ generic_register_convertible_not (int num)
 }
   
 
+int
+default_register_sim_regno (int num)
+{
+  return num;
+}
+
+
+CORE_ADDR
+default_convert_from_func_ptr_addr (CORE_ADDR addr)
+{
+  return addr;
+}
+
+int
+no_op_reg_to_regnum (int reg)
+{
+  return reg;
+}
+
+/* For use by frame_args_address and frame_locals_address.  */
+CORE_ADDR
+default_frame_address (struct frame_info *fi)
+{
+  return fi->frame;
+}
+
 /* Functions to manipulate the endianness of the target.  */
 
 #ifdef TARGET_BYTE_ORDER_SELECTABLE
@@ -292,7 +320,10 @@ set_endian (char *ignore_args, int from_tty, struct cmd_list_element *c)
          struct gdbarch_info info;
          memset (&info, 0, sizeof info);
          info.byte_order = LITTLE_ENDIAN;
-         gdbarch_update (info);
+         if (! gdbarch_update_p (info))
+           {
+             printf_unfiltered ("Little endian target not supported by GDB\n");
+           }
        }
       else
        {
@@ -307,7 +338,10 @@ set_endian (char *ignore_args, int from_tty, struct cmd_list_element *c)
          struct gdbarch_info info;
          memset (&info, 0, sizeof info);
          info.byte_order = BIG_ENDIAN;
-         gdbarch_update (info);
+         if (! gdbarch_update_p (info))
+           {
+             printf_unfiltered ("Big endian target not supported by GDB\n");
+           }
        }
       else
        {
@@ -315,7 +349,8 @@ set_endian (char *ignore_args, int from_tty, struct cmd_list_element *c)
        }
     }
   else
-    internal_error ("set_endian: bad value");
+    internal_error (__FILE__, __LINE__,
+                   "set_endian: bad value");
   show_endian (NULL, from_tty);
 }
 
@@ -325,7 +360,8 @@ static void
 set_endian_from_file (bfd *abfd)
 {
   if (GDB_MULTI_ARCH)
-    internal_error ("set_endian_from_file: not for multi-arch");
+    internal_error (__FILE__, __LINE__,
+                   "set_endian_from_file: not for multi-arch");
   if (TARGET_BYTE_ORDER_SELECTABLE_P)
     {
       int want;
@@ -371,7 +407,8 @@ static int
 arch_ok (const struct bfd_arch_info *arch)
 {
   if (GDB_MULTI_ARCH)
-    internal_error ("arch_ok: not multi-arched");
+    internal_error (__FILE__, __LINE__,
+                   "arch_ok: not multi-arched");
   /* Should be performing the more basic check that the binary is
      compatible with GDB. */
   /* Check with the target that the architecture is valid. */
@@ -384,7 +421,8 @@ set_arch (const struct bfd_arch_info *arch,
           enum set_arch type)
 {
   if (GDB_MULTI_ARCH)
-    internal_error ("set_arch: not multi-arched");
+    internal_error (__FILE__, __LINE__,
+                   "set_arch: not multi-arched");
   switch (type)
     {
     case set_arch_auto:
@@ -418,11 +456,13 @@ set_architecture_from_arch_mach (enum bfd_architecture arch,
 {
   const struct bfd_arch_info *wanted = bfd_lookup_arch (arch, mach);
   if (GDB_MULTI_ARCH)
-    internal_error ("set_architecture_from_arch_mach: not multi-arched");
+    internal_error (__FILE__, __LINE__,
+                   "set_architecture_from_arch_mach: not multi-arched");
   if (wanted != NULL)
     set_arch (wanted, set_arch_manual);
   else
-    internal_error ("gdbarch: hardwired architecture/machine not reconized");
+    internal_error (__FILE__, __LINE__,
+                   "gdbarch: hardwired architecture/machine not recognized");
 }
 
 /* Set the architecture from a BFD (deprecated) */
@@ -432,7 +472,8 @@ set_architecture_from_file (bfd *abfd)
 {
   const struct bfd_arch_info *wanted = bfd_get_arch_info (abfd);
   if (GDB_MULTI_ARCH)
-    internal_error ("set_architecture_from_file: not multi-arched");
+    internal_error (__FILE__, __LINE__,
+                   "set_architecture_from_file: not multi-arched");
   if (target_architecture_auto)
     {
       set_arch (wanted, set_arch_auto);
@@ -477,11 +518,12 @@ set_architecture (char *ignore_args, int from_tty, struct cmd_list_element *c)
       memset (&info, 0, sizeof info);
       info.bfd_arch_info = bfd_scan_arch (set_architecture_string);
       if (info.bfd_arch_info == NULL)
-       internal_error ("set_architecture: bfd_scan_arch failed");
-      if (gdbarch_update (info))
+       internal_error (__FILE__, __LINE__,
+                       "set_architecture: bfd_scan_arch failed");
+      if (gdbarch_update_p (info))
        target_architecture_auto = 0;
       else
-       printf_unfiltered ("Architecture `%s' not reconized.\n",
+       printf_unfiltered ("Architecture `%s' not recognized.\n",
                           set_architecture_string);
     }
   else
@@ -489,7 +531,8 @@ set_architecture (char *ignore_args, int from_tty, struct cmd_list_element *c)
       const struct bfd_arch_info *arch
        = bfd_scan_arch (set_architecture_string);
       if (arch == NULL)
-       internal_error ("set_architecture: bfd_scan_arch failed");
+       internal_error (__FILE__, __LINE__,
+                       "set_architecture: bfd_scan_arch failed");
       set_arch (arch, set_arch_manual);
     }
   show_architecture (NULL, from_tty);
@@ -509,7 +552,7 @@ info_architecture (char *args, int from_tty)
        {
          printf_filtered (" %s", *arch);
        }
-      free (arches);
+      xfree (arches);
     }
   else
     {
@@ -529,7 +572,7 @@ info_architecture (char *args, int from_tty)
   printf_filtered ("\n");
 }
 
-/* Set the dynamic target-system-dependant parameters (architecture,
+/* Set the dynamic target-system-dependent parameters (architecture,
    byte-order) using information found in the BFD */
 
 void
@@ -540,7 +583,8 @@ set_gdbarch_from_file (bfd *abfd)
       struct gdbarch_info info;
       memset (&info, 0, sizeof info);
       info.abfd = abfd;
-      gdbarch_update (info);
+      if (! gdbarch_update_p (info))
+       error ("Architecture of file not recognized.\n");
     }
   else
     {
@@ -592,10 +636,12 @@ initialize_current_architecture (void)
            chosen = *arch;
        }
       if (chosen == NULL)
-       internal_error ("initialize_current_architecture: No arch");
+       internal_error (__FILE__, __LINE__,
+                       "initialize_current_architecture: No arch");
       info.bfd_arch_info = bfd_scan_arch (chosen);
       if (info.bfd_arch_info == NULL)
-       internal_error ("initialize_current_architecture: Arch not found");
+       internal_error (__FILE__, __LINE__,
+                       "initialize_current_architecture: Arch not found");
     }
 
   /* take several guesses at a byte order. */
@@ -635,7 +681,11 @@ initialize_current_architecture (void)
 
   if (GDB_MULTI_ARCH)
     {
-      gdbarch_update (info);
+      if (! gdbarch_update_p (info))
+       {
+         internal_error (__FILE__, __LINE__,
+                         "initialize_current_architecture: Selection of initial architecture failed");
+       }
     }
 
   /* Create the ``set architecture'' command appending ``auto'' to the