Factor out reference printing code from generic_val_print

gdb/ChangeLog:

	* valprint.c (generic_val_print): Factor out reference
	printing code to ...
	(generic_val_print_ref): ... this new function.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8a6c0022de2676d33a1b23c0d16ddef91d4a0211..481f50af4631d75141e98d9722ec1a811cd24dc5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-27  Simon Marchi  <simon.marchi@ericsson.com>
+
+       * valprint.c (generic_val_print): Factor out reference
+       printing code to ...
+       (generic_val_print_ref): ... this new function.
+
 2015-07-27  Simon Marchi  <simon.marchi@ericsson.com>
 
        * valprint.c (generic_val_print): Factor out memberptr

diff --git a/gdb/valprint.c b/gdb/valprint.c
index 9a565673bb26a4a99f75d88aecadd6f784c633bd..fbecd512d76297c402725b332f8859fb5dc6594c 100644 (file)
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -461,6 +461,54 @@ generic_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
                              original_value, options, 0, stream);
 }
 
+/* generic_val_print helper for TYPE_CODE_REF.  */
+
+static void
+generic_val_print_ref (struct type *type, const gdb_byte *valaddr,
+                      int embedded_offset, struct ui_file *stream, int recurse,
+                      const struct value *original_value,
+                      const struct value_print_options *options)
+{
+  struct gdbarch *gdbarch = get_type_arch (type);
+  struct type *elttype = check_typedef (TYPE_TARGET_TYPE (type));
+
+  if (options->addressprint)
+    {
+      CORE_ADDR addr
+       = extract_typed_address (valaddr + embedded_offset, type);
+
+      fprintf_filtered (stream, "@");
+      fputs_filtered (paddress (gdbarch, addr), stream);
+      if (options->deref_ref)
+       fputs_filtered (": ", stream);
+    }
+  /* De-reference the reference.  */
+  if (options->deref_ref)
+    {
+      if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
+       {
+         struct value *deref_val;
+
+         deref_val = coerce_ref_if_computed (original_value);
+         if (deref_val != NULL)
+           {
+             /* More complicated computed references are not supported.  */
+             gdb_assert (embedded_offset == 0);
+           }
+         else
+           deref_val = value_at (TYPE_TARGET_TYPE (type),
+                                 unpack_pointer (type,
+                                                 (valaddr
+                                                  + embedded_offset)));
+
+         common_val_print (deref_val, stream, recurse, options,
+                           current_language);
+       }
+      else
+       fputs_filtered ("???", stream);
+    }
+}
+
 /* A generic val_print that is suitable for use by language
    implementations of the la_val_print method.  This function can
    handle most type codes, though not all, notably exception
@@ -483,7 +531,6 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
   struct gdbarch *gdbarch = get_type_arch (type);
   unsigned int i = 0;  /* Number of characters printed.  */
   unsigned len;
-  struct type *elttype;
   struct type *unresolved_type = type;
   LONGEST val;
 
@@ -506,42 +553,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
       break;
 
     case TYPE_CODE_REF:
-      elttype = check_typedef (TYPE_TARGET_TYPE (type));
-      if (options->addressprint)
-       {
-         CORE_ADDR addr
-           = extract_typed_address (valaddr + embedded_offset, type);
-
-         fprintf_filtered (stream, "@");
-         fputs_filtered (paddress (gdbarch, addr), stream);
-         if (options->deref_ref)
-           fputs_filtered (": ", stream);
-       }
-      /* De-reference the reference.  */
-      if (options->deref_ref)
-       {
-         if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
-           {
-             struct value *deref_val;
-
-             deref_val = coerce_ref_if_computed (original_value);
-             if (deref_val != NULL)
-               {
-                 /* More complicated computed references are not supported.  */
-                 gdb_assert (embedded_offset == 0);
-               }
-             else
-               deref_val = value_at (TYPE_TARGET_TYPE (type),
-                                     unpack_pointer (type,
-                                                     (valaddr
-                                                      + embedded_offset)));
-
-             common_val_print (deref_val, stream, recurse, options,
-                               current_language);
-           }
-         else
-           fputs_filtered ("???", stream);
-       }
+      generic_val_print_ref (type, valaddr, embedded_offset, stream, recurse,
+                            original_value, options);
       break;
 
     case TYPE_CODE_ENUM: