*** empty log message ***

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

diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 7c96db04a77c957191f8335c8d0ff6630747cfb3..c56d221bc44e0842ef38738fa792b3e2fce5b58b 100644 (file)
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <ctype.h>
 #include "defs.h"
+#include <ctype.h>
 #include "gdb_string.h"
 #include "symtab.h"
 #include "gdbtypes.h"
@@ -163,6 +163,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
 
   {
     LONGEST high;
+
     if (get_discrete_bounds (index_type, &low, &high) < 0)
       len = 1;
     else
@@ -213,6 +214,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
       if (i - i0 > options->repeat_count_threshold)
        {
          struct value_print_options opts = *options;
+
          opts.deref_ref = 0;
          val_print (elttype, value_contents (v0), 0, 0, stream,
                     recurse + 1, &opts, current_language);
@@ -225,6 +227,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
        {
          int j;
          struct value_print_options opts = *options;
+
          opts.deref_ref = 0;
          for (j = i0; j < i; j += 1)
            {
@@ -332,7 +335,7 @@ ada_print_floating (const gdb_byte *valaddr, struct type *type,
   len = strlen (result);
 
   /* Modify for Ada rules.  */
-  
+
   s = strstr (result, "inf");
   if (s == NULL)
     s = strstr (result, "Inf");
@@ -556,7 +559,7 @@ printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
 
 void
 ada_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
-             unsigned int length, int force_ellipses,
+             unsigned int length, const char *encoding, int force_ellipses,
              const struct value_print_options *options)
 {
   printstr (stream, type, string, length, force_ellipses, TYPE_LENGTH (type),
@@ -598,6 +601,7 @@ static int
 ada_val_print_stub (void *args0)
 {
   struct ada_val_print_args *argsp = (struct ada_val_print_args *) args0;
+
   return ada_val_print_1 (argsp->type, argsp->valaddr0,
                          argsp->embedded_offset, argsp->address,
                          argsp->stream, argsp->recurse, argsp->options);
@@ -681,7 +685,6 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
   unsigned int len;
   int i;
   struct type *elttype;
-  unsigned int eltlen;
   LONGEST val;
   const gdb_byte *valaddr = valaddr0 + embedded_offset;
 
@@ -693,6 +696,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
       int retn;
       struct value *mark = value_mark ();
       struct value *val;
+
       val = value_from_contents_and_address (type, valaddr, address);
       val = ada_coerce_to_simple_array_ptr (val);
       if (val == NULL)
@@ -721,11 +725,13 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
       {
        int ret = c_val_print (type, valaddr0, embedded_offset, address, 
                               stream, recurse, options);
+
        if (ada_is_tag_type (type))
          {
            struct value *val = 
              value_from_contents_and_address (type, valaddr, address);
            const char *name = ada_tag_name (val);
+
            if (name != NULL) 
              fprintf_filtered (stream, " (%s)", name);
            return 0;
@@ -744,25 +750,10 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
                            (double) ada_fixed_to_float (type, v));
          return 0;
        }
-      else if (ada_is_vax_floating_type (type))
-       {
-         struct value *val =
-           value_from_contents_and_address (type, valaddr, address);
-         struct value *func = ada_vax_float_print_function (type);
-         if (func != 0)
-           {
-             struct gdbarch *gdbarch = get_type_arch (type);
-             CORE_ADDR addr;
-             addr = value_as_address (call_function_by_hand (func, 1, &val));
-             val_print_string (builtin_type (gdbarch)->builtin_true_char,
-                               addr, -1, stream, options);
-             return 0;
-           }
-         /* No special printing function.  Do as best we can.  */
-       }
       else if (TYPE_CODE (type) == TYPE_CODE_RANGE)
        {
          struct type *target_type = TYPE_TARGET_TYPE (type);
+
          if (TYPE_LENGTH (type) != TYPE_LENGTH (target_type))
            {
              /* Obscure case of range type that has different length from
@@ -772,6 +763,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
              struct value *v = value_cast (target_type,
                                            value_from_contents_and_address
                                            (type, valaddr, 0));
+
              return ada_val_print_1 (target_type, value_contents (v), 0, 0,
                                      stream, recurse + 1, options);
            }
@@ -784,9 +776,11 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
        {
          int format = (options->format ? options->format
                        : options->output_format);
+
          if (format)
            {
              struct value_print_options opts = *options;
+
              opts.format = format;
              print_scalar_formatted (valaddr, type, &opts, 0, stream);
            }
@@ -839,6 +833,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
       if (i < len)
        {
          const char *name = ada_enum_name (TYPE_FIELD_NAME (type, i));
+
          if (name[0] == '\'')
            fprintf_filtered (stream, "%ld %s", (long) val, name);
          else
@@ -893,12 +888,14 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
       if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
         {
           LONGEST deref_val_int = (LONGEST) unpack_pointer (type, valaddr);
+
           if (deref_val_int != 0)
             {
               struct value *deref_val =
                 ada_value_ind (value_from_longest
                                (lookup_pointer_type (elttype),
                                 deref_val_int));
+
               val_print (value_type (deref_val),
                          value_contents (deref_val), 0,
                          value_address (deref_val), stream, recurse + 1,
@@ -940,12 +937,9 @@ int
 ada_value_print (struct value *val0, struct ui_file *stream,
                 const struct value_print_options *options)
 {
-  const gdb_byte *valaddr = value_contents (val0);
-  CORE_ADDR address = value_address (val0);
-  struct type *type =
-    ada_to_fixed_type (value_type (val0), valaddr, address, NULL, 1);
-  struct value *val =
-    value_from_contents_and_address (type, valaddr, address);
+  struct value *val = ada_to_fixed_value (val0);
+  CORE_ADDR address = value_address (val);
+  struct type *type = value_type (val);
   struct value_print_options opts;
 
   /* If it is a pointer, indicate what it points to.  */
@@ -1093,8 +1087,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr,
 
          /* Bitfields require special handling, especially due to byte
             order problems.  */
-         if (TYPE_CPLUS_SPECIFIC (type) != NULL
-             && TYPE_FIELD_IGNORE (type, i))
+         if (HAVE_CPLUS_STRUCT (type) && TYPE_FIELD_IGNORE (type, i))
            {
              fputs_filtered (_("<optimized out or zero length>"), stream);
            }
@@ -1119,6 +1112,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr,
       else
        {
          struct value_print_options opts = *options;
+
          opts.deref_ref = 0;
          ada_val_print (TYPE_FIELD_TYPE (type, i),
                         valaddr + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT,