*** empty log message ***
[deliverable/binutils-gdb.git] / gdb / p-valprint.c
index 3d00a69867fd820bb96123205589312ced9ba903..e993c05c3f2dbaf0ccb8e7a510548bf71b71f8c7 100644 (file)
@@ -1,6 +1,6 @@
 /* Support for printing Pascal values for GDB, the GNU debugger.
 
-   Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010
+   Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -96,7 +96,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
                {
                  unsigned int temp_len;
 
-                 /* Look for a NULL char. */
+                 /* Look for a NULL char.  */
                  for (temp_len = 0;
                       extract_unsigned_integer (valaddr + embedded_offset +
                                                 temp_len * eltlen, eltlen,
@@ -125,8 +125,9 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
                {
                  i = 0;
                }
-             val_print_array_elements (type, valaddr + embedded_offset, address, stream,
-                                       recurse, original_value, options, i);
+             val_print_array_elements (type, valaddr + embedded_offset,
+                                       address, stream, recurse,
+                                       original_value, options, i);
              fprintf_filtered (stream, "}");
            }
          break;
@@ -146,7 +147,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
        {
          /* Print the unmangled name if desired.  */
          /* Print vtable entry - we only get here if we ARE using
-            -fvtable_thunks.  (Otherwise, look under TYPE_CODE_STRUCT.) */
+            -fvtable_thunks.  (Otherwise, look under TYPE_CODE_STRUCT.)  */
          /* Extract the address, assume that it is unsigned.  */
          addr = extract_unsigned_integer (valaddr + embedded_offset,
                                           TYPE_LENGTH (type), byte_order);
@@ -182,14 +183,14 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
          && (options->format == 0 || options->format == 's')
          && addr != 0)
        {
-         /* no wide string yet */
-         i = val_print_string (elttype, addr, -1, stream, options);
+         /* No wide string yet.  */
+         i = val_print_string (elttype, NULL, addr, -1, stream, options);
        }
-      /* also for pointers to pascal strings */
+      /* Also for pointers to pascal strings.  */
       /* Note: this is Free Pascal specific:
         as GDB does not recognize stabs pascal strings
         Pascal strings are mapped to records
-        with lowercase names PM  */
+        with lowercase names PM.  */
       if (is_pascal_string_type (elttype, &length_pos, &length_size,
                                 &string_pos, &char_type, NULL)
          && addr != 0)
@@ -202,12 +203,15 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
          string_length = extract_unsigned_integer (buffer, length_size,
                                                    byte_order);
          xfree (buffer);
-         i = val_print_string (char_type ,addr + string_pos, string_length, stream, options);
+         i = val_print_string (char_type, NULL,
+                               addr + string_pos, string_length,
+                               stream, options);
        }
       else if (pascal_object_is_vtbl_member (type))
        {
-         /* print vtbl's nicely */
-         CORE_ADDR vt_address = unpack_pointer (type, valaddr + embedded_offset);
+         /* Print vtbl's nicely.  */
+         CORE_ADDR vt_address = unpack_pointer (type,
+                                                valaddr + embedded_offset);
          struct minimal_symbol *msymbol =
            lookup_minimal_symbol_by_pc (vt_address);
 
@@ -298,12 +302,16 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
        {
          /* Print the unmangled name if desired.  */
          /* Print vtable entry - we only get here if NOT using
-            -fvtable_thunks.  (Otherwise, look under TYPE_CODE_PTR.) */
+            -fvtable_thunks.  (Otherwise, look under TYPE_CODE_PTR.)  */
          /* Extract the address, assume that it is unsigned.  */
          print_address_demangle
            (gdbarch,
-            extract_unsigned_integer (valaddr + embedded_offset + TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8,
-                                      TYPE_LENGTH (TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET)), byte_order),
+            extract_unsigned_integer (valaddr + embedded_offset
+                                      + TYPE_FIELD_BITPOS (type,
+                                                           VTBL_FNADDR_OFFSET) / 8,
+                                      TYPE_LENGTH (TYPE_FIELD_TYPE (type,
+                                                                    VTBL_FNADDR_OFFSET)),
+                                      byte_order),
             stream, demangle);
        }
       else
@@ -311,14 +319,18 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
           if (is_pascal_string_type (type, &length_pos, &length_size,
                                      &string_pos, &char_type, NULL))
            {
-             len = extract_unsigned_integer (valaddr + embedded_offset + length_pos, length_size, byte_order);
+             len = extract_unsigned_integer (valaddr + embedded_offset
+                                             + length_pos, length_size,
+                                             byte_order);
              LA_PRINT_STRING (stream, char_type, 
                               valaddr + embedded_offset + string_pos,
                               len, NULL, 0, options);
            }
          else
-           pascal_object_print_value_fields (type, valaddr + embedded_offset, address, stream,
-                                             recurse, original_value, options, NULL, 0);
+           pascal_object_print_value_fields (type, valaddr + embedded_offset,
+                                             address, stream, recurse,
+                                             original_value, options,
+                                             NULL, 0);
        }
       break;
 
@@ -499,7 +511,8 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
 
          for (i = low_bound; i <= high_bound; i++)
            {
-             int element = value_bit_index (type, valaddr + embedded_offset, i);
+             int element = value_bit_index (type,
+                                            valaddr + embedded_offset, i);
 
              if (element < 0)
                {
@@ -515,13 +528,17 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
                  print_type_scalar (range, i, stream);
                  need_comma = 1;
 
-                 if (i + 1 <= high_bound && value_bit_index (type, valaddr + embedded_offset, ++i))
+                 if (i + 1 <= high_bound
+                     && value_bit_index (type,
+                                         valaddr + embedded_offset, ++i))
                    {
                      int j = i;
 
                      fputs_filtered ("..", stream);
                      while (i + 1 <= high_bound
-                            && value_bit_index (type, valaddr + embedded_offset, ++i))
+                            && value_bit_index (type,
+                                                valaddr + embedded_offset,
+                                                ++i))
                        j = i;
                      print_type_scalar (range, j, stream);
                    }
@@ -540,7 +557,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
       break;
 
     case TYPE_CODE_ERROR:
-      fprintf_filtered (stream, "<error type>");
+      fprintf_filtered (stream, "%s", TYPE_ERROR_NAME (type));
       break;
 
     case TYPE_CODE_UNDEF:
@@ -551,7 +568,8 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
       break;
 
     default:
-      error (_("Invalid pascal type code %d in symbol table."), TYPE_CODE (type));
+      error (_("Invalid pascal type code %d in symbol table."),
+            TYPE_CODE (type));
     }
   gdb_flush (stream);
   return (0);
@@ -576,13 +594,13 @@ pascal_value_print (struct value *val, struct ui_file *stream,
       || TYPE_CODE (type) == TYPE_CODE_REF)
     {
       /* Hack:  remove (char *) for char strings.  Their
-         type is indicated by the quoted string anyway. */
+         type is indicated by the quoted string anyway.  */
       if (TYPE_CODE (type) == TYPE_CODE_PTR 
          && TYPE_NAME (type) == NULL
          && TYPE_NAME (TYPE_TARGET_TYPE (type)) != NULL
          && strcmp (TYPE_NAME (TYPE_TARGET_TYPE (type)), "char") == 0)
        {
-         /* Print nothing */
+         /* Print nothing */
        }
       else
        {
@@ -644,11 +662,12 @@ pascal_object_is_vtbl_member (struct type *type)
       if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
        {
          type = TYPE_TARGET_TYPE (type);
-         if (TYPE_CODE (type) == TYPE_CODE_STRUCT      /* if not using thunks */
-             || TYPE_CODE (type) == TYPE_CODE_PTR)     /* if using thunks */
+         if (TYPE_CODE (type) == TYPE_CODE_STRUCT      /* If not using
+                                                          thunks.  */
+             || TYPE_CODE (type) == TYPE_CODE_PTR)     /* If using thunks.  */
            {
              /* Virtual functions tables are full of pointers
-                to virtual functions. */
+                to virtual functions.  */
              return pascal_object_is_vtbl_ptr_type (type);
            }
        }
@@ -777,6 +796,14 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                {
                  fputs_filtered ("<optimized out or zero length>", stream);
                }
+             else if (value_bits_synthetic_pointer (val,
+                                                    TYPE_FIELD_BITPOS (type,
+                                                                       i),
+                                                    TYPE_FIELD_BITSIZE (type,
+                                                                        i)))
+               {
+                 fputs_filtered (_("<synthetic pointer>"), stream);
+               }
              else if (!value_bits_valid (val, TYPE_FIELD_BITPOS (type, i),
                                          TYPE_FIELD_BITSIZE (type, i)))
                {
@@ -802,7 +829,8 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
                }
              else if (field_is_static (&TYPE_FIELD (type, i)))
                {
-                 /* struct value *v = value_static_field (type, i); v4.17 specific */
+                 /* struct value *v = value_static_field (type, i);
+                    v4.17 specific.  */
                  struct value *v;
 
                  v = value_from_longest (TYPE_FIELD_TYPE (type, i),
@@ -912,12 +940,12 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
       fputs_filtered ("> = ", stream);
 
       /* The virtual base class pointer might have been clobbered by the
-         user program. Make sure that it still points to a valid memory
+         user program.  Make sure that it still points to a valid memory
          location.  */
 
       if (boffset != -1 && (boffset < 0 || boffset >= TYPE_LENGTH (type)))
        {
-         /* FIXME (alloc): not safe is baseclass is really really big. */
+         /* FIXME (alloc): not safe is baseclass is really really big.  */
          gdb_byte *buf = alloca (TYPE_LENGTH (baseclass));
 
          base_valaddr = buf;
@@ -931,8 +959,9 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
       if (boffset == -1)
        fprintf_filtered (stream, "<invalid address>");
       else
-       pascal_object_print_value_fields (baseclass, base_valaddr, address + boffset,
-                                         stream, recurse, val, options,
+       pascal_object_print_value_fields (baseclass, base_valaddr,
+                                         address + boffset, stream,
+                                         recurse, val, options,
                     (struct type **) obstack_base (&dont_print_vb_obstack),
                                          0);
       fputs_filtered (", ", stream);
@@ -984,7 +1013,8 @@ pascal_object_print_static_field (struct value *val,
        {
          if (value_address (val) == first_dont_print[i])
            {
-             fputs_filtered ("<same as static member of an already seen type>",
+             fputs_filtered ("\
+<same as static member of an already seen type>",
                              stream);
              return;
            }
@@ -1006,7 +1036,8 @@ pascal_object_print_static_field (struct value *val,
   common_val_print (val, stream, recurse, &opts, current_language);
 }
 
-extern initialize_file_ftype _initialize_pascal_valprint; /* -Wmissing-prototypes */
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_pascal_valprint;
 
 void
 _initialize_pascal_valprint (void)
This page took 0.027455 seconds and 4 git commands to generate.