Not part of the sources

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

diff --git a/gdb/language.c b/gdb/language.c
index 1c10026f813a7eb97e9fe381f8d7dc3d7b3e70c1..225d423ec01e5a468acee7ab0243607a847e2c14 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -99,7 +99,7 @@ static void
 unk_lang_print_type PARAMS ((struct type *, char *, GDB_FILE *, int, int));
 
 static int
-unk_lang_val_print PARAMS ((struct type *, char *, CORE_ADDR, GDB_FILE *,
+unk_lang_val_print PARAMS ((struct type *, char *, int, CORE_ADDR, GDB_FILE *,
                            int, int, int, enum val_prettyprint));
 
 static int
@@ -166,9 +166,9 @@ show_language_command (ignore, from_tty)
 
    flang = get_frame_language();
    if (flang != language_unknown &&
-      language_mode == language_mode_manual &&
-      current_language->la_language != flang)
-      printf_filtered("%s\n",lang_frame_mismatch_warn);
+       language_mode == language_mode_manual &&
+       current_language->la_language != flang)
+     printf_filtered("%s\n",lang_frame_mismatch_warn);
 }
 
 /* Set command.  Change the current working language. */
@@ -834,7 +834,7 @@ lang_bool_type ()
          if (type && TYPE_CODE (type) == TYPE_CODE_BOOL)
            return type;
        }
-      /* ... else fall through ... */
+      return builtin_type_bool;
     default:
       return builtin_type_int;
     }
@@ -1123,6 +1123,21 @@ range_error (va_alist)
 \f
 /* This page contains miscellaneous functions */
 
+/* Return the language enum for a given language string. */
+
+enum language
+language_enum (str)
+     char *str;
+{
+  int i;
+
+  for (i = 0; i < languages_size; i++) 
+    if (STREQ (languages[i]->la_name, str))
+      return languages[i]->la_language;
+
+  return language_unknown;
+}
+
 /* Return the language struct for a given language enum. */
 
 const struct language_defn *
@@ -1263,10 +1278,11 @@ unk_lang_print_type (type, varstring, stream, show, level)
 }
 
 static int
-unk_lang_val_print (type, valaddr, address, stream, format, deref_ref,
+unk_lang_val_print (type, valaddr,  embedded_offset, address, stream, format, deref_ref,
                    recurse, pretty)
      struct type *type;
      char *valaddr;
+     int embedded_offset;
      CORE_ADDR address;
      GDB_FILE *stream;
      int format;