
* NEWS: Mention Python 3 support. * varobj.c (value_get_print_value): Use python_string_to_target_string. * python/py-block.c: Use PyVarObject_HEAD_INIT in initialization of type objects. * python/py-breakpoint.c: Ditto. * python/py-cmd.c: Ditto. * python/py-event.c: Ditto. * python/py-event.h: Ditto. * python/py-evtregistry.c: Ditto. * python/py-finishbreakpoint.c: Ditto. * python/py-frame.c: Ditto. * python/py-function.c: Ditto. * python/py-infthread.c: Ditto. * python/py-lazy-string.c: Ditto. * python/py-progspace.c: Ditto. * /python/py-symbol.c: Ditto. * python/py-evts.c: (gdbpy_initialize_py_events): Add module initialization for Python 3. * python/py-inferior.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (infpy_read_memory): Return memoryview object if Python 3. (infpy_write_memory): Use "s*" operand parsing code for Python 3. (infpy_search_memory): Ditto. (get_buffer): New function for Python 3. * python/py-objfile.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (objfpy_dealloc): Use Py_TYPE to call tp_free. * python/py-param.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (get_attr): Use PyUnicode_CompareWithASCIIString if Python 3. (set_attr): Ditto. * python/py-prettyprint.c (print_string_repr): use PyBytes methods instead of PyString methods if Python 3. (print_children): Skip push_dummy_python_frame call if Python 3. * python/py-symtab.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (salpy_dealloc): Use Py_TYPE to call tp_free. * python/py-type.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (field_dealloc): Use Py_TYPE to call tp_free. (typy_dealloc): Ditto. (type_object_as_number): Adjust struct initializations for differences in layout for Python 2 vs. Python 3. * python/py-utils.c (python_string_to_unicode): Omit non-Unicode string case for Python 3. (unicode_to_encoded_python_string): Shorten code (no functional change). (python_string_to_target_python_string): Comment that in Python 3 returned value is a Python "bytes" type. (gdbpy_is_string): Omit non-Unicode string check in Python 3. (gdb_py_object_from_longest): Omit non-long integer case in Python 3. (gdb_py_object_from_ulongest): Ditto. * python/py-value.c: Use PyVarObject_HEAD_INIT in initialization of type objects. (valpy_dealloc): Use Py_TYPE to call tp_free. (valpy_int): Omit function if Python 3. (convert_value_from_python): Use "%S" format (Python object as a string) if Python 3. (value_object_as_number): Adjust struct initializations for differences in layout for Python 2 vs. Python 3. * python/python-config.py: Adjust syntax for Python 3 compatibility. Include "sys.abiflags" string as part of python library name, if that attribute exists (Python 3). * python/python-internal.h (IS_PY3): Define if Python 3. (Py_TPFLAGS_HAVE_ITER, Py_TPFLAGS_CHECKTYPES): Define with placeholder value if Python 3. (PyInt_Check, PyInt_FromLong, PyInt_AsLong, PyString_FromString, PyString_Decode, PyString_FromFormat, PyString_Check): Define as analogous Python 3 API function if Python 3. (PyVarObject_HEAD_INIT): Define if not already defined. (Py_TYPE): Ditto. * python/python.c (eval_python_command): Omit Py_FlushLine call if Python 3. Check return values of all Python API calls for error. Supply dummy "python" and "python-interactive" commands if Python initialization failed. (_initialize_python): Convert argc to wchar_t** if Python 3. Add module initialization for Python 3. (finish_python_initialization): Pass wchar_t * argument to PySys_SetPath if Python 3. * python/lib/gdb/__init__.py: Define "reload" if Python 3. (_GdbFile): New class for common output file behavior. (GdbOutFile): Subclass from _GdbFile. (GdbOutputErrorFile): Ditto. (auto_load_packages): Adjust syntax for Python 3 compatibility. * python/lib/gdb/printing.py: Define basestr and int if Python 3. * python/lib/gdb/prompt.py: Use sorted() function rather than sort() method. * python/lib/gdb/command/explore.py: Define raw_input if Python 3. Adjust syntax for Python 3 compatibility. * python/lib/gdb/command/pretty_printers.py: Use sorted() function rather than sort() method. Adjust syntax for Python 3 compatibility. * python/lib/gdb/command/type_printers.py: Ditto. * doc/gdb.texinfo (Inferior.read_memory): Mention that the return value is a memoryview object if Python 3.
249 lines
6.6 KiB
C
249 lines
6.6 KiB
C
/* Python interface to lazy strings.
|
||
|
||
Copyright (C) 2010-2012 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/>. */
|
||
|
||
#include "defs.h"
|
||
#include "python-internal.h"
|
||
#include "charset.h"
|
||
#include "value.h"
|
||
#include "exceptions.h"
|
||
#include "valprint.h"
|
||
#include "language.h"
|
||
#include "gdb_assert.h"
|
||
|
||
typedef struct {
|
||
PyObject_HEAD
|
||
/* Holds the address of the lazy string. */
|
||
CORE_ADDR address;
|
||
|
||
/* Holds the encoding that will be applied to the string
|
||
when the string is printed by GDB. If the encoding is set
|
||
to None then GDB will select the most appropriate
|
||
encoding when the sting is printed. */
|
||
char *encoding;
|
||
|
||
/* Holds the length of the string in characters. If the
|
||
length is -1, then the string will be fetched and encoded up to
|
||
the first null of appropriate width. */
|
||
long length;
|
||
|
||
/* This attribute holds the type that is represented by the lazy
|
||
string's type. */
|
||
struct type *type;
|
||
} lazy_string_object;
|
||
|
||
static PyTypeObject lazy_string_object_type;
|
||
|
||
static PyObject *
|
||
stpy_get_address (PyObject *self, void *closure)
|
||
{
|
||
lazy_string_object *self_string = (lazy_string_object *) self;
|
||
|
||
return gdb_py_long_from_ulongest (self_string->address);
|
||
}
|
||
|
||
static PyObject *
|
||
stpy_get_encoding (PyObject *self, void *closure)
|
||
{
|
||
lazy_string_object *self_string = (lazy_string_object *) self;
|
||
PyObject *result;
|
||
|
||
/* An encoding can be set to NULL by the user, so check before
|
||
attempting a Python FromString call. If NULL return Py_None. */
|
||
if (self_string->encoding)
|
||
result = PyString_FromString (self_string->encoding);
|
||
else
|
||
{
|
||
result = Py_None;
|
||
Py_INCREF (result);
|
||
}
|
||
|
||
return result;
|
||
}
|
||
|
||
static PyObject *
|
||
stpy_get_length (PyObject *self, void *closure)
|
||
{
|
||
lazy_string_object *self_string = (lazy_string_object *) self;
|
||
|
||
return PyLong_FromLong (self_string->length);
|
||
}
|
||
|
||
static PyObject *
|
||
stpy_get_type (PyObject *self, void *closure)
|
||
{
|
||
lazy_string_object *str_obj = (lazy_string_object *) self;
|
||
|
||
return type_to_type_object (str_obj->type);
|
||
}
|
||
|
||
static PyObject *
|
||
stpy_convert_to_value (PyObject *self, PyObject *args)
|
||
{
|
||
lazy_string_object *self_string = (lazy_string_object *) self;
|
||
struct value *val = NULL;
|
||
volatile struct gdb_exception except;
|
||
|
||
if (self_string->address == 0)
|
||
{
|
||
PyErr_SetString (PyExc_MemoryError,
|
||
_("Cannot create a value from NULL."));
|
||
return NULL;
|
||
}
|
||
|
||
TRY_CATCH (except, RETURN_MASK_ALL)
|
||
{
|
||
val = value_at_lazy (self_string->type, self_string->address);
|
||
}
|
||
GDB_PY_HANDLE_EXCEPTION (except);
|
||
|
||
return value_to_value_object (val);
|
||
}
|
||
|
||
static void
|
||
stpy_dealloc (PyObject *self)
|
||
{
|
||
lazy_string_object *self_string = (lazy_string_object *) self;
|
||
|
||
xfree (self_string->encoding);
|
||
}
|
||
|
||
PyObject *
|
||
gdbpy_create_lazy_string_object (CORE_ADDR address, long length,
|
||
const char *encoding, struct type *type)
|
||
{
|
||
lazy_string_object *str_obj = NULL;
|
||
|
||
if (address == 0 && length != 0)
|
||
{
|
||
PyErr_SetString (PyExc_MemoryError,
|
||
_("Cannot create a lazy string with address 0x0, " \
|
||
"and a non-zero length."));
|
||
return NULL;
|
||
}
|
||
|
||
if (!type)
|
||
{
|
||
PyErr_SetString (PyExc_RuntimeError,
|
||
_("A lazy string's type cannot be NULL."));
|
||
return NULL;
|
||
}
|
||
|
||
str_obj = PyObject_New (lazy_string_object, &lazy_string_object_type);
|
||
if (!str_obj)
|
||
return NULL;
|
||
|
||
str_obj->address = address;
|
||
str_obj->length = length;
|
||
if (encoding == NULL || !strcmp (encoding, ""))
|
||
str_obj->encoding = NULL;
|
||
else
|
||
str_obj->encoding = xstrdup (encoding);
|
||
str_obj->type = type;
|
||
|
||
return (PyObject *) str_obj;
|
||
}
|
||
|
||
void
|
||
gdbpy_initialize_lazy_string (void)
|
||
{
|
||
if (PyType_Ready (&lazy_string_object_type) < 0)
|
||
return;
|
||
|
||
Py_INCREF (&lazy_string_object_type);
|
||
}
|
||
|
||
/* Determine whether the printer object pointed to by OBJ is a
|
||
Python lazy string. */
|
||
int
|
||
gdbpy_is_lazy_string (PyObject *result)
|
||
{
|
||
return PyObject_TypeCheck (result, &lazy_string_object_type);
|
||
}
|
||
|
||
/* Extract the parameters from the lazy string object STRING.
|
||
ENCODING will either be set to NULL, or will be allocated with
|
||
xmalloc, in which case the callers is responsible for freeing
|
||
it. */
|
||
|
||
void
|
||
gdbpy_extract_lazy_string (PyObject *string, CORE_ADDR *addr,
|
||
struct type **str_type,
|
||
long *length, char **encoding)
|
||
{
|
||
lazy_string_object *lazy;
|
||
|
||
gdb_assert (gdbpy_is_lazy_string (string));
|
||
|
||
lazy = (lazy_string_object *) string;
|
||
|
||
*addr = lazy->address;
|
||
*str_type = lazy->type;
|
||
*length = lazy->length;
|
||
*encoding = lazy->encoding ? xstrdup (lazy->encoding) : NULL;
|
||
}
|
||
|
||
|
||
|
||
static PyMethodDef lazy_string_object_methods[] = {
|
||
{ "value", stpy_convert_to_value, METH_NOARGS,
|
||
"Create a (lazy) value that contains a pointer to the string." },
|
||
{NULL} /* Sentinel */
|
||
};
|
||
|
||
|
||
static PyGetSetDef lazy_string_object_getset[] = {
|
||
{ "address", stpy_get_address, NULL, "Address of the string.", NULL },
|
||
{ "encoding", stpy_get_encoding, NULL, "Encoding of the string.", NULL },
|
||
{ "length", stpy_get_length, NULL, "Length of the string.", NULL },
|
||
{ "type", stpy_get_type, NULL, "Type associated with the string.", NULL },
|
||
{ NULL } /* Sentinel */
|
||
};
|
||
|
||
static PyTypeObject lazy_string_object_type = {
|
||
PyVarObject_HEAD_INIT (NULL, 0)
|
||
"gdb.LazyString", /*tp_name*/
|
||
sizeof (lazy_string_object), /*tp_basicsize*/
|
||
0, /*tp_itemsize*/
|
||
stpy_dealloc, /*tp_dealloc*/
|
||
0, /*tp_print*/
|
||
0, /*tp_getattr*/
|
||
0, /*tp_setattr*/
|
||
0, /*tp_compare*/
|
||
0, /*tp_repr*/
|
||
0, /*tp_as_number*/
|
||
0, /*tp_as_sequence*/
|
||
0, /*tp_as_mapping*/
|
||
0, /*tp_hash */
|
||
0, /*tp_call*/
|
||
0, /*tp_str*/
|
||
0, /*tp_getattro*/
|
||
0, /*tp_setattro*/
|
||
0, /*tp_as_buffer*/
|
||
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
||
"GDB lazy string object", /* tp_doc */
|
||
0, /* tp_traverse */
|
||
0, /* tp_clear */
|
||
0, /* tp_richcompare */
|
||
0, /* tp_weaklistoffset */
|
||
0, /* tp_iter */
|
||
0, /* tp_iternext */
|
||
lazy_string_object_methods, /* tp_methods */
|
||
0, /* tp_members */
|
||
lazy_string_object_getset /* tp_getset */
|
||
};
|