*** empty log message ***

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

diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
index 617208bdc1598159eb77a3dda6b5e63964fabd1c..82ff30e0b7681e5729af686088a799eed0fce2cf 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 Free Software Foundation, Inc.
+                 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -119,7 +119,7 @@ m2_print_long_set (struct type *type, const gdb_byte *valaddr,
 
   target = TYPE_TARGET_TYPE (range);
   if (target == NULL)
-    target = builtin_type_int;
+    target = builtin_type_int32;
 
   if (get_discrete_bounds (range, &field_low, &field_high) >= 0)
     {
@@ -165,7 +165,7 @@ m2_print_long_set (struct type *type, const gdb_byte *valaddr,
                break;
              target = TYPE_TARGET_TYPE (range);
              if (target == NULL)
-               target = builtin_type_int;
+               target = builtin_type_int32;
            }
        }
       if (element_seen)
@@ -258,12 +258,9 @@ print_variable_at_address (struct type *type,
   if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
     {
       struct value *deref_val =
-       value_at
-       (TYPE_TARGET_TYPE (type),
-        unpack_pointer (lookup_pointer_type (builtin_type_void),
-                        valaddr));
+       value_at (TYPE_TARGET_TYPE (type), unpack_pointer (type, valaddr));
       common_val_print (deref_val, stream, format, deref_ref,
-                       recurse, pretty);
+                       recurse, pretty, current_language);
     }
   else
     fputs_filtered ("???", stream);
@@ -420,10 +417,9 @@ m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
              struct value *deref_val =
                value_at
                (TYPE_TARGET_TYPE (type),
-                unpack_pointer (lookup_pointer_type (builtin_type_void),
-                                valaddr + embedded_offset));
+                unpack_pointer (type, valaddr + embedded_offset));
              common_val_print (deref_val, stream, format, deref_ref,
-                               recurse, pretty);
+                               recurse, pretty, current_language);
            }
          else
            fputs_filtered ("???", stream);