X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-valprint.c;h=223d0154ed61011e445134dd22c2fc04da3694d0;hb=44cd25cf2da5e83fed367a7f49614e3024dee38b;hp=bec0e573d21b9bc5cf01dbdf9dbf3d6fbd9205f2;hpb=920d2a441963dd93b50e836dfabdd58e7f0016fb;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index bec0e573d2..223d0154ed 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -81,7 +81,7 @@ static void cp_print_static_field (struct type *, struct value *,
 				   struct ui_file *, int, int,
 				   enum val_prettyprint);
 
-static void cp_print_value (struct type *, struct type *, const bfd_byte *,
+static void cp_print_value (struct type *, struct type *, const gdb_byte *,
 			    int, CORE_ADDR, struct ui_file *, int, int,
 			    enum val_prettyprint, struct type **);
 
@@ -93,7 +93,7 @@ static void cp_print_hpacc_virtual_table_entries (struct type *, int *,
 
 
 void
-cp_print_class_method (const bfd_byte *valaddr,
+cp_print_class_method (const gdb_byte *valaddr,
 		       struct type *type,
 		       struct ui_file *stream)
 {
@@ -259,7 +259,7 @@ cp_is_vtbl_member (struct type *type)
 
 void
 cp_print_value_fields (struct type *type, struct type *real_type,
-		       const bfd_byte *valaddr, int offset, CORE_ADDR address,
+		       const gdb_byte *valaddr, int offset, CORE_ADDR address,
 		       struct ui_file *stream, int format, int recurse,
 		       enum val_prettyprint pretty,
 		       struct type **dont_print_vb,int dont_print_statmem)
@@ -389,8 +389,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
 		    (TYPE_FIELD_TYPE (type, i), 
 		     unpack_field_as_long (type, valaddr + offset, i));
 
-		  val_print (TYPE_FIELD_TYPE (type, i), value_contents (v),
-			     0, 0, stream, format, 0, recurse + 1, pretty);
+		  common_val_print (v, stream, format, 0, recurse + 1, pretty);
 		}
 	    }
 	  else
@@ -454,8 +453,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
       v = value_from_pointer (lookup_pointer_type (builtin_type_unsigned_long),
 			      *(unsigned long *) (valaddr + offset));
 
-      val_print (value_type (v), value_contents (v), 0, 0,
-		 stream, format, 0, recurse + 1, pretty);
+      common_val_print (v, stream, format, 0, recurse + 1, pretty);
       fields_seen = 1;
 
       if (vtblprint)
@@ -522,7 +520,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
 
 static void
 cp_print_value (struct type *type, struct type *real_type,
-		const bfd_byte *valaddr, int offset, CORE_ADDR address,
+		const gdb_byte *valaddr, int offset, CORE_ADDR address,
 		struct ui_file *stream, int format, int recurse,
 		enum val_prettyprint pretty, struct type **dont_print_vb)
 {
@@ -549,7 +547,7 @@ cp_print_value (struct type *type, struct type *real_type,
       int skip;
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
       char *basename = TYPE_NAME (baseclass);
-      const bfd_byte *base_valaddr;
+      const gdb_byte *base_valaddr;
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
 	{
@@ -596,7 +594,7 @@ cp_print_value (struct type *type, struct type *real_type,
 		      || (boffset + offset) >= TYPE_LENGTH (type)))
 		{
 		  /* FIXME (alloca): unsafe if baseclass is really really large. */
-		  bfd_byte *buf = alloca (TYPE_LENGTH (baseclass));
+		  gdb_byte *buf = alloca (TYPE_LENGTH (baseclass));
 		  base_valaddr = buf;
 		  if (target_read_memory (address + boffset, buf,
 					  TYPE_LENGTH (baseclass)) != 0)
@@ -706,7 +704,7 @@ cp_print_static_field (struct type *type,
 }
 
 void
-cp_print_class_member (const bfd_byte *valaddr, struct type *domain,
+cp_print_class_member (const gdb_byte *valaddr, struct type *domain,
 		       struct ui_file *stream, char *prefix)
 {
 
@@ -822,8 +820,7 @@ cp_print_hpacc_virtual_table_entries (struct type *type, int *vfuncs,
 	  deprecated_set_value_type (vf, value_type (v));
 
 	  /* print out the entry */
-	  val_print (value_type (vf), value_contents (vf), 0, 0,
-		     stream, format, 0, recurse + 1, pretty);
+	  common_val_print (vf, stream, format, 0, recurse + 1, pretty);
 	  field_physname
 	    = TYPE_FN_FIELD_PHYSNAME (TYPE_FN_FIELDLIST1 (type, fn), oi);
 	  /* pai: (temp) FIXME Maybe this should be DMGL_ANSI */