Accept gdb.Value in more Python APIs

PR python/27000 points out that gdb.block_for_pc will accept a Python
integer, but not a gdb.Value.  This patch corrects this oversight.

I looked at all uses of GDB_PY_LLU_ARG and fixed these up to use
get_addr_from_python instead.  I also looked at uses of GDB_PY_LL_ARG,
but those seemed relatively unlikely to be useful with a gdb.Value, so
I didn't change them.  My thinking here is that a Value will typically
come from inferior memory, and something like a line number is not too
likely to be found this way.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27000

2 files changed, 26 insertions, 31 deletions

diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c
index d8098a2..594e4ed 100644
--- a/gdb/python/py-arch.c
+++ b/gdb/python/py-arch.c
@@ -122,39 +122,26 @@ static PyObject *
 archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
 {
   static const char *keywords[] = { "start_pc", "end_pc", "count", NULL };
-  CORE_ADDR start, end = 0;
+  CORE_ADDR start = 0, end = 0;
   CORE_ADDR pc;
-  gdb_py_ulongest start_temp;
   long count = 0, i;
-  PyObject *end_obj = NULL, *count_obj = NULL;
+  PyObject *start_obj = nullptr, *end_obj = nullptr, *count_obj = nullptr;
   struct gdbarch *gdbarch = NULL;
 
   ARCHPY_REQUIRE_VALID (self, gdbarch);
 
-  if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, GDB_PY_LLU_ARG "|OO",
-					keywords, &start_temp, &end_obj,
+  if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "O|OO",
+					keywords, &start_obj, &end_obj,
 					&count_obj))
     return NULL;
 
-  start = start_temp;
-  if (end_obj)
-    {
-      /* 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.  */
-      if (PyLong_Check (end_obj))
-	end = PyLong_AsUnsignedLongLong (end_obj);
-      else
-	{
-	  PyErr_SetString (PyExc_TypeError,
-			   _("Argument 'end_pc' should be a (long) integer."));
+  if (get_addr_from_python (start_obj, &start) < 0)
+    return nullptr;
 
-	  return NULL;
-	}
+  if (end_obj != nullptr)
+    {
+      if (get_addr_from_python (end_obj, &end) < 0)
+	return nullptr;
 
       if (end < start)
 	{
diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c
index a9abfb4..5ec5986 100644
--- a/gdb/python/py-progspace.c
+++ b/gdb/python/py-progspace.c
@@ -351,13 +351,17 @@ pspy_get_objfiles (PyObject *self_, PyObject *args)
 static PyObject *
 pspy_solib_name (PyObject *o, PyObject *args)
 {
-  gdb_py_ulongest pc;
+  CORE_ADDR pc;
+  PyObject *pc_obj;
+
   pspace_object *self = (pspace_object *) o;
 
   PSPY_REQUIRE_VALID (self);
 
-  if (!PyArg_ParseTuple (args, GDB_PY_LLU_ARG, &pc))
+  if (!PyArg_ParseTuple (args, "O", &pc_obj))
     return NULL;
+  if (get_addr_from_python (pc_obj, &pc) < 0)
+    return nullptr;
 
   const char *soname = solib_name_from_address (self->pspace, pc);
   if (soname == nullptr)
@@ -371,14 +375,17 @@ static PyObject *
 pspy_block_for_pc (PyObject *o, PyObject *args)
 {
   pspace_object *self = (pspace_object *) o;
-  gdb_py_ulongest pc;
+  CORE_ADDR pc;
+  PyObject *pc_obj;
   const struct block *block = NULL;
   struct compunit_symtab *cust = NULL;
 
   PSPY_REQUIRE_VALID (self);
 
-  if (!PyArg_ParseTuple (args, GDB_PY_LLU_ARG, &pc))
+  if (!PyArg_ParseTuple (args, "O", &pc_obj))
     return NULL;
+  if (get_addr_from_python (pc_obj, &pc) < 0)
+    return nullptr;
 
   try
     {
@@ -410,24 +417,25 @@ pspy_block_for_pc (PyObject *o, PyObject *args)
 static PyObject *
 pspy_find_pc_line (PyObject *o, PyObject *args)
 {
-  gdb_py_ulongest pc_llu;
+  CORE_ADDR pc;
   PyObject *result = NULL; /* init for gcc -Wall */
+  PyObject *pc_obj;
   pspace_object *self = (pspace_object *) o;
 
   PSPY_REQUIRE_VALID (self);
 
-  if (!PyArg_ParseTuple (args, GDB_PY_LLU_ARG, &pc_llu))
+  if (!PyArg_ParseTuple (args, "O", &pc_obj))
     return NULL;
+  if (get_addr_from_python (pc_obj, &pc) < 0)
+    return nullptr;
 
   try
     {
       struct symtab_and_line sal;
-      CORE_ADDR pc;
       scoped_restore_current_program_space saver;
 
       set_current_program_space (self->pspace);
 
-      pc = (CORE_ADDR) pc_llu;
       sal = find_pc_line (pc, 0);
       result = symtab_and_line_to_sal_object (sal);
     }