fbb8f2990c
* python/python-internal.h (apply_varobj_pretty_printer): Update definition. (python_string_to_target_python_string): Add definition. * python/python-utils.c (unicode_to_encoded_python_string) (unicode_to_target_python_string) (python_string_to_target_python_string): New Functions. * python/python-prettyprint.c (pretty_print_one_value): Likewise. (print_string_repr): Refactor to logic to account for PyObject returned strings. (apply_varobj_pretty_printer): Likewise. * python/python-value.c (valpy_string): Parse length keyword. Use length keyword in LA_GET_STRING. * varobj.c (value_get_print_value): Refactor logic to account for PyObject returned strings. * c-lang.c (c_get_string): If the length parameter is specified, use that. Return value in characters. Update comments. * language.h: Update c_get_string prototype comments. 2009-07-10 Phil Muldoon <pmuldoon@redhat.com> * gdb.texinfo (Values From Inferior): Add length parameter description. 2009-07-10 Phil Muldoon <pmuldoon@redhat.com> * gdb.python/python-prettyprint.c: Add counted null string structure. * gdb.python/python-prettyprint.exp: Print null string. Test for embedded nulls. * gdb.python/python-prettyprint.py (pp_ns): New Function. * gdb.python/python-value.exp (test_value_in_inferior): Add variable length string fetch tests. * gdb.python/python-value.c (main): Add strings for string fetch tests.
134 lines
4.8 KiB
C
134 lines
4.8 KiB
C
/* Gdb/Python header for private use by Python module.
|
|
|
|
Copyright (C) 2008, 2009 Free Software Foundation, Inc.
|
|
|
|
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/>. */
|
|
|
|
#ifndef GDB_PYTHON_INTERNAL_H
|
|
#define GDB_PYTHON_INTERNAL_H
|
|
|
|
/* Python 2.4 doesn't include stdint.h soon enough to get {u,}intptr_t
|
|
needed by pyport.h. */
|
|
#include <stdint.h>
|
|
|
|
/* /usr/include/features.h on linux systems will define _POSIX_C_SOURCE
|
|
if it sees _GNU_SOURCE (which config.h will define).
|
|
pyconfig.h defines _POSIX_C_SOURCE to a different value than
|
|
/usr/include/features.h does causing compilation to fail.
|
|
To work around this, undef _POSIX_C_SOURCE before we include Python.h. */
|
|
#undef _POSIX_C_SOURCE
|
|
|
|
#if HAVE_LIBPYTHON2_4
|
|
#include "python2.4/Python.h"
|
|
#include "python2.4/frameobject.h"
|
|
/* Py_ssize_t is not defined until 2.5.
|
|
Logical type for Py_ssize_t is Py_intptr_t, but that fails in 64-bit
|
|
compilation due to several apparent mistakes in python2.4 API, so we
|
|
use 'int' instead. */
|
|
typedef int Py_ssize_t;
|
|
#elif HAVE_LIBPYTHON2_5
|
|
#include "python2.5/Python.h"
|
|
#include "python2.5/frameobject.h"
|
|
#elif HAVE_LIBPYTHON2_6
|
|
#include "python2.6/Python.h"
|
|
#include "python2.6/frameobject.h"
|
|
#else
|
|
#error "Unable to find usable Python.h"
|
|
#endif
|
|
|
|
/* If Python.h does not define WITH_THREAD, then the various
|
|
GIL-related functions will not be defined. However,
|
|
PyGILState_STATE will be. */
|
|
#ifndef WITH_THREAD
|
|
#define PyGILState_Ensure() ((PyGILState_STATE) 0)
|
|
#define PyGILState_Release(ARG) (ARG)
|
|
#define PyEval_InitThreads() 0
|
|
#define PyThreadState_Swap(ARG) (ARG)
|
|
#define PyEval_InitThreads() 0
|
|
#define PyEval_ReleaseLock() 0
|
|
#endif
|
|
|
|
struct value;
|
|
struct language_defn;
|
|
|
|
extern PyObject *gdb_module;
|
|
extern PyTypeObject value_object_type;
|
|
|
|
PyObject *gdbpy_history (PyObject *self, PyObject *args);
|
|
PyObject *gdbpy_frame_stop_reason_string (PyObject *, PyObject *);
|
|
PyObject *gdbpy_selected_frame (PyObject *self, PyObject *args);
|
|
PyObject *gdbpy_lookup_type (PyObject *self, PyObject *args, PyObject *kw);
|
|
|
|
PyObject *value_to_value_object (struct value *v);
|
|
PyObject *type_to_type_object (struct type *);
|
|
PyObject *objfile_to_objfile_object (struct objfile *);
|
|
|
|
PyObject *objfpy_get_printers (PyObject *, void *);
|
|
|
|
struct value *value_object_to_value (PyObject *self);
|
|
struct value *convert_value_from_python (PyObject *obj);
|
|
struct type *type_object_to_type (PyObject *obj);
|
|
|
|
void gdbpy_initialize_values (void);
|
|
void gdbpy_initialize_frames (void);
|
|
void gdbpy_initialize_commands (void);
|
|
void gdbpy_initialize_types (void);
|
|
void gdbpy_initialize_functions (void);
|
|
void gdbpy_initialize_objfile (void);
|
|
|
|
struct cleanup *make_cleanup_py_decref (PyObject *py);
|
|
|
|
struct cleanup *ensure_python_env (struct gdbarch *gdbarch,
|
|
const struct language_defn *language);
|
|
|
|
extern struct gdbarch *python_gdbarch;
|
|
extern const struct language_defn *python_language;
|
|
|
|
/* Use this after a TRY_EXCEPT to throw the appropriate Python
|
|
exception. */
|
|
#define GDB_PY_HANDLE_EXCEPTION(Exception) \
|
|
do { \
|
|
if (Exception.reason < 0) \
|
|
return PyErr_Format (Exception.reason == RETURN_QUIT \
|
|
? PyExc_KeyboardInterrupt : PyExc_RuntimeError, \
|
|
"%s", Exception.message); \
|
|
} while (0)
|
|
|
|
|
|
void gdbpy_print_stack (void);
|
|
|
|
PyObject *python_string_to_unicode (PyObject *obj);
|
|
char *unicode_to_target_string (PyObject *unicode_str);
|
|
char *python_string_to_target_string (PyObject *obj);
|
|
PyObject *python_string_to_target_python_string (PyObject *obj);
|
|
char *python_string_to_host_string (PyObject *obj);
|
|
PyObject *target_string_to_unicode (const gdb_byte *str, int length);
|
|
int gdbpy_is_string (PyObject *obj);
|
|
|
|
/* Note that these are declared here, and not in python.h with the
|
|
other pretty-printer functions, because they refer to PyObject. */
|
|
PyObject *apply_varobj_pretty_printer (PyObject *print_obj,
|
|
struct value **replacement);
|
|
PyObject *gdbpy_get_varobj_pretty_printer (struct value *value);
|
|
char *gdbpy_get_display_hint (PyObject *printer);
|
|
PyObject *gdbpy_default_visualizer (PyObject *self, PyObject *args);
|
|
|
|
extern PyObject *gdbpy_doc_cst;
|
|
extern PyObject *gdbpy_children_cst;
|
|
extern PyObject *gdbpy_to_string_cst;
|
|
extern PyObject *gdbpy_display_hint_cst;
|
|
|
|
#endif /* GDB_PYTHON_INTERNAL_H */
|