mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-05-24 18:57:01 +08:00
Add support for Python 3.
* 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.
This commit is contained in:
@ -454,9 +454,14 @@ infpy_read_memory (PyObject *self, PyObject *args, PyObject *kw)
|
||||
membuf_obj->addr = addr;
|
||||
membuf_obj->length = length;
|
||||
|
||||
#ifdef IS_PY3K
|
||||
result = PyMemoryView_FromObject ((PyObject *) membuf_obj);
|
||||
#else
|
||||
result = PyBuffer_FromReadWriteObject ((PyObject *) membuf_obj, 0,
|
||||
Py_END_OF_BUFFER);
|
||||
#endif
|
||||
Py_DECREF (membuf_obj);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -476,12 +481,22 @@ infpy_write_memory (PyObject *self, PyObject *args, PyObject *kw)
|
||||
PyObject *addr_obj, *length_obj = NULL;
|
||||
volatile struct gdb_exception except;
|
||||
static char *keywords[] = { "address", "buffer", "length", NULL };
|
||||
#ifdef IS_PY3K
|
||||
Py_buffer pybuf;
|
||||
|
||||
if (! PyArg_ParseTupleAndKeywords (args, kw, "Os*|O", keywords,
|
||||
&addr_obj, &pybuf,
|
||||
&length_obj))
|
||||
return NULL;
|
||||
|
||||
buffer = pybuf.buf;
|
||||
buf_len = pybuf.len;
|
||||
#else
|
||||
if (! PyArg_ParseTupleAndKeywords (args, kw, "Os#|O", keywords,
|
||||
&addr_obj, &buffer, &buf_len,
|
||||
&length_obj))
|
||||
return NULL;
|
||||
#endif
|
||||
|
||||
TRY_CATCH (except, RETURN_MASK_ALL)
|
||||
{
|
||||
@ -500,8 +515,12 @@ infpy_write_memory (PyObject *self, PyObject *args, PyObject *kw)
|
||||
}
|
||||
write_memory_with_notification (addr, buffer, length);
|
||||
}
|
||||
#ifdef IS_PY3K
|
||||
PyBuffer_Release (&pybuf);
|
||||
#endif
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
|
||||
|
||||
if (error)
|
||||
return NULL;
|
||||
|
||||
@ -513,7 +532,7 @@ static void
|
||||
mbpy_dealloc (PyObject *self)
|
||||
{
|
||||
xfree (((membuf_object *) self)->buffer);
|
||||
self->ob_type->tp_free (self);
|
||||
Py_TYPE (self)->tp_free (self);
|
||||
}
|
||||
|
||||
/* Return a description of the Membuf object. */
|
||||
@ -528,6 +547,24 @@ which is %s bytes long."),
|
||||
pulongest (membuf_obj->length));
|
||||
}
|
||||
|
||||
#ifdef IS_PY3K
|
||||
|
||||
static int
|
||||
get_buffer (PyObject *self, Py_buffer *buf, int flags)
|
||||
{
|
||||
membuf_object *membuf_obj = (membuf_object *) self;
|
||||
int ret;
|
||||
|
||||
ret = PyBuffer_FillInfo (buf, self, membuf_obj->buffer,
|
||||
membuf_obj->length, 0,
|
||||
PyBUF_CONTIG);
|
||||
buf->format = "c";
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
static Py_ssize_t
|
||||
get_read_buffer (PyObject *self, Py_ssize_t segment, void **ptrptr)
|
||||
{
|
||||
@ -572,6 +609,8 @@ get_char_buffer (PyObject *self, Py_ssize_t segment, char **ptrptr)
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif /* IS_PY3K */
|
||||
|
||||
/* Implementation of
|
||||
gdb.search_memory (address, length, pattern). ADDRESS is the
|
||||
address to start the search. LENGTH specifies the scope of the
|
||||
@ -585,39 +624,29 @@ infpy_search_memory (PyObject *self, PyObject *args, PyObject *kw)
|
||||
{
|
||||
CORE_ADDR start_addr, length;
|
||||
static char *keywords[] = { "address", "length", "pattern", NULL };
|
||||
PyObject *pattern, *start_addr_obj, *length_obj;
|
||||
PyObject *start_addr_obj, *length_obj;
|
||||
volatile struct gdb_exception except;
|
||||
Py_ssize_t pattern_size;
|
||||
const void *buffer;
|
||||
CORE_ADDR found_addr;
|
||||
int found = 0;
|
||||
#ifdef IS_PY3K
|
||||
Py_buffer pybuf;
|
||||
|
||||
if (! PyArg_ParseTupleAndKeywords (args, kw, "OOO", keywords,
|
||||
if (! PyArg_ParseTupleAndKeywords (args, kw, "OOs*", keywords,
|
||||
&start_addr_obj, &length_obj,
|
||||
&pybuf))
|
||||
return NULL;
|
||||
|
||||
buffer = pybuf.buf;
|
||||
pattern_size = pybuf.len;
|
||||
#else
|
||||
PyObject *pattern;
|
||||
|
||||
if (! PyArg_ParseTupleAndKeywords (args, kw, "OOO", keywords,
|
||||
&start_addr_obj, &length_obj,
|
||||
&pattern))
|
||||
return NULL;
|
||||
|
||||
if (get_addr_from_python (start_addr_obj, &start_addr)
|
||||
&& get_addr_from_python (length_obj, &length))
|
||||
{
|
||||
if (!length)
|
||||
{
|
||||
PyErr_SetString (PyExc_ValueError,
|
||||
_("Search range is empty."));
|
||||
return NULL;
|
||||
}
|
||||
/* Watch for overflows. */
|
||||
else if (length > CORE_ADDR_MAX
|
||||
|| (start_addr + length - 1) < start_addr)
|
||||
{
|
||||
PyErr_SetString (PyExc_ValueError,
|
||||
_("The search range is too large."));
|
||||
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
else
|
||||
return NULL;
|
||||
return NULL;
|
||||
|
||||
if (!PyObject_CheckReadBuffer (pattern))
|
||||
{
|
||||
@ -629,6 +658,36 @@ infpy_search_memory (PyObject *self, PyObject *args, PyObject *kw)
|
||||
|
||||
if (PyObject_AsReadBuffer (pattern, &buffer, &pattern_size) == -1)
|
||||
return NULL;
|
||||
#endif
|
||||
|
||||
if (get_addr_from_python (start_addr_obj, &start_addr)
|
||||
&& get_addr_from_python (length_obj, &length))
|
||||
{
|
||||
if (!length)
|
||||
{
|
||||
PyErr_SetString (PyExc_ValueError,
|
||||
_("Search range is empty."));
|
||||
|
||||
#ifdef IS_PY3K
|
||||
PyBuffer_Release (&pybuf);
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
/* Watch for overflows. */
|
||||
else if (length > CORE_ADDR_MAX
|
||||
|| (start_addr + length - 1) < start_addr)
|
||||
{
|
||||
PyErr_SetString (PyExc_ValueError,
|
||||
_("The search range is too large."));
|
||||
|
||||
#ifdef IS_PY3K
|
||||
PyBuffer_Release (&pybuf);
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
else
|
||||
return NULL;
|
||||
|
||||
TRY_CATCH (except, RETURN_MASK_ALL)
|
||||
{
|
||||
@ -638,6 +697,10 @@ infpy_search_memory (PyObject *self, PyObject *args, PyObject *kw)
|
||||
}
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
|
||||
#ifdef IS_PY3K
|
||||
PyBuffer_Release (&pybuf);
|
||||
#endif
|
||||
|
||||
if (found)
|
||||
return PyLong_FromLong (found_addr);
|
||||
else
|
||||
@ -777,8 +840,7 @@ Return a long with the address of a match, or None." },
|
||||
|
||||
static PyTypeObject inferior_object_type =
|
||||
{
|
||||
PyObject_HEAD_INIT (NULL)
|
||||
0, /* ob_size */
|
||||
PyVarObject_HEAD_INIT (NULL, 0)
|
||||
"gdb.Inferior", /* tp_name */
|
||||
sizeof (inferior_object), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
@ -817,6 +879,15 @@ static PyTypeObject inferior_object_type =
|
||||
0 /* tp_alloc */
|
||||
};
|
||||
|
||||
#ifdef IS_PY3K
|
||||
|
||||
static PyBufferProcs buffer_procs =
|
||||
{
|
||||
get_buffer
|
||||
};
|
||||
|
||||
#else
|
||||
|
||||
/* Python doesn't provide a decent way to get compatibility here. */
|
||||
#if HAVE_LIBPYTHON2_4
|
||||
#define CHARBUFFERPROC_NAME getcharbufferproc
|
||||
@ -832,10 +903,10 @@ static PyBufferProcs buffer_procs = {
|
||||
Python 2.5. */
|
||||
(CHARBUFFERPROC_NAME) get_char_buffer
|
||||
};
|
||||
#endif /* IS_PY3K */
|
||||
|
||||
static PyTypeObject membuf_object_type = {
|
||||
PyObject_HEAD_INIT (NULL)
|
||||
0, /*ob_size*/
|
||||
PyVarObject_HEAD_INIT (NULL, 0)
|
||||
"gdb.Membuf", /*tp_name*/
|
||||
sizeof (membuf_object), /*tp_basicsize*/
|
||||
0, /*tp_itemsize*/
|
||||
|
Reference in New Issue
Block a user