From 11811b43e7f3511f4a4398689cf39380dc28085e Mon Sep 17 00:00:00 2001 From: pmuldoon Date: Thu, 28 Jul 2011 10:36:37 +0000 Subject: [PATCH] 2011-07-28 Phil Muldoon * varobj.c (value_get_print_value): Move hint check later into the function. Comment function. Free thevalue before reusing it. 2011-07-28 Phil Muldoon * gdb.python/py-mi.exp: Test printers returning string hint, and also not returning a value. * gdb.python/py-prettyprint.c: Add testcase for above. * gdb.python/py-prettyprint.py: Add test printer for above. --- gdb/ChangeLog | 5 ++++ gdb/testsuite/ChangeLog | 7 ++++++ gdb/testsuite/gdb.python/py-mi.exp | 7 ++++++ gdb/testsuite/gdb.python/py-prettyprint.c | 8 +++++++ gdb/testsuite/gdb.python/py-prettyprint.py | 15 ++++++++++++ gdb/varobj.c | 38 +++++++++++++++++++++++------- 6 files changed, 71 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1320db8739..2183d5bf0e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-07-28 Phil Muldoon + + * varobj.c (value_get_print_value): Move hint check later into the + function. Comment function. Free thevalue before reusing it. + 2011-07-27 Jan Kratochvil Pedro Alves diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 905e2fced4..9e21026e57 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2011-07-28 Phil Muldoon + + * gdb.python/py-mi.exp: Test printers returning string hint, and + also not returning a value. + * gdb.python/py-prettyprint.c: Add testcase for above. + * gdb.python/py-prettyprint.py: Add test printer for above. + 2011-07-27 Jan Kratochvil * gdb.dwarf2/dw2-simple-locdesc.S: Change DWARF version to 3. diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp index b232fc3c72..0ad4310329 100644 --- a/gdb/testsuite/gdb.python/py-mi.exp +++ b/gdb/testsuite/gdb.python/py-mi.exp @@ -284,6 +284,13 @@ mi_list_varobj_children nstype2 { { {nstype2.} {} 6 {char \[6\]} } } "list children after setting exception flag" +mi_create_varobj me me \ + "create me varobj" + +mi_gdb_test "-var-evaluate-expression me" \ + "\\^done,value=\".*\"" \ + "evaluate me varobj" + # C++ MI tests gdb_exit if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" \ diff --git a/gdb/testsuite/gdb.python/py-prettyprint.c b/gdb/testsuite/gdb.python/py-prettyprint.c index b65a84fbf2..30f649c073 100644 --- a/gdb/testsuite/gdb.python/py-prettyprint.c +++ b/gdb/testsuite/gdb.python/py-prettyprint.c @@ -149,6 +149,11 @@ struct justchildren typedef struct justchildren nostring_type; +struct memory_error +{ + const char *s; +}; + struct container { string name; @@ -227,6 +232,7 @@ main () /* Clearing by being `static' could invoke an other GDB C++ bug. */ struct nullstr nullstr; nostring_type nstype, nstype2; + struct memory_error me; struct ns ns, ns2; struct lazystring estring, estring2; struct hint_error hint_error; @@ -234,6 +240,8 @@ main () nstype.elements = narray; nstype.len = 0; + me.s = "blah"; + init_ss(&ss, 1, 2); init_ss(ssa+0, 3, 4); init_ss(ssa+1, 5, 6); diff --git a/gdb/testsuite/gdb.python/py-prettyprint.py b/gdb/testsuite/gdb.python/py-prettyprint.py index 92280e0a62..8bff3c04d0 100644 --- a/gdb/testsuite/gdb.python/py-prettyprint.py +++ b/gdb/testsuite/gdb.python/py-prettyprint.py @@ -17,6 +17,7 @@ # printers. import re +import gdb # Test returning a Value from a printer. class string_print: @@ -186,6 +187,18 @@ class pp_outer: yield 's', self.val['s'] yield 'x', self.val['x'] +class MemoryErrorString: + "Raise an error" + + def __init__(self, val): + self.val = val + + def to_string(self): + raise gdb.MemoryError ("Cannot access memory."); + + def display_hint (self): + return 'string' + def lookup_function (val): "Look-up and return a pretty-printer that can print val." @@ -261,6 +274,8 @@ def register_pretty_printers (): pretty_printers_dict[re.compile ('^struct hint_error$')] = pp_hint_error pretty_printers_dict[re.compile ('^hint_error$')] = pp_hint_error + pretty_printers_dict[re.compile ('^memory_error$')] = MemoryErrorString + pretty_printers_dict = {} register_pretty_printers () diff --git a/gdb/varobj.c b/gdb/varobj.c index 20145599cc..eadd62bda0 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -2610,25 +2610,21 @@ value_get_print_value (struct value *value, enum varobj_display_formats format, if (PyObject_HasAttr (value_formatter, gdbpy_to_string_cst)) { - char *hint; struct value *replacement; PyObject *output = NULL; - hint = gdbpy_get_display_hint (value_formatter); - if (hint) - { - if (!strcmp (hint, "string")) - string_print = 1; - xfree (hint); - } - output = apply_varobj_pretty_printer (value_formatter, &replacement, stb); + + /* If we have string like output ... */ if (output) { make_cleanup_py_decref (output); + /* If this is a lazy string, extract it. For lazy + strings we always print as a string, so set + string_print. */ if (gdbpy_is_lazy_string (output)) { gdbpy_extract_lazy_string (output, &str_addr, &type, @@ -2638,12 +2634,27 @@ value_get_print_value (struct value *value, enum varobj_display_formats format, } else { + /* If it is a regular (non-lazy) string, extract + it and copy the contents into THEVALUE. If the + hint says to print it as a string, set + string_print. Otherwise just return the extracted + string as a value. */ + PyObject *py_str = python_string_to_target_python_string (output); if (py_str) { char *s = PyString_AsString (py_str); + char *hint; + + hint = gdbpy_get_display_hint (value_formatter); + if (hint) + { + if (!strcmp (hint, "string")) + string_print = 1; + xfree (hint); + } len = PyString_Size (py_str); thevalue = xmemdup (s, len + 1, len + 1); @@ -2662,6 +2673,9 @@ value_get_print_value (struct value *value, enum varobj_display_formats format, gdbpy_print_stack (); } } + /* If the printer returned a replacement value, set VALUE + to REPLACEMENT. If there is not a replacement value, + just use the value passed to this function. */ if (replacement) value = replacement; } @@ -2672,12 +2686,18 @@ value_get_print_value (struct value *value, enum varobj_display_formats format, get_formatted_print_options (&opts, format_code[(int) format]); opts.deref_ref = 0; opts.raw = 1; + + /* If the THEVALUE has contents, it is a regular string. */ if (thevalue) LA_PRINT_STRING (stb, type, thevalue, len, encoding, 0, &opts); else if (string_print) + /* Otherwise, if string_print is set, and it is not a regular + string, it is a lazy string. */ val_print_string (type, encoding, str_addr, len, stb, &opts); else + /* All other cases. */ common_val_print (value, stb, 0, &opts, current_language); + thevalue = ui_file_xstrdup (stb, NULL); do_cleanups (old_chain); -- 2.11.0