* blockframe.c (inside_main_func): No longer use symbol_lookup()

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

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 1727bda8d2bb5f9aa791963b8a7397d33a808900..c6c482abe8f4138616071abf24eb726336f6b978 100644 (file)
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -30,6 +30,7 @@
 #include "language.h"
 #include "f-lang.h"
 #include "valprint.h"
+#include "value.h"
 
 /* The built-in types of F77.  FIXME: integer*4 is missing, plain
    logical is missing (builtin_type_logical is logical*4).  */
@@ -99,7 +100,7 @@ static void f_emit_char (int c, struct ui_file * stream, int quoter);
    be replaced with a true F77 version.  */
 
 static void
-f_emit_char (register int c, struct ui_file *stream, int quoter)
+f_emit_char (int c, struct ui_file *stream, int quoter)
 {
   c &= 0xFF;                   /* Avoid sign bit follies */
 
@@ -163,11 +164,10 @@ static void
 f_printstr (struct ui_file *stream, char *string, unsigned int length,
            int width, int force_ellipses)
 {
-  register unsigned int i;
+  unsigned int i;
   unsigned int things_printed = 0;
   int in_quotes = 0;
   int need_comma = 0;
-  extern int inspect_it;
 
   if (length == 0)
     {
@@ -250,7 +250,7 @@ f_printstr (struct ui_file *stream, char *string, unsigned int length,
 static struct type *
 f_create_fundamental_type (struct objfile *objfile, int typeid)
 {
-  register struct type *type = NULL;
+  struct type *type = NULL;
 
   switch (typeid)
     {
@@ -462,9 +462,9 @@ const struct language_defn f_language_defn =
   range_check_on,
   type_check_on,
   case_sensitive_off,
+  &exp_descriptor_standard,
   f_parse,                     /* parser */
   f_error,                     /* parser error function */
-  evaluate_subexp_standard,
   f_printchar,                 /* Print character constant */
   f_printstr,                  /* function to print string constant */
   f_emit_char,                 /* Function to print a single character */
@@ -472,6 +472,10 @@ const struct language_defn f_language_defn =
   f_print_type,                        /* Print a type using appropriate syntax */
   f_val_print,                 /* Print a value using appropriate syntax */
   c_value_print,               /* FIXME */
+  NULL,                                /* Language specific skip_trampoline */
+  value_of_this,               /* value_of_this */
+  basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
+  NULL,                                /* Language specific symbol demangler */
   {"", "", "", ""},            /* Binary format info */
   {"0%o", "0", "o", ""},       /* Octal format info */
   {"%d", "", "d", ""},         /* Decimal format info */
@@ -480,11 +484,12 @@ const struct language_defn f_language_defn =
   0,                           /* arrays are first-class (not c-style) */
   1,                           /* String lower bound */
   &builtin_type_f_character,   /* Type of string elements */
+  default_word_break_characters,
   LANG_MAGIC
 };
 
-void
-_initialize_f_language (void)
+static void
+build_fortran_types (void)
 {
   builtin_type_f_void =
     init_type (TYPE_CODE_VOID, 1,
@@ -556,6 +561,42 @@ _initialize_f_language (void)
               0,
               "complex*32", (struct objfile *) NULL);
   TYPE_TARGET_TYPE (builtin_type_f_complex_s32) = builtin_type_f_real_s16;
+}
+
+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);
 
   builtin_type_string =
     init_type (TYPE_CODE_STRING, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
@@ -904,7 +945,7 @@ get_bf_for_fcn (long the_function)
     if (current_head_bf_list->symnum_fcn == the_function)
       {
        if (global_remote_debug)
-         fprintf (stderr, "*");
+         fprintf_unfiltered (gdb_stderr, "*");
 
        tmp = current_head_bf_list;
        current_head_bf_list = current_head_bf_list->next;
@@ -916,7 +957,7 @@ get_bf_for_fcn (long the_function)
      the ugly linear scan */
 
   if (global_remote_debug)
-    fprintf (stderr, "\ndefaulting to linear scan\n");
+    fprintf_unfiltered (gdb_stderr, "\ndefaulting to linear scan\n");
 
   nprobes = 0;
   tmp = saved_bf_list;
@@ -926,7 +967,7 @@ get_bf_for_fcn (long the_function)
       if (tmp->symnum_fcn == the_function)
        {
          if (global_remote_debug)
-           fprintf (stderr, "Found in %d probes\n", nprobes);
+           fprintf_unfiltered (gdb_stderr, "Found in %d probes\n", nprobes);
          current_head_bf_list = tmp->next;
          return (tmp->symnum_bf);
        }