2010-05-15 Michael Snyder <msnyder@vmware.com>

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

diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
index 71c410c9a81062a4c7f12ab7404fb01c104a34e6..edfd3245d7a91caec6979b7499a794453d083f89 100644 (file)
--- a/gdb/m2-valprint.c
+++ b/gdb/m2-valprint.c
@@ -1,7 +1,7 @@
 /* Support for printing Modula 2 values for GDB, the GNU debugger.
 
    Copyright (C) 1986, 1988, 1989, 1991, 1992, 1996, 1998, 2000, 2005, 2006,
-                 2007, 2008, 2009 Free Software Foundation, Inc.
+                 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -46,11 +46,10 @@ m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
    stream STREAM.  */
 
 static void
-print_function_pointer_address (CORE_ADDR address, struct ui_file *stream,
-                               int addressprint)
+print_function_pointer_address (struct gdbarch *gdbarch, CORE_ADDR address,
+                               struct ui_file *stream, int addressprint)
 {
-  CORE_ADDR func_addr = gdbarch_convert_from_func_ptr_addr (current_gdbarch,
-                                                           address,
+  CORE_ADDR func_addr = gdbarch_convert_from_func_ptr_addr (gdbarch, address,
                                                            &current_target);
 
   /* If the function pointer is represented by a description, print the
@@ -58,10 +57,10 @@ print_function_pointer_address (CORE_ADDR address, struct ui_file *stream,
   if (addressprint && func_addr != address)
     {
       fputs_filtered ("@", stream);
-      fputs_filtered (paddress (address), stream);
+      fputs_filtered (paddress (gdbarch, address), stream);
       fputs_filtered (": ", stream);
     }
-  print_address_demangle (func_addr, stream, demangle);
+  print_address_demangle (gdbarch, func_addr, stream, demangle);
 }
 
 /* get_long_set_bounds - assigns the bounds of the long set to low and
@@ -119,8 +118,6 @@ m2_print_long_set (struct type *type, const gdb_byte *valaddr,
     }
 
   target = TYPE_TARGET_TYPE (range);
-  if (target == NULL)
-    target = builtin_type_int32;
 
   if (get_discrete_bounds (range, &field_low, &field_high) >= 0)
     {
@@ -165,8 +162,6 @@ m2_print_long_set (struct type *type, const gdb_byte *valaddr,
              if (get_discrete_bounds (range, &field_low, &field_high) < 0)
                break;
              target = TYPE_TARGET_TYPE (range);
-             if (target == NULL)
-               target = builtin_type_int32;
            }
        }
       if (element_seen)
@@ -217,18 +212,20 @@ print_unpacked_pointer (struct type *type,
                        const struct value_print_options *options,
                        struct ui_file *stream)
 {
+  struct gdbarch *gdbarch = get_type_arch (type);
   struct type *elttype = check_typedef (TYPE_TARGET_TYPE (type));
 
   if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
     {
       /* Try to print what function it points to.  */
-      print_function_pointer_address (addr, stream, options->addressprint);
+      print_function_pointer_address (gdbarch, addr, stream,
+                                     options->addressprint);
       /* Return value is irrelevant except for string pointers.  */
       return 0;
     }
 
   if (options->addressprint && options->format != 's')
-    fputs_filtered (paddress (address), stream);
+    fputs_filtered (paddress (gdbarch, address), stream);
 
   /* For a pointer to char or unsigned char, also print the string
      pointed to, unless pointer is null.  */
@@ -237,7 +234,8 @@ print_unpacked_pointer (struct type *type,
       && TYPE_CODE (elttype) == TYPE_CODE_INT
       && (options->format == 0 || options->format == 's')
       && addr != 0)
-    return val_print_string (addr, -1, TYPE_LENGTH (elttype), stream, options);
+    return val_print_string (TYPE_TARGET_TYPE (type), addr, -1,
+                            stream, options);
   
   return 0;
 }
@@ -249,17 +247,19 @@ print_variable_at_address (struct type *type,
                           int recurse,
                           const struct value_print_options *options)
 {
+  struct gdbarch *gdbarch = get_type_arch (type);
   CORE_ADDR addr = unpack_pointer (type, valaddr);
   struct type *elttype = check_typedef (TYPE_TARGET_TYPE (type));
 
   fprintf_filtered (stream, "[");
-  fputs_filtered (paddress (addr), stream);
+  fputs_filtered (paddress (gdbarch, addr), stream);
   fprintf_filtered (stream, "] : ");
   
   if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
     {
       struct value *deref_val =
        value_at (TYPE_TARGET_TYPE (type), unpack_pointer (type, valaddr));
+
       common_val_print (deref_val, stream, recurse, options, current_language);
     }
   else
@@ -294,7 +294,7 @@ m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
           || ((current_language->la_language == language_m2)
               && (TYPE_CODE (type) == TYPE_CODE_CHAR)))
          && (options->format == 0 || options->format == 's'))
-       val_print_string (address, len+1, eltlen, stream, options);
+       val_print_string (type, address, len+1, stream, options);
       else
        {
          fprintf_filtered (stream, "{");
@@ -318,12 +318,11 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
              CORE_ADDR address, struct ui_file *stream, int recurse,
              const struct value_print_options *options)
 {
+  struct gdbarch *gdbarch = get_type_arch (type);
   unsigned int i = 0;  /* Number of characters printed */
   unsigned len;
   struct type *elttype;
   unsigned eltlen;
-  int length_pos, length_size, string_pos;
-  int char_size;
   LONGEST val;
   CORE_ADDR addr;
 
@@ -359,8 +358,9 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
                  len = temp_len;
                }
 
-             LA_PRINT_STRING (stream, valaddr + embedded_offset, len, 1, 0,
-                              options);
+             LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type),
+                              valaddr + embedded_offset, len, NULL,
+                              0, options);
              i = len;
            }
          else
@@ -396,8 +396,9 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
        {
          CORE_ADDR addr
            = extract_typed_address (valaddr + embedded_offset, type);
+
          fprintf_filtered (stream, "@");
-         fputs_filtered (paddress (addr), stream);
+         fputs_filtered (paddress (gdbarch, addr), stream);
          if (options->deref_ref)
            fputs_filtered (": ", stream);
        }
@@ -410,6 +411,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
                value_at
                (TYPE_TARGET_TYPE (type),
                 unpack_pointer (type, valaddr + embedded_offset));
+
              common_val_print (deref_val, stream, recurse, options,
                                current_language);
            }
@@ -477,13 +479,14 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
       type_print (type, "", stream, -1);
       fprintf_filtered (stream, "} ");
       /* Try to print what function it points to, and its address.  */
-      print_address_demangle (address, stream, demangle);
+      print_address_demangle (gdbarch, address, stream, demangle);
       break;
 
     case TYPE_CODE_BOOL:
       if (options->format || options->output_format)
        {
          struct value_print_options opts = *options;
+
          opts.format = (options->format ? options->format
                         : options->output_format);
          print_scalar_formatted (valaddr + embedded_offset, type,
@@ -521,6 +524,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
       if (options->format || options->output_format)
        {
          struct value_print_options opts = *options;
+
          opts.format = (options->format ? options->format
                         : options->output_format);
          print_scalar_formatted (valaddr + embedded_offset, type,
@@ -534,6 +538,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
       if (options->format || options->output_format)
        {
          struct value_print_options opts = *options;
+
          opts.format = (options->format ? options->format
                         : options->output_format);
          print_scalar_formatted (valaddr + embedded_offset, type,
@@ -547,7 +552,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
          else
            fprintf_filtered (stream, "%d", (int) val);
          fputs_filtered (" ", stream);
-         LA_PRINT_CHAR ((unsigned char) val, stream);
+         LA_PRINT_CHAR ((unsigned char) val, type, stream);
        }
       break;
 
@@ -597,6 +602,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
            {
              int element = value_bit_index (type, valaddr + embedded_offset,
                                             i);
+
              if (element < 0)
                {
                  i = element;
@@ -616,6 +622,7 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
                                          ++i))
                    {
                      int j = i;
+
                      fputs_filtered ("..", stream);
                      while (i + 1 <= high_bound
                             && value_bit_index (type,