gdb/

	* valprint.c (value_check_printable): Add one parameter OPTIONS.
	Honor OPTIONS and VAL's type.
	(common_val_print, value_print): Update to pass one more parameter.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 47c815eab46e15c5c2012880335fe9c663844f90..7534495bbf4f9009f46e1041dcd972aeee9bdec9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-09  Yao Qi  <yao@codesourcery.com>
+
+       * valprint.c (value_check_printable): Add one parameter OPTIONS.
+       Honor OPTIONS and VAL's type.
+       (common_val_print, value_print): Update to pass one more parameter.
+
 2011-10-09  Doug Evans  <dje@google.com>
 
        Add new "alias" command.

diff --git a/gdb/valprint.c b/gdb/valprint.c
index b26924a6ef4a995e8cb6f890c25c130980ef444f..b4ac4ec466d78f11514498baaf2ed3c29538b35e 100644 (file)
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -399,11 +399,12 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 }
 
 /* Check whether the value VAL is printable.  Return 1 if it is;
-   return 0 and print an appropriate error message to STREAM if it
-   is not.  */
+   return 0 and print an appropriate error message to STREAM according to
+   OPTIONS if it is not.  */
 
 static int
-value_check_printable (struct value *val, struct ui_file *stream)
+value_check_printable (struct value *val, struct ui_file *stream,
+                      const struct value_print_options *options)
 {
   if (val == 0)
     {
@@ -413,7 +414,10 @@ value_check_printable (struct value *val, struct ui_file *stream)
 
   if (value_entirely_optimized_out (val))
     {
-      val_print_optimized_out (stream);
+      if (options->summary && !scalar_type_p (value_type (val)))
+       fprintf_filtered (stream, "...");
+      else
+       val_print_optimized_out (stream);
       return 0;
     }
 
@@ -441,7 +445,7 @@ common_val_print (struct value *val, struct ui_file *stream, int recurse,
                  const struct value_print_options *options,
                  const struct language_defn *language)
 {
-  if (!value_check_printable (val, stream))
+  if (!value_check_printable (val, stream, options))
     return 0;
 
   if (language->la_language == language_ada)
@@ -467,7 +471,7 @@ int
 value_print (struct value *val, struct ui_file *stream,
             const struct value_print_options *options)
 {
-  if (!value_check_printable (val, stream))
+  if (!value_check_printable (val, stream, options))
     return 0;
 
   if (!options->raw)