2009-05-28 01:05:14 +00:00
|
|
|
/* Python pretty-printing
|
|
|
|
|
2010-01-01 07:32:07 +00:00
|
|
|
Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
|
2009-05-28 01:05:14 +00:00
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "exceptions.h"
|
|
|
|
#include "objfiles.h"
|
|
|
|
#include "symtab.h"
|
|
|
|
#include "language.h"
|
|
|
|
#include "valprint.h"
|
2009-05-28 16:30:39 +00:00
|
|
|
|
2009-05-28 01:05:14 +00:00
|
|
|
#include "python.h"
|
|
|
|
|
|
|
|
#ifdef HAVE_PYTHON
|
2009-05-28 16:30:39 +00:00
|
|
|
#include "python-internal.h"
|
|
|
|
|
2009-05-28 01:05:14 +00:00
|
|
|
|
|
|
|
/* Helper function for find_pretty_printer which iterates over a list,
|
|
|
|
calls each function and inspects output. This will return a
|
|
|
|
printer object if one recognizes VALUE. If no printer is found, it
|
|
|
|
will return None. On error, it will set the Python error and
|
|
|
|
return NULL. */
|
|
|
|
static PyObject *
|
|
|
|
search_pp_list (PyObject *list, PyObject *value)
|
|
|
|
{
|
|
|
|
Py_ssize_t pp_list_size, list_index;
|
|
|
|
PyObject *function, *printer = NULL;
|
|
|
|
|
|
|
|
pp_list_size = PyList_Size (list);
|
|
|
|
for (list_index = 0; list_index < pp_list_size; list_index++)
|
|
|
|
{
|
|
|
|
function = PyList_GetItem (list, list_index);
|
|
|
|
if (! function)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
printer = PyObject_CallFunctionObjArgs (function, value, NULL);
|
|
|
|
if (! printer)
|
|
|
|
return NULL;
|
|
|
|
else if (printer != Py_None)
|
|
|
|
return printer;
|
|
|
|
|
|
|
|
Py_DECREF (printer);
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the pretty-printing constructor function for VALUE. If no
|
|
|
|
pretty-printer exists, return None. If one exists, return a new
|
|
|
|
reference. On error, set the Python error and return NULL. */
|
|
|
|
static PyObject *
|
|
|
|
find_pretty_printer (PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *pp_list = NULL;
|
|
|
|
PyObject *function = NULL;
|
|
|
|
struct objfile *obj;
|
|
|
|
volatile struct gdb_exception except;
|
|
|
|
|
|
|
|
/* Look at the pretty-printer dictionary for each objfile. */
|
|
|
|
ALL_OBJFILES (obj)
|
|
|
|
{
|
|
|
|
PyObject *objf = objfile_to_objfile_object (obj);
|
|
|
|
if (!objf)
|
|
|
|
{
|
|
|
|
/* Ignore the error and continue. */
|
|
|
|
PyErr_Clear ();
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
pp_list = objfpy_get_printers (objf, NULL);
|
|
|
|
function = search_pp_list (pp_list, value);
|
|
|
|
|
|
|
|
/* If there is an error in any objfile list, abort the search and
|
|
|
|
exit. */
|
|
|
|
if (! function)
|
|
|
|
{
|
|
|
|
Py_XDECREF (pp_list);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (function != Py_None)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
Py_DECREF (function);
|
|
|
|
Py_XDECREF (pp_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
pp_list = NULL;
|
|
|
|
/* Fetch the global pretty printer dictionary. */
|
|
|
|
if (! PyObject_HasAttrString (gdb_module, "pretty_printers"))
|
|
|
|
{
|
|
|
|
function = Py_None;
|
|
|
|
Py_INCREF (function);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
pp_list = PyObject_GetAttrString (gdb_module, "pretty_printers");
|
|
|
|
if (! pp_list)
|
|
|
|
goto done;
|
|
|
|
if (! PyList_Check (pp_list))
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
function = search_pp_list (pp_list, value);
|
|
|
|
|
|
|
|
done:
|
|
|
|
Py_XDECREF (pp_list);
|
|
|
|
|
|
|
|
return function;
|
|
|
|
}
|
2009-07-10 10:35:17 +00:00
|
|
|
/* Pretty-print a single value, via the printer object PRINTER.
|
|
|
|
If the function returns a string, a PyObject containing the string
|
|
|
|
is returned. Otherwise, if the function returns a value,
|
|
|
|
*OUT_VALUE is set to the value, and NULL is returned. On error,
|
|
|
|
*OUT_VALUE is set to NULL, and NULL is returned. */
|
|
|
|
static PyObject *
|
2009-05-28 01:05:14 +00:00
|
|
|
pretty_print_one_value (PyObject *printer, struct value **out_value)
|
|
|
|
{
|
|
|
|
volatile struct gdb_exception except;
|
2009-07-10 10:35:17 +00:00
|
|
|
PyObject *result = NULL;
|
2009-05-28 01:05:14 +00:00
|
|
|
|
2009-07-10 10:35:17 +00:00
|
|
|
*out_value = NULL;
|
2009-05-28 01:05:14 +00:00
|
|
|
TRY_CATCH (except, RETURN_MASK_ALL)
|
|
|
|
{
|
|
|
|
result = PyObject_CallMethodObjArgs (printer, gdbpy_to_string_cst, NULL);
|
|
|
|
if (result)
|
|
|
|
{
|
2009-07-10 10:35:17 +00:00
|
|
|
if (! gdbpy_is_string (result))
|
|
|
|
{
|
|
|
|
*out_value = convert_value_from_python (result);
|
|
|
|
if (PyErr_Occurred ())
|
|
|
|
*out_value = NULL;
|
|
|
|
Py_DECREF (result);
|
|
|
|
result = NULL;
|
|
|
|
}
|
2009-05-28 01:05:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-10 10:35:17 +00:00
|
|
|
return result;
|
2009-05-28 01:05:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the display hint for the object printer, PRINTER. Return
|
|
|
|
NULL if there is no display_hint method, or if the method did not
|
|
|
|
return a string. On error, print stack trace and return NULL. On
|
|
|
|
success, return an xmalloc()d string. */
|
|
|
|
char *
|
|
|
|
gdbpy_get_display_hint (PyObject *printer)
|
|
|
|
{
|
|
|
|
PyObject *hint;
|
|
|
|
char *result = NULL;
|
|
|
|
|
|
|
|
if (! PyObject_HasAttr (printer, gdbpy_display_hint_cst))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
hint = PyObject_CallMethodObjArgs (printer, gdbpy_display_hint_cst, NULL);
|
|
|
|
if (gdbpy_is_string (hint))
|
|
|
|
result = python_string_to_host_string (hint);
|
|
|
|
if (hint)
|
|
|
|
Py_DECREF (hint);
|
|
|
|
else
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper for apply_val_pretty_printer which calls to_string and
|
|
|
|
formats the result. */
|
|
|
|
static void
|
|
|
|
print_string_repr (PyObject *printer, const char *hint,
|
|
|
|
struct ui_file *stream, int recurse,
|
|
|
|
const struct value_print_options *options,
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 12:57:14 +00:00
|
|
|
const struct language_defn *language,
|
|
|
|
struct gdbarch *gdbarch)
|
2009-05-28 01:05:14 +00:00
|
|
|
{
|
|
|
|
struct value *replacement = NULL;
|
2009-07-10 10:35:17 +00:00
|
|
|
PyObject *py_str = NULL;
|
2009-05-28 01:05:14 +00:00
|
|
|
|
2009-07-10 10:35:17 +00:00
|
|
|
py_str = pretty_print_one_value (printer, &replacement);
|
|
|
|
if (py_str)
|
2009-05-28 01:05:14 +00:00
|
|
|
{
|
2009-07-10 10:35:17 +00:00
|
|
|
PyObject *string = python_string_to_target_python_string (py_str);
|
|
|
|
if (string)
|
|
|
|
{
|
|
|
|
gdb_byte *output = PyString_AsString (string);
|
|
|
|
int len = PyString_Size (string);
|
|
|
|
|
|
|
|
if (hint && !strcmp (hint, "string"))
|
|
|
|
LA_PRINT_STRING (stream, builtin_type (gdbarch)->builtin_char,
|
|
|
|
output, len, 0, options);
|
|
|
|
else
|
|
|
|
fputs_filtered (output, stream);
|
|
|
|
Py_DECREF (string);
|
|
|
|
}
|
2009-05-28 01:05:14 +00:00
|
|
|
else
|
2009-07-10 10:35:17 +00:00
|
|
|
gdbpy_print_stack ();
|
|
|
|
Py_DECREF (py_str);
|
2009-05-28 01:05:14 +00:00
|
|
|
}
|
|
|
|
else if (replacement)
|
2009-11-13 17:17:57 +00:00
|
|
|
{
|
|
|
|
struct value_print_options opts = *options;
|
|
|
|
|
|
|
|
opts.addressprint = 0;
|
|
|
|
common_val_print (replacement, stream, recurse, &opts, language);
|
|
|
|
}
|
2009-05-28 01:05:14 +00:00
|
|
|
else
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
py_restore_tstate (void *p)
|
|
|
|
{
|
|
|
|
PyFrameObject *frame = p;
|
|
|
|
PyThreadState *tstate = PyThreadState_GET ();
|
|
|
|
tstate->frame = frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create a dummy PyFrameObject, needed to work around
|
|
|
|
a Python-2.4 bug with generators. */
|
|
|
|
static PyObject *
|
|
|
|
push_dummy_python_frame ()
|
|
|
|
{
|
|
|
|
PyObject *empty_string, *null_tuple, *globals;
|
|
|
|
PyCodeObject *code;
|
|
|
|
PyFrameObject *frame;
|
|
|
|
PyThreadState *tstate;
|
|
|
|
|
|
|
|
empty_string = PyString_FromString ("");
|
|
|
|
if (!empty_string)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
null_tuple = PyTuple_New (0);
|
|
|
|
if (!null_tuple)
|
|
|
|
{
|
|
|
|
Py_DECREF (empty_string);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
code = PyCode_New (0, /* argcount */
|
|
|
|
0, /* nlocals */
|
|
|
|
0, /* stacksize */
|
|
|
|
0, /* flags */
|
|
|
|
empty_string, /* code */
|
|
|
|
null_tuple, /* consts */
|
|
|
|
null_tuple, /* names */
|
|
|
|
null_tuple, /* varnames */
|
|
|
|
#if PYTHON_API_VERSION >= 1010
|
|
|
|
null_tuple, /* freevars */
|
|
|
|
null_tuple, /* cellvars */
|
|
|
|
#endif
|
|
|
|
empty_string, /* filename */
|
|
|
|
empty_string, /* name */
|
|
|
|
1, /* firstlineno */
|
|
|
|
empty_string /* lnotab */
|
|
|
|
);
|
|
|
|
|
|
|
|
Py_DECREF (empty_string);
|
|
|
|
Py_DECREF (null_tuple);
|
|
|
|
|
|
|
|
if (!code)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
globals = PyDict_New ();
|
|
|
|
if (!globals)
|
|
|
|
{
|
|
|
|
Py_DECREF (code);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
tstate = PyThreadState_GET ();
|
|
|
|
|
|
|
|
frame = PyFrame_New (tstate, code, globals, NULL);
|
|
|
|
|
|
|
|
Py_DECREF (globals);
|
|
|
|
Py_DECREF (code);
|
|
|
|
|
|
|
|
if (!frame)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
tstate->frame = frame;
|
|
|
|
make_cleanup (py_restore_tstate, frame->f_back);
|
|
|
|
return (PyObject *) frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper for apply_val_pretty_printer that formats children of the
|
|
|
|
printer, if any exist. */
|
|
|
|
static void
|
|
|
|
print_children (PyObject *printer, const char *hint,
|
|
|
|
struct ui_file *stream, int recurse,
|
|
|
|
const struct value_print_options *options,
|
|
|
|
const struct language_defn *language)
|
|
|
|
{
|
|
|
|
int is_map, is_array, done_flag, pretty;
|
|
|
|
unsigned int i;
|
|
|
|
PyObject *children, *iter, *frame;
|
|
|
|
struct cleanup *cleanups;
|
|
|
|
|
|
|
|
if (! PyObject_HasAttr (printer, gdbpy_children_cst))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* If we are printing a map or an array, we want some special
|
|
|
|
formatting. */
|
|
|
|
is_map = hint && ! strcmp (hint, "map");
|
|
|
|
is_array = hint && ! strcmp (hint, "array");
|
|
|
|
|
|
|
|
children = PyObject_CallMethodObjArgs (printer, gdbpy_children_cst,
|
|
|
|
NULL);
|
|
|
|
if (! children)
|
|
|
|
{
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cleanups = make_cleanup_py_decref (children);
|
|
|
|
|
|
|
|
iter = PyObject_GetIter (children);
|
|
|
|
if (!iter)
|
|
|
|
{
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
make_cleanup_py_decref (iter);
|
|
|
|
|
|
|
|
/* Use the prettyprint_arrays option if we are printing an array,
|
|
|
|
and the pretty option otherwise. */
|
|
|
|
pretty = is_array ? options->prettyprint_arrays : options->pretty;
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
frame = push_dummy_python_frame ();
|
|
|
|
if (!frame)
|
|
|
|
{
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
make_cleanup_py_decref (frame);
|
|
|
|
|
|
|
|
done_flag = 0;
|
|
|
|
for (i = 0; i < options->print_max; ++i)
|
|
|
|
{
|
|
|
|
PyObject *py_v, *item = PyIter_Next (iter);
|
|
|
|
char *name;
|
|
|
|
struct cleanup *inner_cleanup;
|
|
|
|
|
|
|
|
if (! item)
|
|
|
|
{
|
|
|
|
if (PyErr_Occurred ())
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
/* Set a flag so we can know whether we printed all the
|
|
|
|
available elements. */
|
|
|
|
else
|
|
|
|
done_flag = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! PyArg_ParseTuple (item, "sO", &name, &py_v))
|
|
|
|
{
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
Py_DECREF (item);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
inner_cleanup = make_cleanup_py_decref (item);
|
|
|
|
|
|
|
|
/* Print initial "{". For other elements, there are three
|
|
|
|
cases:
|
|
|
|
1. Maps. Print a "," after each value element.
|
|
|
|
2. Arrays. Always print a ",".
|
|
|
|
3. Other. Always print a ",". */
|
|
|
|
if (i == 0)
|
|
|
|
fputs_filtered (" = {", stream);
|
|
|
|
else if (! is_map || i % 2 == 0)
|
|
|
|
fputs_filtered (pretty ? "," : ", ", stream);
|
|
|
|
|
|
|
|
/* In summary mode, we just want to print "= {...}" if there is
|
|
|
|
a value. */
|
|
|
|
if (options->summary)
|
|
|
|
{
|
|
|
|
/* This increment tricks the post-loop logic to print what
|
|
|
|
we want. */
|
|
|
|
++i;
|
|
|
|
/* Likewise. */
|
|
|
|
pretty = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! is_map || i % 2 == 0)
|
|
|
|
{
|
|
|
|
if (pretty)
|
|
|
|
{
|
|
|
|
fputs_filtered ("\n", stream);
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
wrap_here (n_spaces (2 + 2 *recurse));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_map && i % 2 == 0)
|
|
|
|
fputs_filtered ("[", stream);
|
|
|
|
else if (is_array)
|
|
|
|
{
|
|
|
|
/* We print the index, not whatever the child method
|
|
|
|
returned as the name. */
|
|
|
|
if (options->print_array_indexes)
|
|
|
|
fprintf_filtered (stream, "[%d] = ", i);
|
|
|
|
}
|
|
|
|
else if (! is_map)
|
|
|
|
{
|
|
|
|
fputs_filtered (name, stream);
|
|
|
|
fputs_filtered (" = ", stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gdbpy_is_string (py_v))
|
|
|
|
{
|
|
|
|
char *text = python_string_to_host_string (py_v);
|
|
|
|
if (! text)
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fputs_filtered (text, stream);
|
|
|
|
xfree (text);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
struct value *value = convert_value_from_python (py_v);
|
|
|
|
|
|
|
|
if (value == NULL)
|
|
|
|
{
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
error (_("Error while executing Python code."));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
common_val_print (value, stream, recurse + 1, options, language);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_map && i % 2 == 0)
|
|
|
|
fputs_filtered ("] = ", stream);
|
|
|
|
|
|
|
|
do_cleanups (inner_cleanup);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i)
|
|
|
|
{
|
|
|
|
if (!done_flag)
|
|
|
|
{
|
|
|
|
if (pretty)
|
|
|
|
{
|
|
|
|
fputs_filtered ("\n", stream);
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
|
|
}
|
|
|
|
fputs_filtered ("...", stream);
|
|
|
|
}
|
|
|
|
if (pretty)
|
|
|
|
{
|
|
|
|
fputs_filtered ("\n", stream);
|
|
|
|
print_spaces_filtered (2 * recurse, stream);
|
|
|
|
}
|
|
|
|
fputs_filtered ("}", stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
do_cleanups (cleanups);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr,
|
|
|
|
int embedded_offset, CORE_ADDR address,
|
|
|
|
struct ui_file *stream, int recurse,
|
|
|
|
const struct value_print_options *options,
|
|
|
|
const struct language_defn *language)
|
|
|
|
{
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 12:57:14 +00:00
|
|
|
struct gdbarch *gdbarch = get_type_arch (type);
|
2009-05-28 01:05:14 +00:00
|
|
|
PyObject *printer = NULL;
|
|
|
|
PyObject *val_obj = NULL;
|
|
|
|
struct value *value;
|
|
|
|
char *hint = NULL;
|
|
|
|
struct cleanup *cleanups;
|
|
|
|
int result = 0;
|
|
|
|
|
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
2009-07-02 17:04:23 +00:00
|
|
|
cleanups = ensure_python_env (gdbarch, language);
|
2009-05-28 01:05:14 +00:00
|
|
|
|
|
|
|
/* Instantiate the printer. */
|
|
|
|
if (valaddr)
|
|
|
|
valaddr += embedded_offset;
|
|
|
|
value = value_from_contents_and_address (type, valaddr, address);
|
|
|
|
|
|
|
|
val_obj = value_to_value_object (value);
|
|
|
|
if (! val_obj)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* Find the constructor. */
|
|
|
|
printer = find_pretty_printer (val_obj);
|
|
|
|
Py_DECREF (val_obj);
|
|
|
|
make_cleanup_py_decref (printer);
|
|
|
|
if (! printer || printer == Py_None)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* If we are printing a map, we want some special formatting. */
|
|
|
|
hint = gdbpy_get_display_hint (printer);
|
|
|
|
make_cleanup (free_current_contents, &hint);
|
|
|
|
|
|
|
|
/* Print the section */
|
* gdbtypes.c (make_pointer_type, make_reference_type,
smash_to_memberptr_type, lookup_array_range_type, check_stub_method):
Use type architecture instead of current_gdbarch.
* gdbtypes.h (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH paramter.
* gdbtypes.c (address_space_name_to_int, address_space_int_to_name):
Add GDBARCH parameter. Use it instead of current_gdbarch.
* c-typeprint.c (c_type_print_modifier): Update call.
* parse.c (push_type_address_space): Likewise.
* findvar.c (extract_typed_address, store_typed_address): Use type
architecture instead of current_gdbarch.
* value.c (value_as_address, unpack_field_as_long): Use type architecture
instead of current_gdbarch.
* doublest.c (floatformat_from_length): Add GDBARCH argument. Use it
instead of current_gdbarch.
(floatformat_from_type): Pass type architecture.
* infcall.c (find_function_addr): Use type architecture instead
of current_gdbarch.
* valarith.c (value_bitstring_subscript, value_x_binop, value_neg,
value_bit_index): Use type architecture instead of current_gdbarch.
* valops.c (value_cast, value_slice): Likewise.
* value.h (modify_field): Add TYPE argument.
* value.c (modify_field): Add TYPE argument. Use type architecture
instead of current_gdbarch.
(set_internalvar_component): Likewise.
* eval.c (evaluate_struct_tuple): Update call.
* valops.c (value_assign): Likewise.
* ada-lang.c (modify_general_field): Likewise. Add TYPE argument.
(make_array_descriptor): Update calls.
(move_bits): Add BITS_BIG_ENDIAN_P argument. Use it instead of
current_gdbarch.
(ada_value_assign, value_assign_to_component): Update calls.
(decode_packed_array, ada_value_primitive_packed_val, ada_value_assign,
value_assign_to_component): Use type arch instead of current_gdbarch.
* printcmd.c (float_type_from_length): Remove GDBARCH argument,
use type architecture instead.
(print_scalar_formatted, printf_command): Update calls. Use type
architecture instead of current_gdbarch.
* valprint.c (val_print_type_code_int): Use type architecture
instead of current_gdbarch.
* varobj.c (value_get_print_value): Likewise.
* python/python-prettyprint.c (print_string_repr): Add GDBARCH
argument. Use it instead of current_gdbarch.
(apply_val_pretty_printer): Update call.
* ada-valprint.c (ada_val_print_1): Use type architecture instead
of current_gdbarch.
* c-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(c_val_print): Update calls passing type architecture.
* f-valprint.c (f_val_print): Use type architecture instead of
current_gdbarch.
* jv-valprint (java_value_print): Likewise.
* m2-valprint.c (print_function_pointer_address): Add GDBARCH argument.
Use it instead of current_gdbarch.
(print_unpacked_pointer): Update calls passing type architecture.
* scm-valprint.c (scm_scmval_print): Use type architecture instead of
current_gdbarch.
* gnu-v3-abi.c (get_class_arch): Remove.
(gnuv3_rtti_type): Use get_type_arch instead of get_class_arch. Remove
special-case check for Java classes.
(gnuv3_virtual_fn_field, gnuv3_baseclass_offset, gnuv3_print_method_ptr,
gnuv3_method_ptr_size, gnuv3_make_method_ptr, gnuv3_method_ptr_to_value):
Use get_type_arch instead of get_class_arch.
2009-07-02 12:57:14 +00:00
|
|
|
print_string_repr (printer, hint, stream, recurse, options, language,
|
|
|
|
gdbarch);
|
2009-05-28 01:05:14 +00:00
|
|
|
print_children (printer, hint, stream, recurse, options, language);
|
|
|
|
result = 1;
|
|
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
if (PyErr_Occurred ())
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
do_cleanups (cleanups);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2009-07-10 10:35:17 +00:00
|
|
|
|
2009-05-28 01:09:20 +00:00
|
|
|
/* Apply a pretty-printer for the varobj code. PRINTER_OBJ is the
|
|
|
|
print object. It must have a 'to_string' method (but this is
|
|
|
|
checked by varobj, not here) which takes no arguments and
|
2009-07-10 10:35:17 +00:00
|
|
|
returns a string. The printer will return a value and in the case
|
|
|
|
of a Python string being returned, this function will return a
|
|
|
|
PyObject containing the string. For any other type, *REPLACEMENT is
|
|
|
|
set to the replacement value and this function returns NULL. On
|
|
|
|
error, *REPLACEMENT is set to NULL and this function also returns
|
|
|
|
NULL. */
|
|
|
|
PyObject *
|
2009-05-28 01:09:20 +00:00
|
|
|
apply_varobj_pretty_printer (PyObject *printer_obj,
|
|
|
|
struct value **replacement)
|
|
|
|
{
|
2009-07-10 10:35:17 +00:00
|
|
|
int size = 0;
|
|
|
|
PyObject *py_str = NULL;
|
2009-05-28 01:09:20 +00:00
|
|
|
|
|
|
|
*replacement = NULL;
|
2009-07-10 10:35:17 +00:00
|
|
|
py_str = pretty_print_one_value (printer_obj, replacement);
|
|
|
|
|
|
|
|
if (*replacement == NULL && py_str == NULL)
|
2009-05-28 01:09:20 +00:00
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
2009-07-10 10:35:17 +00:00
|
|
|
return py_str;
|
2009-05-28 01:09:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Find a pretty-printer object for the varobj module. Returns a new
|
|
|
|
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_get_varobj_pretty_printer (struct value *value)
|
|
|
|
{
|
|
|
|
PyObject *val_obj;
|
|
|
|
PyObject *pretty_printer = NULL;
|
|
|
|
volatile struct gdb_exception except;
|
|
|
|
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ALL)
|
|
|
|
{
|
|
|
|
value = value_copy (value);
|
|
|
|
}
|
|
|
|
GDB_PY_HANDLE_EXCEPTION (except);
|
|
|
|
|
|
|
|
val_obj = value_to_value_object (value);
|
|
|
|
if (! val_obj)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
pretty_printer = find_pretty_printer (val_obj);
|
|
|
|
Py_DECREF (val_obj);
|
|
|
|
return pretty_printer;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* A Python function which wraps find_pretty_printer and instantiates
|
|
|
|
the resulting class. This accepts a Value argument and returns a
|
|
|
|
pretty printer instance, or None. This function is useful as an
|
|
|
|
argument to the MI command -var-set-visualizer. */
|
|
|
|
PyObject *
|
|
|
|
gdbpy_default_visualizer (PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
PyObject *val_obj;
|
|
|
|
PyObject *cons, *printer = NULL;
|
|
|
|
struct value *value;
|
|
|
|
|
|
|
|
if (! PyArg_ParseTuple (args, "O", &val_obj))
|
|
|
|
return NULL;
|
|
|
|
value = value_object_to_value (val_obj);
|
|
|
|
if (! value)
|
|
|
|
{
|
|
|
|
PyErr_SetString (PyExc_TypeError, "argument must be a gdb.Value");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
cons = find_pretty_printer (val_obj);
|
|
|
|
return cons;
|
|
|
|
}
|
|
|
|
|
2009-05-28 01:05:14 +00:00
|
|
|
#else /* HAVE_PYTHON */
|
|
|
|
|
|
|
|
int
|
|
|
|
apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr,
|
|
|
|
int embedded_offset, CORE_ADDR address,
|
2009-05-28 16:30:39 +00:00
|
|
|
struct ui_file *stream, int recurse,
|
|
|
|
const struct value_print_options *options,
|
2009-05-28 01:05:14 +00:00
|
|
|
const struct language_defn *language)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* HAVE_PYTHON */
|