When debugging a mixed Ada/C program using this scenario:

[deliverable/binutils-gdb.git] / gdb / ada-valprint.c

diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 5d7823d7204186afd43f87b9ec58fa381184d724..0654049d77b9b60a454194ed5d2a55b026ccead4 100644 (file)
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -765,8 +765,7 @@ ada_val_print_gnat_array (struct type *type, const gdb_byte *valaddr,
                          int offset, CORE_ADDR address,
                          struct ui_file *stream, int recurse,
                          struct value *original_value,
-                         const struct value_print_options *options,
-                         const struct language_defn *language)
+                         const struct value_print_options *options)
 {
   struct value *mark = value_mark ();
   struct value *val;
@@ -788,7 +787,8 @@ ada_val_print_gnat_array (struct type *type, const gdb_byte *valaddr,
   else
     val_print (value_type (val),
               value_embedded_offset (val), value_address (val),
-              stream, recurse, val, options, language);
+              stream, recurse, val, options,
+              language_def (language_ada));
   value_free_to_mark (mark);
 }
 
@@ -800,8 +800,7 @@ ada_val_print_ptr (struct type *type, const gdb_byte *valaddr,
                   int offset, int offset_aligned, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
                   struct value *original_value,
-                  const struct value_print_options *options,
-                  const struct language_defn *language)
+                  const struct value_print_options *options)
 {
   val_print (type, offset, address, stream, recurse,
             original_value, options, language_def (language_c));
@@ -827,8 +826,7 @@ ada_val_print_num (struct type *type, const gdb_byte *valaddr,
                   int offset, int offset_aligned, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
                   struct value *original_value,
-                  const struct value_print_options *options,
-                  const struct language_defn *language)
+                  const struct value_print_options *options)
 {
   if (ada_is_fixed_point_type (type))
     {
@@ -859,12 +857,13 @@ ada_val_print_num (struct type *type, const gdb_byte *valaddr,
 
          val_print (target_type,
                     value_embedded_offset (v), 0, stream,
-                    recurse + 1, v, options, language);
+                    recurse + 1, v, options,
+                    language_def (language_ada));
        }
       else
        val_print (TYPE_TARGET_TYPE (type), offset,
                   address, stream, recurse, original_value,
-                  options, language);
+                  options, language_def (language_ada));
       return;
     }
   else
@@ -923,8 +922,7 @@ ada_val_print_enum (struct type *type, const gdb_byte *valaddr,
                    int offset, int offset_aligned, CORE_ADDR address,
                    struct ui_file *stream, int recurse,
                    struct value *original_value,
-                   const struct value_print_options *options,
-                   const struct language_defn *language)
+                   const struct value_print_options *options)
 {
   int i;
   unsigned int len;
@@ -967,8 +965,7 @@ ada_val_print_flt (struct type *type, const gdb_byte *valaddr,
                   int offset, int offset_aligned, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
                   struct value *original_value,
-                  const struct value_print_options *options,
-                  const struct language_defn *language)
+                  const struct value_print_options *options)
 {
   if (options->format)
     {
@@ -988,8 +985,7 @@ ada_val_print_struct_union
   (struct type *type, const gdb_byte *valaddr, int offset,
    int offset_aligned, CORE_ADDR address, struct ui_file *stream,
    int recurse, struct value *original_value,
-   const struct value_print_options *options,
-   const struct language_defn *language)
+   const struct value_print_options *options)
 {
   if (ada_is_bogus_array_descriptor (type))
     {
@@ -1001,7 +997,8 @@ ada_val_print_struct_union
 
   if (print_field_values (type, valaddr, offset_aligned,
                          stream, recurse, original_value, options,
-                         0, type, offset_aligned, language) != 0
+                         0, type, offset_aligned,
+                         language_def (language_ada)) != 0
       && options->prettyformat)
     {
       fprintf_filtered (stream, "\n");
@@ -1052,8 +1049,7 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr,
                   int offset, int offset_aligned, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
                   struct value *original_value,
-                  const struct value_print_options *options,
-                  const struct language_defn *language)
+                  const struct value_print_options *options)
 {
   /* For references, the debugger is expected to print the value as
      an address if DEREF_REF is null.  But printing an address in place
@@ -1077,7 +1073,7 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr,
        deref_val = ada_tag_value_at_base_address (deref_val);
 
       common_val_print (deref_val, stream, recurse + 1, options,
-                       language);
+                       language_def (language_ada));
       return;
     }
 
@@ -1106,7 +1102,7 @@ ada_val_print_ref (struct type *type, const gdb_byte *valaddr,
   val_print (value_type (deref_val),
             value_embedded_offset (deref_val),
             value_address (deref_val), stream, recurse + 1,
-            deref_val, options, language);
+            deref_val, options, language_def (language_ada));
 }
 
 /* See the comment on ada_val_print.  This function differs in that it
@@ -1117,8 +1113,7 @@ ada_val_print_1 (struct type *type,
                 int offset, CORE_ADDR address,
                 struct ui_file *stream, int recurse,
                 struct value *original_value,
-                const struct value_print_options *options,
-                const struct language_defn *language)
+                const struct value_print_options *options)
 {
   int offset_aligned;
   const gdb_byte *valaddr = value_contents_for_printing (original_value);
@@ -1131,7 +1126,7 @@ ada_val_print_1 (struct type *type,
     {
       ada_val_print_gnat_array (type, valaddr, offset, address,
                                stream, recurse, original_value,
-                               options, language);
+                               options);
       return;
     }
 
@@ -1150,33 +1145,33 @@ ada_val_print_1 (struct type *type,
     case TYPE_CODE_PTR:
       ada_val_print_ptr (type, valaddr, offset, offset_aligned,
                         address, stream, recurse, original_value,
-                        options, language);
+                        options);
       break;
 
     case TYPE_CODE_INT:
     case TYPE_CODE_RANGE:
       ada_val_print_num (type, valaddr, offset, offset_aligned,
                         address, stream, recurse, original_value,
-                        options, language);
+                        options);
       break;
 
     case TYPE_CODE_ENUM:
       ada_val_print_enum (type, valaddr, offset, offset_aligned,
                          address, stream, recurse, original_value,
-                         options, language);
+                         options);
       break;
 
     case TYPE_CODE_FLT:
       ada_val_print_flt (type, valaddr, offset, offset_aligned,
                         address, stream, recurse, original_value,
-                        options, language);
+                        options);
       break;
 
     case TYPE_CODE_UNION:
     case TYPE_CODE_STRUCT:
       ada_val_print_struct_union (type, valaddr, offset, offset_aligned,
                                  address, stream, recurse,
-                                 original_value, options, language);
+                                 original_value, options);
       break;
 
     case TYPE_CODE_ARRAY:
@@ -1188,7 +1183,7 @@ ada_val_print_1 (struct type *type,
     case TYPE_CODE_REF:
       ada_val_print_ref (type, valaddr, offset, offset_aligned,
                         address, stream, recurse, original_value,
-                        options, language);
+                        options);
       break;
     }
 }
@@ -1206,8 +1201,7 @@ ada_val_print (struct type *type,
   try
     {
       ada_val_print_1 (type, embedded_offset, address,
-                      stream, recurse, val, options,
-                      current_language);
+                      stream, recurse, val, options);
     }
   catch (const gdb_exception_error &except)
     {