mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-06 12:09:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't use gdb_py_long_from_longest

Browse Source 
Change the Python layer to avoid gdb_py_long_from_longest, and remove
the defines.

gdb/ChangeLog
2020-09-15  Tom Tromey  <tromey@adacore.com>

	* python/python-internal.h (gdb_py_long_from_longest): Remove
	defines.
	* python/py-value.c (valpy_long): Use gdb_py_object_from_longest.
	* python/py-type.c (convert_field, typy_get_sizeof): Use
	gdb_py_object_from_longest.
	* python/py-record-btrace.c (btpy_list_index): Use
	gdb_py_object_from_longest.
This commit is contained in:
Tom Tromey 2020-09-15 11:08:56 -06:00
parent 3743107465
commit 4bde49dc81
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ChangeLog
View File

@ -1,3 +1,13 @@
2020-09-15 Tom Tromey <tromey@adacore.com>
* python/python-internal.h (gdb_py_long_from_longest): Remove
defines.
* python/py-value.c (valpy_long): Use gdb_py_object_from_longest.
* python/py-type.c (convert_field, typy_get_sizeof): Use
gdb_py_object_from_longest.
* python/py-record-btrace.c (btpy_list_index): Use
gdb_py_object_from_longest.
2020-09-15 Tom Tromey <tromey@adacore.com>
* python/python-internal.h (PyInt_FromSsize_t): Remove define.

2
gdb/python/py-record-btrace.c
View File

@ -556,7 +556,7 @@ btpy_list_index (PyObject *self, PyObject *value)
if (index < 0)
return PyErr_Format (PyExc_ValueError, _("Not in list."));
return gdb_py_long_from_longest (index);
return gdb_py_object_from_longest (index).release ();
}
/* Implementation of BtraceList.count (self, value) -> int. */

8
gdb/python/py-type.c
View File

@ -183,8 +183,7 @@ convert_field (struct type *type, int field)
if (type->code () == TYPE_CODE_ENUM)
{
arg.reset (gdb_py_long_from_longest (TYPE_FIELD_ENUMVAL (type,
field)));
arg = gdb_py_object_from_longest (TYPE_FIELD_ENUMVAL (type, field));
attrstring = "enumval";
}
else
@ -192,8 +191,7 @@ convert_field (struct type *type, int field)
if (TYPE_FIELD_LOC_KIND (type, field) == FIELD_LOC_KIND_DWARF_BLOCK)
arg = gdbpy_ref<>::new_reference (Py_None);
else
arg.reset (gdb_py_long_from_longest (TYPE_FIELD_BITPOS (type,
field)));
arg = gdb_py_object_from_longest (TYPE_FIELD_BITPOS (type, field));
attrstring = "bitpos";
}
@ -725,7 +723,7 @@ typy_get_sizeof (PyObject *self, void *closure)
if (size_varies)
Py_RETURN_NONE;
return gdb_py_long_from_longest (TYPE_LENGTH (type));
return gdb_py_object_from_longest (TYPE_LENGTH (type)).release ();
}
/* Return the alignment of the type represented by SELF, in bytes. */

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

@ -1733,7 +1733,7 @@ valpy_long (PyObject *self)
if (type->is_unsigned ())
return gdb_py_long_from_ulongest (l);
else
return gdb_py_long_from_longest (l);
return gdb_py_object_from_longest (l).release ();
}
/* Implements conversion to float. */

2
gdb/python/python-internal.h
View File

@ -126,7 +126,6 @@
#define GDB_PY_LLU_ARG "K"
typedef PY_LONG_LONG gdb_py_longest;
typedef unsigned PY_LONG_LONG gdb_py_ulongest;
#define gdb_py_long_from_longest PyLong_FromLongLong
#define gdb_py_long_from_ulongest PyLong_FromUnsignedLongLong
#define gdb_py_long_as_ulongest PyLong_AsUnsignedLongLong
@ -136,7 +135,6 @@ typedef unsigned PY_LONG_LONG gdb_py_ulongest;
#define GDB_PY_LLU_ARG "K"
typedef long gdb_py_longest;
typedef unsigned long gdb_py_ulongest;
#define gdb_py_long_from_longest PyLong_FromLong
#define gdb_py_long_from_ulongest PyLong_FromUnsignedLong
#define gdb_py_long_as_ulongest PyLong_AsUnsignedLong