/* Python pretty-printing
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This file is part of GDB.
#include "extension-priv.h"
#include "python.h"
#include "python-internal.h"
-#include "py-ref.h"
/* Return type of print_string_repr. */
will return None. On error, it will set the Python error and
return NULL. */
-static PyObject *
+static gdbpy_ref<>
search_pp_list (PyObject *list, PyObject *value)
{
Py_ssize_t pp_list_size, list_index;
/* Skip if disabled. */
if (PyObject_HasAttr (function, gdbpy_enabled_cst))
{
- gdbpy_ref attr (PyObject_GetAttr (function, gdbpy_enabled_cst));
+ gdbpy_ref<> attr (PyObject_GetAttr (function, gdbpy_enabled_cst));
int cmp;
if (attr == NULL)
continue;
}
- gdbpy_ref printer (PyObject_CallFunctionObjArgs (function, value, NULL));
+ gdbpy_ref<> printer (PyObject_CallFunctionObjArgs (function, value,
+ NULL));
if (printer == NULL)
return NULL;
else if (printer != Py_None)
- return printer.release ();
+ return printer;
}
- Py_RETURN_NONE;
+ return gdbpy_ref<>::new_reference (Py_None);
}
/* Subroutine of find_pretty_printer to simplify it.
static PyObject *
find_pretty_printer_from_objfiles (PyObject *value)
{
- struct objfile *obj;
+ for (objfile *obj : current_program_space->objfiles ())
+ {
+ gdbpy_ref<> objf = objfile_to_objfile_object (obj);
+ if (objf == NULL)
+ {
+ /* Ignore the error and continue. */
+ PyErr_Clear ();
+ continue;
+ }
- ALL_OBJFILES (obj)
- {
- PyObject *objf = objfile_to_objfile_object (obj);
- if (!objf)
- {
- /* Ignore the error and continue. */
- PyErr_Clear ();
- continue;
- }
-
- gdbpy_ref pp_list (objfpy_get_printers (objf, NULL));
- gdbpy_ref function (search_pp_list (pp_list.get (), value));
-
- /* If there is an error in any objfile list, abort the search and exit. */
- if (function == NULL)
- return NULL;
+ gdbpy_ref<> pp_list (objfpy_get_printers (objf.get (), NULL));
+ gdbpy_ref<> function (search_pp_list (pp_list.get (), value));
+
+ /* If there is an error in any objfile list, abort the search and exit. */
+ if (function == NULL)
+ return NULL;
- if (function != Py_None)
- return function.release ();
- }
+ if (function != Py_None)
+ return function.release ();
+ }
Py_RETURN_NONE;
}
The result is Py_None, suitably inc-ref'd, if no pretty-printer was found.
Otherwise the result is the pretty-printer function, suitably inc-ref'd. */
-static PyObject *
+static gdbpy_ref<>
find_pretty_printer_from_progspace (PyObject *value)
{
- PyObject *obj = pspace_to_pspace_object (current_program_space);
+ gdbpy_ref<> obj = pspace_to_pspace_object (current_program_space);
- if (!obj)
+ if (obj == NULL)
return NULL;
- gdbpy_ref pp_list (pspy_get_printers (obj, NULL));
+ gdbpy_ref<> pp_list (pspy_get_printers (obj.get (), NULL));
return search_pp_list (pp_list.get (), value);
}
The result is Py_None, suitably inc-ref'd, if no pretty-printer was found.
Otherwise the result is the pretty-printer function, suitably inc-ref'd. */
-static PyObject *
+static gdbpy_ref<>
find_pretty_printer_from_gdb (PyObject *value)
{
/* Fetch the global pretty printer list. */
if (gdb_python_module == NULL
|| ! PyObject_HasAttrString (gdb_python_module, "pretty_printers"))
- Py_RETURN_NONE;
- gdbpy_ref pp_list (PyObject_GetAttrString (gdb_python_module,
- "pretty_printers"));
+ return gdbpy_ref<>::new_reference (Py_None);
+ gdbpy_ref<> pp_list (PyObject_GetAttrString (gdb_python_module,
+ "pretty_printers"));
if (pp_list == NULL || ! PyList_Check (pp_list.get ()))
- Py_RETURN_NONE;
+ return gdbpy_ref<>::new_reference (Py_None);
return search_pp_list (pp_list.get (), value);
}
pretty-printer exists, return None. If one exists, return a new
reference. On error, set the Python error and return NULL. */
-static PyObject *
+static gdbpy_ref<>
find_pretty_printer (PyObject *value)
{
/* Look at the pretty-printer list for each objfile
in the current program-space. */
- gdbpy_ref function (find_pretty_printer_from_objfiles (value));
+ gdbpy_ref<> function (find_pretty_printer_from_objfiles (value));
if (function == NULL || function != Py_None)
- return function.release ();
+ return function;
/* Look at the pretty-printer list for the current program-space. */
- function.reset (find_pretty_printer_from_progspace (value));
+ function = find_pretty_printer_from_progspace (value);
if (function == NULL || function != Py_None)
- return function.release ();
+ return function;
/* Look at the pretty-printer list in the gdb module. */
return find_pretty_printer_from_gdb (value);
is returned. On error, *OUT_VALUE is set to NULL, NULL is
returned, with a python exception set. */
-static PyObject *
+static gdbpy_ref<>
pretty_print_one_value (PyObject *printer, struct value **out_value)
{
- PyObject *result = NULL;
+ gdbpy_ref<> result;
*out_value = NULL;
- TRY
+ try
{
- result = PyObject_CallMethodObjArgs (printer, gdbpy_to_string_cst, NULL);
- if (result)
+ if (!PyObject_HasAttr (printer, gdbpy_to_string_cst))
+ result = gdbpy_ref<>::new_reference (Py_None);
+ else
{
- if (! gdbpy_is_string (result) && ! gdbpy_is_lazy_string (result)
- && result != Py_None)
+ result.reset (PyObject_CallMethodObjArgs (printer, gdbpy_to_string_cst,
+ NULL));
+ if (result != NULL)
{
- *out_value = convert_value_from_python (result);
- if (PyErr_Occurred ())
- *out_value = NULL;
- Py_DECREF (result);
- result = NULL;
+ if (! gdbpy_is_string (result.get ())
+ && ! gdbpy_is_lazy_string (result.get ())
+ && result != Py_None)
+ {
+ *out_value = convert_value_from_python (result.get ());
+ if (PyErr_Occurred ())
+ *out_value = NULL;
+ result = NULL;
+ }
}
}
}
- CATCH (except, RETURN_MASK_ALL)
+ catch (const gdb_exception &except)
{
}
- END_CATCH
return result;
}
if (! PyObject_HasAttr (printer, gdbpy_display_hint_cst))
return NULL;
- gdbpy_ref hint (PyObject_CallMethodObjArgs (printer, gdbpy_display_hint_cst,
- NULL));
+ gdbpy_ref<> hint (PyObject_CallMethodObjArgs (printer, gdbpy_display_hint_cst,
+ NULL));
if (hint != NULL)
{
if (gdbpy_is_string (hint.get ()))
{
if (PyErr_ExceptionMatches (gdbpy_gdb_memory_error))
{
- PyObject *type, *value, *trace;
-
- PyErr_Fetch (&type, &value, &trace);
-
- gdbpy_ref type_ref (type);
- gdbpy_ref value_ref (value);
- gdbpy_ref trace_ref (trace);
-
- gdb::unique_xmalloc_ptr<char>
- msg (gdbpy_exception_to_string (type, value));
+ gdbpy_err_fetch fetched_error;
+ gdb::unique_xmalloc_ptr<char> msg = fetched_error.to_string ();
if (msg == NULL || *msg == '\0')
fprintf_filtered (stream, _("<error reading variable>"));
struct value *replacement = NULL;
enum string_repr_result result = string_repr_ok;
- gdbpy_ref py_str (pretty_print_one_value (printer, &replacement));
+ gdbpy_ref<> py_str = pretty_print_one_value (printer, &replacement);
if (py_str != NULL)
{
if (py_str == Py_None)
}
else
{
- gdbpy_ref string
- (python_string_to_target_python_string (py_str.get ()));
+ gdbpy_ref<> string
+ = python_string_to_target_python_string (py_str.get ());
if (string != NULL)
{
char *output;
long length;
struct type *type;
-#ifdef IS_PY3K
output = PyBytes_AS_STRING (string.get ());
length = PyBytes_GET_SIZE (string.get ());
-#else
- output = PyString_AsString (string.get ());
- length = PyString_Size (string.get ());
-#endif
type = builtin_type (gdbarch)->builtin_char;
if (hint && !strcmp (hint, "string"))
return result;
}
-#ifndef IS_PY3K
-
-/* Create a dummy PyFrameObject, needed to work around
- a Python-2.4 bug with generators. */
-class dummy_python_frame
-{
- public:
-
- dummy_python_frame ();
-
- ~dummy_python_frame ()
- {
- if (m_valid)
- m_tstate->frame = m_saved_frame;
- }
-
- bool failed () const
- {
- return !m_valid;
- }
-
- private:
-
- bool m_valid;
- PyFrameObject *m_saved_frame;
- gdbpy_ref m_frame;
- PyThreadState *m_tstate;
-};
-
-dummy_python_frame::dummy_python_frame ()
-: m_valid (false),
- m_saved_frame (NULL),
- m_tstate (NULL)
-{
- PyCodeObject *code;
- PyFrameObject *frame;
-
- gdbpy_ref empty_string (PyString_FromString (""));
- if (empty_string == NULL)
- return;
-
- gdbpy_ref null_tuple (PyTuple_New (0));
- if (null_tuple == NULL)
- return;
-
- code = PyCode_New (0, /* argcount */
- 0, /* locals */
- 0, /* stacksize */
- 0, /* flags */
- empty_string.get (), /* code */
- null_tuple.get (), /* consts */
- null_tuple.get (), /* names */
- null_tuple.get (), /* varnames */
-#if PYTHON_API_VERSION >= 1010
- null_tuple.get (), /* freevars */
- null_tuple.get (), /* cellvars */
-#endif
- empty_string.get (), /* filename */
- empty_string.get (), /* name */
- 1, /* firstlineno */
- empty_string.get () /* lnotab */
- );
- if (code == NULL)
- return;
- gdbpy_ref code_holder ((PyObject *) code);
-
- gdbpy_ref globals (PyDict_New ());
- if (globals == NULL)
- return;
-
- m_tstate = PyThreadState_GET ();
- frame = PyFrame_New (m_tstate, code, globals.get (), NULL);
- if (frame == NULL)
- return;
-
- m_frame.reset ((PyObject *) frame);
- m_tstate->frame = frame;
- m_saved_frame = frame->f_back;
- m_valid = true;
-}
-#endif
-
/* Helper for gdbpy_apply_val_pretty_printer that formats children of the
printer, if any exist. If is_py_none is true, then nothing has
been printed by to_string, and format output accordingly. */
is_map = hint && ! strcmp (hint, "map");
is_array = hint && ! strcmp (hint, "array");
- gdbpy_ref children (PyObject_CallMethodObjArgs (printer, gdbpy_children_cst,
- NULL));
+ gdbpy_ref<> children (PyObject_CallMethodObjArgs (printer, gdbpy_children_cst,
+ NULL));
if (children == NULL)
{
print_stack_unless_memory_error (stream);
return;
}
- gdbpy_ref iter (PyObject_GetIter (children.get ()));
+ gdbpy_ref<> iter (PyObject_GetIter (children.get ()));
if (iter == NULL)
{
print_stack_unless_memory_error (stream);
pretty = options->prettyformat_structs;
}
- /* Manufacture a dummy Python frame to work around Python 2.4 bug,
- where it insists on having a non-NULL tstate->frame when
- a generator is called. */
-#ifndef IS_PY3K
- dummy_python_frame frame;
- if (frame.failed ())
- {
- gdbpy_print_stack ();
- return;
- }
-#endif
-
done_flag = 0;
for (i = 0; i < options->print_max; ++i)
{
PyObject *py_v;
const char *name;
- gdbpy_ref item (PyIter_Next (iter.get ()));
+ gdbpy_ref<> item (PyIter_Next (iter.get ()));
if (item == NULL)
{
if (PyErr_Occurred ())
error (_("Error while executing Python code."));
}
else
- common_val_print (value, stream, recurse + 1, options, language);
+ {
+ /* When printing the key of a map we allow one additional
+ level of depth. This means the key will print before the
+ value does. */
+ struct value_print_options opt = *options;
+ if (is_map && i % 2 == 0
+ && opt.max_depth != -1
+ && opt.max_depth < INT_MAX)
+ ++opt.max_depth;
+ common_val_print (value, stream, recurse + 1, &opt, language);
+ }
}
if (is_map && i % 2 == 0)
struct gdbarch *gdbarch = get_type_arch (type);
struct value *value;
enum string_repr_result print_result;
- const gdb_byte *valaddr = value_contents_for_printing (val);
+
+ if (value_lazy (val))
+ value_fetch_lazy (val);
/* No pretty-printer support for unavailable values. */
if (!value_bytes_available (val, embedded_offset, TYPE_LENGTH (type)))
/* Instantiate the printer. */
value = value_from_component (val, type, embedded_offset);
- gdbpy_ref val_obj (value_to_value_object (value));
+ gdbpy_ref<> val_obj (value_to_value_object (value));
if (val_obj == NULL)
{
print_stack_unless_memory_error (stream);
}
/* Find the constructor. */
- gdbpy_ref printer (find_pretty_printer (val_obj.get ()));
+ gdbpy_ref<> printer (find_pretty_printer (val_obj.get ()));
if (printer == NULL)
{
print_stack_unless_memory_error (stream);
if (printer == Py_None)
return EXT_LANG_RC_NOP;
+ if (val_print_check_max_depth (stream, recurse, options, language))
+ return EXT_LANG_RC_OK;
+
/* If we are printing a map, we want some special formatting. */
gdb::unique_xmalloc_ptr<char> hint (gdbpy_get_display_hint (printer.get ()));
set to the replacement value and this function returns NULL. On
error, *REPLACEMENT is set to NULL and this function also returns
NULL. */
-PyObject *
+gdbpy_ref<>
apply_varobj_pretty_printer (PyObject *printer_obj,
struct value **replacement,
struct ui_file *stream)
{
- PyObject *py_str = NULL;
-
*replacement = NULL;
- py_str = pretty_print_one_value (printer_obj, replacement);
+ gdbpy_ref<> py_str = pretty_print_one_value (printer_obj, replacement);
if (*replacement == NULL && py_str == NULL)
print_stack_unless_memory_error (stream);
reference to the object if successful; returns NULL if not. VALUE
is the value for which a printer tests to determine if it
can pretty-print the value. */
-PyObject *
+gdbpy_ref<>
gdbpy_get_varobj_pretty_printer (struct value *value)
{
- TRY
+ try
{
value = value_copy (value);
}
- CATCH (except, RETURN_MASK_ALL)
+ catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
- END_CATCH
- gdbpy_ref val_obj (value_to_value_object (value));
+ gdbpy_ref<> val_obj (value_to_value_object (value));
if (val_obj == NULL)
return NULL;
gdbpy_default_visualizer (PyObject *self, PyObject *args)
{
PyObject *val_obj;
- PyObject *cons;
struct value *value;
if (! PyArg_ParseTuple (args, "O", &val_obj))
return NULL;
}
- cons = find_pretty_printer (val_obj);
- return cons;
+ return find_pretty_printer (val_obj).release ();
}
projects / deliverable / binutils-gdb.git / blobdiff