espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-05-24 02:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

2013-10-03 Phil Muldoon <pmuldoon@redhat.com>

Browse Source 
* python/py-value.c (convert_value_from_python): Move PyInt_Check
	conversion logic to occur after PyLong_Check.  Comment on order
	change significance.
	* python/py-arch.c (archpy_disassemble): Comment on order of
	conversion for integers and longs.
This commit is contained in:
Phil Muldoon
2013-10-03 14:43:32 +00:00
parent 8ae377e842
commit 06ab7b19e0
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gdb/python/py-value.c
View File

@ -1265,13 +1265,13 @@ convert_value_from_python (PyObject *obj)
if (cmp >= 0)
value = value_from_longest (builtin_type_pybool, cmp);
}
else if (PyInt_Check (obj))
{
long l = PyInt_AsLong (obj);
if (! PyErr_Occurred ())
value = value_from_longest (builtin_type_pyint, l);
}
/* Make a long logic check first. In Python 3.x, internally,
all integers are represented as longs. In Python 2.x, there
is still a differentiation internally between a PyInt and a
PyLong. Explicitly do this long check conversion first. In
GDB, for Python 3.x, we #ifdef PyInt = PyLong. This check has
to be done first to ensure we do not lose information in the
conversion process. */
else if (PyLong_Check (obj))
{
LONGEST l = PyLong_AsLongLong (obj);
@ -1306,6 +1306,13 @@ convert_value_from_python (PyObject *obj)
else
value = value_from_longest (builtin_type_pylong, l);
}
else if (PyInt_Check (obj))
{
long l = PyInt_AsLong (obj);
if (! PyErr_Occurred ())
value = value_from_longest (builtin_type_pyint, l);
}
else if (PyFloat_Check (obj))
{
double d = PyFloat_AsDouble (obj);