2009-05-28 09:05:14 +08:00
|
|
|
/* Python pretty-printing
|
|
|
|
|
2013-01-01 14:33:28 +08:00
|
|
|
Copyright (C) 2008-2013 Free Software Foundation, Inc.
|
2009-05-28 09:05:14 +08: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-29 00:30:39 +08:00
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
#include "python.h"
|
|
|
|
|
|
|
|
#ifdef HAVE_PYTHON
|
2009-05-29 00:30:39 +08:00
|
|
|
#include "python-internal.h"
|
|
|
|
|
2010-11-13 04:49:43 +08:00
|
|
|
/* Return type of print_string_repr. */
|
|
|
|
|
|
|
|
enum string_repr_result
|
|
|
|
{
|
|
|
|
/* The string method returned None. */
|
|
|
|
string_repr_none,
|
|
|
|
/* The string method had an error. */
|
|
|
|
string_repr_error,
|
|
|
|
/* Everything ok. */
|
|
|
|
string_repr_ok
|
|
|
|
};
|
|
|
|
|
2009-05-28 09:05:14 +08: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. */
|
2010-04-16 03:54:13 +08:00
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
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;
|
|
|
|
|
2010-06-05 02:18:28 +08:00
|
|
|
/* Skip if disabled. */
|
2010-10-13 06:44:20 +08:00
|
|
|
if (PyObject_HasAttr (function, gdbpy_enabled_cst))
|
|
|
|
{
|
|
|
|
PyObject *attr = PyObject_GetAttr (function, gdbpy_enabled_cst);
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
if (!attr)
|
|
|
|
return NULL;
|
|
|
|
cmp = PyObject_IsTrue (attr);
|
2013-05-21 04:39:31 +08:00
|
|
|
Py_DECREF (attr);
|
2010-10-13 06:44:20 +08:00
|
|
|
if (cmp == -1)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!cmp)
|
|
|
|
continue;
|
|
|
|
}
|
2010-06-05 02:18:28 +08:00
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
printer = PyObject_CallFunctionObjArgs (function, value, NULL);
|
|
|
|
if (! printer)
|
|
|
|
return NULL;
|
|
|
|
else if (printer != Py_None)
|
|
|
|
return printer;
|
|
|
|
|
|
|
|
Py_DECREF (printer);
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2010-04-16 03:54:13 +08:00
|
|
|
/* Subroutine of find_pretty_printer to simplify it.
|
|
|
|
Look for a pretty-printer to print VALUE in all objfiles.
|
|
|
|
The result is NULL if there's an error and the search should be terminated.
|
|
|
|
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. */
|
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
static PyObject *
|
2010-04-16 03:54:13 +08:00
|
|
|
find_pretty_printer_from_objfiles (PyObject *value)
|
2009-05-28 09:05:14 +08:00
|
|
|
{
|
2010-04-16 03:54:13 +08:00
|
|
|
PyObject *pp_list;
|
|
|
|
PyObject *function;
|
2009-05-28 09:05:14 +08:00
|
|
|
struct objfile *obj;
|
|
|
|
|
|
|
|
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);
|
2010-04-16 03:54:13 +08:00
|
|
|
Py_XDECREF (pp_list);
|
2009-05-28 09:05:14 +08:00
|
|
|
|
2010-04-16 03:54:13 +08:00
|
|
|
/* If there is an error in any objfile list, abort the search and exit. */
|
2009-05-28 09:05:14 +08:00
|
|
|
if (! function)
|
2010-04-16 03:54:13 +08:00
|
|
|
return NULL;
|
2009-05-28 09:05:14 +08:00
|
|
|
|
|
|
|
if (function != Py_None)
|
2010-04-16 03:54:13 +08:00
|
|
|
return function;
|
2009-05-28 09:05:14 +08:00
|
|
|
|
|
|
|
Py_DECREF (function);
|
|
|
|
}
|
|
|
|
|
2010-04-16 03:54:13 +08:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Subroutine of find_pretty_printer to simplify it.
|
|
|
|
Look for a pretty-printer to print VALUE in the current program space.
|
|
|
|
The result is NULL if there's an error and the search should be terminated.
|
|
|
|
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 *
|
|
|
|
find_pretty_printer_from_progspace (PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *pp_list;
|
|
|
|
PyObject *function;
|
|
|
|
PyObject *obj = pspace_to_pspace_object (current_program_space);
|
|
|
|
|
|
|
|
if (!obj)
|
|
|
|
return NULL;
|
|
|
|
pp_list = pspy_get_printers (obj, NULL);
|
|
|
|
function = search_pp_list (pp_list, value);
|
|
|
|
Py_XDECREF (pp_list);
|
|
|
|
return function;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Subroutine of find_pretty_printer to simplify it.
|
|
|
|
Look for a pretty-printer to print VALUE in the gdb module.
|
|
|
|
The result is NULL if there's an error and the search should be terminated.
|
|
|
|
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 *
|
|
|
|
find_pretty_printer_from_gdb (PyObject *value)
|
|
|
|
{
|
|
|
|
PyObject *pp_list;
|
|
|
|
PyObject *function;
|
|
|
|
|
2010-11-05 04:18:42 +08:00
|
|
|
/* Fetch the global pretty printer list. */
|
Refactor Python "gdb" module into a proper Python package, by introducing
a new "_gdb" module for code implemented in C, and using reload/__import__
instead of exec.
gdb/
* python/lib/gdb/__init__.py: Import * from _gdb.
(GdbOutputFile, sys.stdout, GdbOutputErrorFile, sys.stderr,
prompt_hook, sys.argv): Moved from finish_python_initialization.
(pretty_printers, PYTHONDIR): Moved from _initialize_python.
(packages, auto_load_packages): New list and function replacing
module_dict and auto-loading code, using __file__ instead of
gdb.PYTHONDIR and reload/__import__ instead of exec.
(GdbSetPythonDirectory): Replacing function of the same name
from finish_python_initialization, using reload/__import__ instead
of exec, as well as call auto_load_packages.
* python/py-prettyprint.c (find_pretty_printer_from_gdb): Check
gdb_python_module and not gdb_module.
* python/python-internal.h (gdb_python_module): Declare.
* python/python.c (gdb_python_module): New global.
(before_prompt_hook): Check gdb_python_module and not gdb_module.
(_initialize_python): Rename gdb module to _gdb.
Move gdb.PYTHONDIR and gdb.pretty_printer to lib/gdb/__init__.py.
(finish_python_initialization): Move Python code to
lib/gdb/__init__.py; instead, set up sys.path and import gdb into
__main__.
gdb/testsuite/
* gdb.python/python.exp (Test stderr location): Update module
location of GDB-specific sys.stderr.
(Test stdout location): Ditto for sys.stdout.
2012-09-14 05:49:32 +08:00
|
|
|
if (gdb_python_module == NULL
|
|
|
|
|| ! PyObject_HasAttrString (gdb_python_module, "pretty_printers"))
|
2010-04-16 03:54:13 +08:00
|
|
|
Py_RETURN_NONE;
|
Refactor Python "gdb" module into a proper Python package, by introducing
a new "_gdb" module for code implemented in C, and using reload/__import__
instead of exec.
gdb/
* python/lib/gdb/__init__.py: Import * from _gdb.
(GdbOutputFile, sys.stdout, GdbOutputErrorFile, sys.stderr,
prompt_hook, sys.argv): Moved from finish_python_initialization.
(pretty_printers, PYTHONDIR): Moved from _initialize_python.
(packages, auto_load_packages): New list and function replacing
module_dict and auto-loading code, using __file__ instead of
gdb.PYTHONDIR and reload/__import__ instead of exec.
(GdbSetPythonDirectory): Replacing function of the same name
from finish_python_initialization, using reload/__import__ instead
of exec, as well as call auto_load_packages.
* python/py-prettyprint.c (find_pretty_printer_from_gdb): Check
gdb_python_module and not gdb_module.
* python/python-internal.h (gdb_python_module): Declare.
* python/python.c (gdb_python_module): New global.
(before_prompt_hook): Check gdb_python_module and not gdb_module.
(_initialize_python): Rename gdb module to _gdb.
Move gdb.PYTHONDIR and gdb.pretty_printer to lib/gdb/__init__.py.
(finish_python_initialization): Move Python code to
lib/gdb/__init__.py; instead, set up sys.path and import gdb into
__main__.
gdb/testsuite/
* gdb.python/python.exp (Test stderr location): Update module
location of GDB-specific sys.stderr.
(Test stdout location): Ditto for sys.stdout.
2012-09-14 05:49:32 +08:00
|
|
|
pp_list = PyObject_GetAttrString (gdb_python_module, "pretty_printers");
|
2010-04-16 03:54:13 +08:00
|
|
|
if (pp_list == NULL || ! PyList_Check (pp_list))
|
2009-05-28 09:05:14 +08:00
|
|
|
{
|
2010-04-16 03:54:13 +08:00
|
|
|
Py_XDECREF (pp_list);
|
|
|
|
Py_RETURN_NONE;
|
2009-05-28 09:05:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
function = search_pp_list (pp_list, value);
|
|
|
|
Py_XDECREF (pp_list);
|
|
|
|
return function;
|
|
|
|
}
|
2010-01-14 16:03:37 +08:00
|
|
|
|
2010-04-16 03:54:13 +08:00
|
|
|
/* 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 *function;
|
|
|
|
|
2010-11-05 04:18:42 +08:00
|
|
|
/* Look at the pretty-printer list for each objfile
|
2010-04-16 03:54:13 +08:00
|
|
|
in the current program-space. */
|
|
|
|
function = find_pretty_printer_from_objfiles (value);
|
|
|
|
if (function == NULL || function != Py_None)
|
|
|
|
return function;
|
|
|
|
Py_DECREF (function);
|
|
|
|
|
2010-11-05 04:18:42 +08:00
|
|
|
/* Look at the pretty-printer list for the current program-space. */
|
2010-04-16 03:54:13 +08:00
|
|
|
function = find_pretty_printer_from_progspace (value);
|
|
|
|
if (function == NULL || function != Py_None)
|
|
|
|
return function;
|
|
|
|
Py_DECREF (function);
|
|
|
|
|
2010-11-05 04:18:42 +08:00
|
|
|
/* Look at the pretty-printer list in the gdb module. */
|
2010-04-16 03:54:13 +08:00
|
|
|
function = find_pretty_printer_from_gdb (value);
|
|
|
|
return function;
|
|
|
|
}
|
2010-01-14 16:03:37 +08:00
|
|
|
|
2009-07-10 18:35:17 +08:00
|
|
|
/* Pretty-print a single value, via the printer object PRINTER.
|
|
|
|
If the function returns a string, a PyObject containing the string
|
2010-04-14 20:02:46 +08:00
|
|
|
is returned. If the function returns Py_NONE that means the pretty
|
|
|
|
printer returned the Python None as a value. Otherwise, if the
|
|
|
|
function returns a value, *OUT_VALUE is set to the value, and NULL
|
2010-10-13 21:24:40 +08:00
|
|
|
is returned. On error, *OUT_VALUE is set to NULL, NULL is
|
|
|
|
returned, with a python exception set. */
|
2010-04-14 20:02:46 +08:00
|
|
|
|
2009-07-10 18:35:17 +08:00
|
|
|
static PyObject *
|
2009-05-28 09:05:14 +08:00
|
|
|
pretty_print_one_value (PyObject *printer, struct value **out_value)
|
|
|
|
{
|
|
|
|
volatile struct gdb_exception except;
|
2009-07-10 18:35:17 +08:00
|
|
|
PyObject *result = NULL;
|
2009-05-28 09:05:14 +08:00
|
|
|
|
2009-07-10 18:35:17 +08:00
|
|
|
*out_value = NULL;
|
2009-05-28 09:05:14 +08:00
|
|
|
TRY_CATCH (except, RETURN_MASK_ALL)
|
|
|
|
{
|
|
|
|
result = PyObject_CallMethodObjArgs (printer, gdbpy_to_string_cst, NULL);
|
|
|
|
if (result)
|
|
|
|
{
|
2010-04-14 20:02:46 +08:00
|
|
|
if (! gdbpy_is_string (result) && ! gdbpy_is_lazy_string (result)
|
|
|
|
&& result != Py_None)
|
2009-07-10 18:35:17 +08:00
|
|
|
{
|
|
|
|
*out_value = convert_value_from_python (result);
|
|
|
|
if (PyErr_Occurred ())
|
|
|
|
*out_value = NULL;
|
|
|
|
Py_DECREF (result);
|
|
|
|
result = NULL;
|
|
|
|
}
|
2009-05-28 09:05:14 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-10 18:35:17 +08:00
|
|
|
return result;
|
2009-05-28 09:05:14 +08: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 (hint)
|
2010-07-10 04:29:56 +08:00
|
|
|
{
|
|
|
|
if (gdbpy_is_string (hint))
|
2010-10-13 21:24:40 +08:00
|
|
|
{
|
|
|
|
result = python_string_to_host_string (hint);
|
|
|
|
if (result == NULL)
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
}
|
2010-07-10 04:29:56 +08:00
|
|
|
Py_DECREF (hint);
|
|
|
|
}
|
2009-05-28 09:05:14 +08:00
|
|
|
else
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2010-11-13 04:49:43 +08:00
|
|
|
/* A wrapper for gdbpy_print_stack that ignores MemoryError. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
print_stack_unless_memory_error (struct ui_file *stream)
|
|
|
|
{
|
|
|
|
if (PyErr_ExceptionMatches (gdbpy_gdb_memory_error))
|
|
|
|
{
|
|
|
|
struct cleanup *cleanup;
|
|
|
|
PyObject *type, *value, *trace;
|
|
|
|
char *msg;
|
|
|
|
|
|
|
|
PyErr_Fetch (&type, &value, &trace);
|
|
|
|
cleanup = make_cleanup_py_decref (type);
|
|
|
|
make_cleanup_py_decref (value);
|
|
|
|
make_cleanup_py_decref (trace);
|
|
|
|
|
|
|
|
msg = gdbpy_exception_to_string (type, value);
|
|
|
|
make_cleanup (xfree, msg);
|
|
|
|
|
|
|
|
if (msg == NULL || *msg == '\0')
|
2011-04-01 00:25:41 +08:00
|
|
|
fprintf_filtered (stream, _("<error reading variable>"));
|
2010-11-13 04:49:43 +08:00
|
|
|
else
|
|
|
|
fprintf_filtered (stream, _("<error reading variable: %s>"), msg);
|
|
|
|
|
|
|
|
do_cleanups (cleanup);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
}
|
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
/* Helper for apply_val_pretty_printer which calls to_string and
|
2010-11-13 04:49:43 +08:00
|
|
|
formats the result. */
|
|
|
|
|
|
|
|
static enum string_repr_result
|
2009-05-28 09:05:14 +08:00
|
|
|
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 20:57:14 +08:00
|
|
|
const struct language_defn *language,
|
|
|
|
struct gdbarch *gdbarch)
|
2009-05-28 09:05:14 +08:00
|
|
|
{
|
|
|
|
struct value *replacement = NULL;
|
2009-07-10 18:35:17 +08:00
|
|
|
PyObject *py_str = NULL;
|
2010-11-13 04:49:43 +08:00
|
|
|
enum string_repr_result result = string_repr_ok;
|
2009-05-28 09:05:14 +08:00
|
|
|
|
2009-07-10 18:35:17 +08:00
|
|
|
py_str = pretty_print_one_value (printer, &replacement);
|
|
|
|
if (py_str)
|
2009-05-28 09:05:14 +08:00
|
|
|
{
|
2010-10-16 02:54:13 +08:00
|
|
|
struct cleanup *cleanup = make_cleanup_py_decref (py_str);
|
|
|
|
|
2010-04-14 20:02:46 +08:00
|
|
|
if (py_str == Py_None)
|
2010-11-13 04:49:43 +08:00
|
|
|
result = string_repr_none;
|
2010-10-16 02:54:13 +08:00
|
|
|
else if (gdbpy_is_lazy_string (py_str))
|
2009-07-10 18:35:17 +08:00
|
|
|
{
|
2010-10-16 02:54:13 +08:00
|
|
|
CORE_ADDR addr;
|
2010-04-14 20:02:46 +08:00
|
|
|
long length;
|
|
|
|
struct type *type;
|
|
|
|
char *encoding = NULL;
|
2011-01-27 04:58:49 +08:00
|
|
|
struct value_print_options local_opts = *options;
|
2010-04-14 20:02:46 +08:00
|
|
|
|
2010-10-16 02:54:13 +08:00
|
|
|
make_cleanup (free_current_contents, &encoding);
|
|
|
|
gdbpy_extract_lazy_string (py_str, &addr, &type,
|
|
|
|
&length, &encoding);
|
|
|
|
|
2011-01-27 04:58:49 +08:00
|
|
|
local_opts.addressprint = 0;
|
2010-10-16 02:54:13 +08:00
|
|
|
val_print_string (type, encoding, addr, (int) length,
|
2011-01-27 04:58:49 +08:00
|
|
|
stream, &local_opts);
|
2010-10-16 02:54:13 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
PyObject *string;
|
|
|
|
|
|
|
|
string = python_string_to_target_python_string (py_str);
|
|
|
|
if (string)
|
2010-04-14 20:02:46 +08:00
|
|
|
{
|
2013-04-19 23:29:09 +08:00
|
|
|
char *output;
|
2010-10-16 02:54:13 +08:00
|
|
|
long length;
|
|
|
|
struct type *type;
|
|
|
|
|
|
|
|
make_cleanup_py_decref (string);
|
2012-12-13 00:47:30 +08:00
|
|
|
#ifdef IS_PY3K
|
2013-04-19 23:29:09 +08:00
|
|
|
output = PyBytes_AS_STRING (string);
|
2012-12-13 00:47:30 +08:00
|
|
|
length = PyBytes_GET_SIZE (string);
|
|
|
|
#else
|
2010-10-16 02:54:13 +08:00
|
|
|
output = PyString_AsString (string);
|
|
|
|
length = PyString_Size (string);
|
2012-12-13 00:47:30 +08:00
|
|
|
#endif
|
2010-10-16 02:54:13 +08:00
|
|
|
type = builtin_type (gdbarch)->builtin_char;
|
|
|
|
|
|
|
|
if (hint && !strcmp (hint, "string"))
|
2013-04-19 23:29:09 +08:00
|
|
|
LA_PRINT_STRING (stream, type, (gdb_byte *) output,
|
|
|
|
length, NULL, 0, options);
|
2010-04-14 20:02:46 +08:00
|
|
|
else
|
|
|
|
fputs_filtered (output, stream);
|
2010-01-14 16:03:37 +08:00
|
|
|
}
|
|
|
|
else
|
2010-11-13 04:49:43 +08:00
|
|
|
{
|
|
|
|
result = string_repr_error;
|
|
|
|
print_stack_unless_memory_error (stream);
|
|
|
|
}
|
2010-04-14 20:02:46 +08:00
|
|
|
}
|
2010-10-16 02:54:13 +08:00
|
|
|
|
|
|
|
do_cleanups (cleanup);
|
2009-05-28 09:05:14 +08:00
|
|
|
}
|
|
|
|
else if (replacement)
|
2009-11-14 01:17:57 +08:00
|
|
|
{
|
|
|
|
struct value_print_options opts = *options;
|
|
|
|
|
|
|
|
opts.addressprint = 0;
|
|
|
|
common_val_print (replacement, stream, recurse, &opts, language);
|
|
|
|
}
|
2009-05-28 09:05:14 +08:00
|
|
|
else
|
2010-11-13 04:49:43 +08:00
|
|
|
{
|
|
|
|
result = string_repr_error;
|
|
|
|
print_stack_unless_memory_error (stream);
|
|
|
|
}
|
2010-04-14 20:02:46 +08:00
|
|
|
|
2010-11-13 04:49:43 +08:00
|
|
|
return result;
|
2009-05-28 09:05:14 +08:00
|
|
|
}
|
|
|
|
|
2012-12-13 00:47:30 +08:00
|
|
|
#ifndef IS_PY3K
|
2009-05-28 09:05:14 +08:00
|
|
|
static void
|
|
|
|
py_restore_tstate (void *p)
|
|
|
|
{
|
|
|
|
PyFrameObject *frame = p;
|
|
|
|
PyThreadState *tstate = PyThreadState_GET ();
|
2010-05-18 05:23:25 +08:00
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
tstate->frame = frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create a dummy PyFrameObject, needed to work around
|
|
|
|
a Python-2.4 bug with generators. */
|
|
|
|
static PyObject *
|
2011-03-14 23:43:51 +08:00
|
|
|
push_dummy_python_frame (void)
|
2009-05-28 09:05:14 +08:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
2012-12-13 00:47:30 +08:00
|
|
|
#endif
|
2009-05-28 09:05:14 +08:00
|
|
|
|
|
|
|
/* Helper for apply_val_pretty_printer that formats children of the
|
2010-04-14 20:02:46 +08:00
|
|
|
printer, if any exist. If is_py_none is true, then nothing has
|
|
|
|
been printed by to_string, and format output accordingly. */
|
2009-05-28 09:05:14 +08:00
|
|
|
static void
|
|
|
|
print_children (PyObject *printer, const char *hint,
|
|
|
|
struct ui_file *stream, int recurse,
|
|
|
|
const struct value_print_options *options,
|
2010-04-14 20:02:46 +08:00
|
|
|
const struct language_defn *language,
|
|
|
|
int is_py_none)
|
2009-05-28 09:05:14 +08:00
|
|
|
{
|
|
|
|
int is_map, is_array, done_flag, pretty;
|
|
|
|
unsigned int i;
|
2012-12-13 00:47:30 +08:00
|
|
|
PyObject *children, *iter;
|
|
|
|
#ifndef IS_PY3K
|
|
|
|
PyObject *frame;
|
|
|
|
#endif
|
2009-05-28 09:05:14 +08:00
|
|
|
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)
|
|
|
|
{
|
2010-11-13 04:49:43 +08:00
|
|
|
print_stack_unless_memory_error (stream);
|
2009-05-28 09:05:14 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cleanups = make_cleanup_py_decref (children);
|
|
|
|
|
|
|
|
iter = PyObject_GetIter (children);
|
|
|
|
if (!iter)
|
|
|
|
{
|
2010-11-13 04:49:43 +08:00
|
|
|
print_stack_unless_memory_error (stream);
|
2009-05-28 09:05:14 +08:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
make_cleanup_py_decref (iter);
|
|
|
|
|
2013-07-10 00:57:09 +08:00
|
|
|
/* Use the prettyformat_arrays option if we are printing an array,
|
2009-05-28 09:05:14 +08:00
|
|
|
and the pretty option otherwise. */
|
2011-01-27 04:58:49 +08:00
|
|
|
if (is_array)
|
2013-07-10 00:57:09 +08:00
|
|
|
pretty = options->prettyformat_arrays;
|
2011-01-27 04:58:49 +08:00
|
|
|
else
|
|
|
|
{
|
2013-07-10 00:57:09 +08:00
|
|
|
if (options->prettyformat == Val_prettyformat)
|
2011-01-27 04:58:49 +08:00
|
|
|
pretty = 1;
|
|
|
|
else
|
2013-07-10 00:57:09 +08:00
|
|
|
pretty = options->prettyformat_structs;
|
2011-01-27 04:58:49 +08:00
|
|
|
}
|
2009-05-28 09:05:14 +08:00
|
|
|
|
|
|
|
/* 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. */
|
2012-12-13 00:47:30 +08:00
|
|
|
#ifndef IS_PY3K
|
2009-05-28 09:05:14 +08:00
|
|
|
frame = push_dummy_python_frame ();
|
|
|
|
if (!frame)
|
|
|
|
{
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
make_cleanup_py_decref (frame);
|
2012-12-13 00:47:30 +08:00
|
|
|
#endif
|
2009-05-28 09:05:14 +08:00
|
|
|
|
|
|
|
done_flag = 0;
|
|
|
|
for (i = 0; i < options->print_max; ++i)
|
|
|
|
{
|
|
|
|
PyObject *py_v, *item = PyIter_Next (iter);
|
2011-06-25 03:47:37 +08:00
|
|
|
const char *name;
|
2009-05-28 09:05:14 +08:00
|
|
|
struct cleanup *inner_cleanup;
|
|
|
|
|
|
|
|
if (! item)
|
|
|
|
{
|
|
|
|
if (PyErr_Occurred ())
|
2010-11-13 04:49:43 +08:00
|
|
|
print_stack_unless_memory_error (stream);
|
2009-05-28 09:05:14 +08:00
|
|
|
/* 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)
|
2010-04-14 20:02:46 +08:00
|
|
|
{
|
|
|
|
if (is_py_none)
|
|
|
|
fputs_filtered ("{", stream);
|
|
|
|
else
|
|
|
|
fputs_filtered (" = {", stream);
|
|
|
|
}
|
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:54:13 +08:00
|
|
|
if (gdbpy_is_lazy_string (py_v))
|
2009-05-28 09:05:14 +08:00
|
|
|
{
|
2010-10-16 02:54:13 +08:00
|
|
|
CORE_ADDR addr;
|
|
|
|
struct type *type;
|
|
|
|
long length;
|
|
|
|
char *encoding = NULL;
|
2011-01-27 04:58:49 +08:00
|
|
|
struct value_print_options local_opts = *options;
|
2010-01-14 16:03:37 +08:00
|
|
|
|
2010-10-16 02:54:13 +08:00
|
|
|
make_cleanup (free_current_contents, &encoding);
|
|
|
|
gdbpy_extract_lazy_string (py_v, &addr, &type, &length, &encoding);
|
|
|
|
|
2011-01-27 04:58:49 +08:00
|
|
|
local_opts.addressprint = 0;
|
2010-10-16 02:54:13 +08:00
|
|
|
val_print_string (type, encoding, addr, (int) length, stream,
|
2011-01-27 04:58:49 +08:00
|
|
|
&local_opts);
|
2010-10-16 02:54:13 +08:00
|
|
|
}
|
|
|
|
else if (gdbpy_is_string (py_v))
|
|
|
|
{
|
2013-04-19 23:29:09 +08:00
|
|
|
char *output;
|
2010-10-16 02:54:13 +08:00
|
|
|
|
|
|
|
output = python_string_to_host_string (py_v);
|
|
|
|
if (!output)
|
|
|
|
gdbpy_print_stack ();
|
2009-05-28 09:05:14 +08:00
|
|
|
else
|
|
|
|
{
|
2010-10-16 02:54:13 +08:00
|
|
|
fputs_filtered (output, stream);
|
2010-01-14 16:03:37 +08:00
|
|
|
xfree (output);
|
2009-05-28 09:05:14 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
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,
|
2010-06-11 23:36:10 +08:00
|
|
|
const struct value *val,
|
2009-05-28 09:05:14 +08:00
|
|
|
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 20:57:14 +08:00
|
|
|
struct gdbarch *gdbarch = get_type_arch (type);
|
2009-05-28 09:05:14 +08:00
|
|
|
PyObject *printer = NULL;
|
|
|
|
PyObject *val_obj = NULL;
|
|
|
|
struct value *value;
|
|
|
|
char *hint = NULL;
|
|
|
|
struct cleanup *cleanups;
|
|
|
|
int result = 0;
|
2010-11-13 04:49:43 +08:00
|
|
|
enum string_repr_result print_result;
|
2011-02-14 19:10:53 +08:00
|
|
|
|
|
|
|
/* No pretty-printer support for unavailable values. */
|
2011-03-02 05:54:53 +08:00
|
|
|
if (!value_bytes_available (val, embedded_offset, TYPE_LENGTH (type)))
|
2011-02-14 19:10:53 +08:00
|
|
|
return 0;
|
2013-05-21 04:29:44 +08:00
|
|
|
|
|
|
|
if (!gdb_python_initialized)
|
|
|
|
return 0;
|
2011-02-14 19:10:53 +08:00
|
|
|
|
* 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-03 01:04:23 +08:00
|
|
|
cleanups = ensure_python_env (gdbarch, language);
|
2009-05-28 09:05:14 +08:00
|
|
|
|
|
|
|
/* Instantiate the printer. */
|
|
|
|
if (valaddr)
|
|
|
|
valaddr += embedded_offset;
|
2010-02-03 00:45:17 +08:00
|
|
|
value = value_from_contents_and_address (type, valaddr,
|
|
|
|
address + embedded_offset);
|
2011-03-02 05:54:53 +08:00
|
|
|
|
|
|
|
set_value_component_location (value, val);
|
|
|
|
/* set_value_component_location resets the address, so we may
|
|
|
|
need to set it again. */
|
|
|
|
if (VALUE_LVAL (value) != lval_internalvar
|
|
|
|
&& VALUE_LVAL (value) != lval_internalvar_component
|
|
|
|
&& VALUE_LVAL (value) != lval_computed)
|
|
|
|
set_value_address (value, address + embedded_offset);
|
2009-05-28 09:05:14 +08:00
|
|
|
|
|
|
|
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);
|
2013-05-22 04:53:21 +08:00
|
|
|
|
|
|
|
if (printer == NULL)
|
|
|
|
goto done;
|
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
make_cleanup_py_decref (printer);
|
2013-05-22 04:53:21 +08:00
|
|
|
if (printer == Py_None)
|
2009-05-28 09:05:14 +08:00
|
|
|
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 */
|
2010-11-13 04:49:43 +08:00
|
|
|
print_result = print_string_repr (printer, hint, stream, recurse,
|
|
|
|
options, language, gdbarch);
|
|
|
|
if (print_result != string_repr_error)
|
|
|
|
print_children (printer, hint, stream, recurse, options, language,
|
|
|
|
print_result == string_repr_none);
|
2010-04-14 20:02:46 +08:00
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
result = 1;
|
|
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
if (PyErr_Occurred ())
|
2010-11-13 04:49:43 +08:00
|
|
|
print_stack_unless_memory_error (stream);
|
2009-05-28 09:05:14 +08:00
|
|
|
do_cleanups (cleanups);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2009-07-10 18:35:17 +08:00
|
|
|
|
2009-05-28 09:09:20 +08: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 18:35:17 +08: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 09:09:20 +08:00
|
|
|
apply_varobj_pretty_printer (PyObject *printer_obj,
|
2010-11-13 04:49:43 +08:00
|
|
|
struct value **replacement,
|
|
|
|
struct ui_file *stream)
|
2009-05-28 09:09:20 +08:00
|
|
|
{
|
2009-07-10 18:35:17 +08:00
|
|
|
PyObject *py_str = NULL;
|
2009-05-28 09:09:20 +08:00
|
|
|
|
|
|
|
*replacement = NULL;
|
2009-07-10 18:35:17 +08:00
|
|
|
py_str = pretty_print_one_value (printer_obj, replacement);
|
|
|
|
|
|
|
|
if (*replacement == NULL && py_str == NULL)
|
2010-11-13 04:49:43 +08:00
|
|
|
print_stack_unless_memory_error (stream);
|
2009-05-28 09:09:20 +08:00
|
|
|
|
2009-07-10 18:35:17 +08:00
|
|
|
return py_str;
|
2009-05-28 09:09:20 +08: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;
|
2010-05-08 03:26:30 +08:00
|
|
|
PyObject *cons;
|
2009-05-28 09:09:20 +08:00
|
|
|
struct value *value;
|
|
|
|
|
|
|
|
if (! PyArg_ParseTuple (args, "O", &val_obj))
|
|
|
|
return NULL;
|
|
|
|
value = value_object_to_value (val_obj);
|
|
|
|
if (! value)
|
|
|
|
{
|
2010-04-14 21:18:55 +08:00
|
|
|
PyErr_SetString (PyExc_TypeError,
|
|
|
|
_("Argument must be a gdb.Value."));
|
2009-05-28 09:09:20 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
cons = find_pretty_printer (val_obj);
|
|
|
|
return cons;
|
|
|
|
}
|
|
|
|
|
2009-05-28 09:05:14 +08:00
|
|
|
#else /* HAVE_PYTHON */
|
|
|
|
|
|
|
|
int
|
|
|
|
apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr,
|
|
|
|
int embedded_offset, CORE_ADDR address,
|
2009-05-29 00:30:39 +08:00
|
|
|
struct ui_file *stream, int recurse,
|
2010-06-11 23:36:10 +08:00
|
|
|
const struct value *val,
|
2009-05-29 00:30:39 +08:00
|
|
|
const struct value_print_options *options,
|
2009-05-28 09:05:14 +08:00
|
|
|
const struct language_defn *language)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* HAVE_PYTHON */
|