* gas/i386/intel16.d: Ignore trailing text with #pass.

[deliverable/binutils-gdb.git] / gdb / f-lang.c

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index f84e0505fe8a784b7ec9abd387819f5240b2d16b..e058dd4aa430e882cd12b748b357823ca704a567 100644 (file)
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -1,5 +1,5 @@
 /* Fortran language support routines for GDB, the GNU debugger.
-   Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+   Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
    Contributed by Motorola.  Adapted from the C parser by Farooq Butt
    (fmbutt@engage.sps.mot.com).
@@ -462,9 +462,11 @@ const struct language_defn f_language_defn =
   range_check_on,
   type_check_on,
   case_sensitive_off,
+  array_column_major,
   &exp_descriptor_standard,
   f_parse,                     /* parser */
   f_error,                     /* parser error function */
+  null_post_parser,
   f_printchar,                 /* Print character constant */
   f_printstr,                  /* function to print string constant */
   f_emit_char,                 /* Function to print a single character */
@@ -475,15 +477,15 @@ const struct language_defn f_language_defn =
   NULL,                                /* Language specific skip_trampoline */
   value_of_this,               /* value_of_this */
   basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
+  basic_lookup_transparent_type,/* lookup_transparent_type */
   NULL,                                /* Language specific symbol demangler */
-  {"", "", "", ""},            /* Binary format info */
-  {"0%o", "0", "o", ""},       /* Octal format info */
-  {"%d", "", "d", ""},         /* Decimal format info */
-  {"0x%x", "0x", "x", ""},     /* Hex format info */
+  NULL,                                /* Language specific class_name_from_physname */
   f_op_print_tab,              /* expression operators for printing */
   0,                           /* arrays are first-class (not c-style) */
   1,                           /* String lower bound */
   &builtin_type_f_character,   /* Type of string elements */
+  default_word_break_characters,
+  NULL, /* FIXME: la_language_arch_info.  */
   LANG_MAGIC
 };
 
@@ -566,36 +568,22 @@ void
 _initialize_f_language (void)
 {
   build_fortran_types ();
-  register_gdbarch_swap (&builtin_type_f_character, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_logical, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_logical_s1, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_logical_s2, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_integer, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_integer_s2, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_real, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_real_s8, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_real_s16, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_complex_s8, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_complex_s16, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_complex_s32, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_f_void, 
-                        sizeof (struct type *), NULL);
-  register_gdbarch_swap (&builtin_type_string, 
-                        sizeof (struct type *), NULL);
-
-  register_gdbarch_swap (NULL, 0, build_fortran_types);
+
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_character);
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_logical); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_logical_s1); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_logical_s2); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_integer); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_integer_s2); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_real); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_real_s8); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_real_s16); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_complex_s8); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_complex_s16); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_complex_s32); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_void); 
+  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_string); 
+  deprecated_register_gdbarch_swap (NULL, 0, build_fortran_types);
 
   builtin_type_string =
     init_type (TYPE_CODE_STRING, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
@@ -672,8 +660,8 @@ add_common_block (char *name, CORE_ADDR offset, int secnum, char *func_stab)
      parser have fits. */
 
 
-  if (STREQ (name, BLANK_COMMON_NAME_ORIGINAL) ||
-      STREQ (name, BLANK_COMMON_NAME_MF77))
+  if (strcmp (name, BLANK_COMMON_NAME_ORIGINAL) == 0
+      || strcmp (name, BLANK_COMMON_NAME_MF77) == 0)
     {
 
       xfree (name);
@@ -776,7 +764,7 @@ find_first_common_named (char *name)
 
   while (tmp != NULL)
     {
-      if (STREQ (tmp->name, name))
+      if (strcmp (tmp->name, name) == 0)
        return (tmp);
       else
        tmp = tmp->next;
@@ -798,7 +786,8 @@ find_common_for_function (char *name, char *funcname)
 
   while (tmp != NULL)
     {
-      if (STREQ (tmp->name, name) && STREQ (tmp->owning_function, funcname))
+      if (DEPRECATED_STREQ (tmp->name, name)
+         && DEPRECATED_STREQ (tmp->owning_function, funcname))
        return (tmp);
       else
        tmp = tmp->next;
@@ -847,8 +836,8 @@ patch_all_commons_by_name (char *name, CORE_ADDR offset, int secnum)
   /* For blank common blocks, change the canonical reprsentation 
      of a blank name */
 
-  if ((STREQ (name, BLANK_COMMON_NAME_ORIGINAL)) ||
-      (STREQ (name, BLANK_COMMON_NAME_MF77)))
+  if (strcmp (name, BLANK_COMMON_NAME_ORIGINAL) == 0
+      || strcmp (name, BLANK_COMMON_NAME_MF77) == 0)
     {
       xfree (name);
       name = alloca (strlen (BLANK_COMMON_NAME_LOCAL) + 1);
@@ -860,7 +849,7 @@ patch_all_commons_by_name (char *name, CORE_ADDR offset, int secnum)
   while (tmp != NULL)
     {
       if (COMMON_NEEDS_PATCHING (tmp))
-       if (STREQ (tmp->name, name))
+       if (strcmp (tmp->name, name) == 0)
          patch_common_entries (tmp, offset, secnum);
 
       tmp = tmp->next;