FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return gdbpy_ref from gdb_py_object_from_*longest

Browse source 
This changes gdb_py_object_from_longest and
gdb_py_object_from_ulongest to return a gdbpy_ref rather than a
PyObject*.

gdb/ChangeLog
2018-11-04  Tom Tromey  <tom@tromey.com>

	* python/python-internal.h (gdb_py_object_from_longest)
	(gdb_py_object_from_ulongest): Return gdbpy_ref.
	* python/py-value.c (valpy_int): Update.
	* python/py-utils.c (gdb_py_object_from_longest): Return
	gdbpy_ref.
	(gdb_py_object_from_ulongest): Likewise.
	* python/py-type.c (typy_get_alignof): Update.
	* python/py-linetable.c (ltpy_get_all_source_lines)
	(ltpy_entry_get_line, ltpy_entry_get_pc): Update.
	* python/py-block.c (blpy_get_start, blpy_get_end): Update.
This commit is contained in:
Tom Tromey 2018-10-24 16:33:23 -06:00
parent 9446bd8ad6
commit 12dfa12a3c
7 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gdb/python/py-utils.c
View file

@ -295,47 +295,47 @@ get_addr_from_python (PyObject *obj, CORE_ADDR *addr)
/* Convert a LONGEST to the appropriate Python object -- either an
integer object or a long object, depending on its value. */
PyObject *
gdbpy_ref<>
gdb_py_object_from_longest (LONGEST l)
{
#ifdef IS_PY3K
if (sizeof (l) > sizeof (long))
return PyLong_FromLongLong (l);
return PyLong_FromLong (l);
return gdbpy_ref<> (PyLong_FromLongLong (l));
return gdbpy_ref<> (PyLong_FromLong (l));
#else
#ifdef HAVE_LONG_LONG /* Defined by Python. */
/* If we have 'long long', and the value overflows a 'long', use a
Python Long; otherwise use a Python Int. */
if (sizeof (l) > sizeof (long)
&& (l > PyInt_GetMax () || l < (- (LONGEST) PyInt_GetMax ()) - 1))
return PyLong_FromLongLong (l);
return gdbpy_ref<> (PyLong_FromLongLong (l));
#endif
return PyInt_FromLong (l);
return gdbpy_ref<> (PyInt_FromLong (l));
#endif
}
/* Convert a ULONGEST to the appropriate Python object -- either an
integer object or a long object, depending on its value. */
PyObject *
gdbpy_ref<>
gdb_py_object_from_ulongest (ULONGEST l)
{
#ifdef IS_PY3K
if (sizeof (l) > sizeof (unsigned long))
return PyLong_FromUnsignedLongLong (l);
return PyLong_FromUnsignedLong (l);
return gdbpy_ref<> (PyLong_FromUnsignedLongLong (l));
return gdbpy_ref<> (PyLong_FromUnsignedLong (l));
#else
#ifdef HAVE_LONG_LONG /* Defined by Python. */
/* If we have 'long long', and the value overflows a 'long', use a
Python Long; otherwise use a Python Int. */
if (sizeof (l) > sizeof (unsigned long) && l > PyInt_GetMax ())
return PyLong_FromUnsignedLongLong (l);
return gdbpy_ref<> (PyLong_FromUnsignedLongLong (l));
#endif
if (l > PyInt_GetMax ())
return PyLong_FromUnsignedLong (l);
return gdbpy_ref<> (PyLong_FromUnsignedLong (l));
return PyInt_FromLong (l);
return gdbpy_ref<> (PyInt_FromLong (l));
#endif
}