gdb/python: Return None from Progspace.block_for_pc on error

[deliverable/binutils-gdb.git] / gdb / python / py-arch.c

diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c
index 0d32097bd0636de57afec39cabba8aa0ca88927c..0799186ca5fda2aa3c119711768fa329a2445b77 100644 (file)
--- a/gdb/python/py-arch.c
+++ b/gdb/python/py-arch.c
@@ -1,6 +1,6 @@
 /* Python interface to architecture
 
-   Copyright (C) 2013-2017 Free Software Foundation, Inc.
+   Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -96,14 +96,11 @@ archpy_name (PyObject *self, PyObject *args)
 {
   struct gdbarch *gdbarch = NULL;
   const char *name;
-  PyObject *py_name;
 
   ARCHPY_REQUIRE_VALID (self, gdbarch);
 
   name = (gdbarch_bfd_arch_info (gdbarch))->printable_name;
-  py_name = PyString_FromString (name);
-
-  return py_name;
+  return PyString_FromString (name);
 }
 
 /* Implementation of
@@ -115,18 +112,19 @@ archpy_name (PyObject *self, PyObject *args)
 static PyObject *
 archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
 {
-  static char *keywords[] = { "start_pc", "end_pc", "count", NULL };
+  static const char *keywords[] = { "start_pc", "end_pc", "count", NULL };
   CORE_ADDR start, end = 0;
   CORE_ADDR pc;
   gdb_py_ulongest start_temp;
   long count = 0, i;
-  PyObject *result_list, *end_obj = NULL, *count_obj = NULL;
+  PyObject *end_obj = NULL, *count_obj = NULL;
   struct gdbarch *gdbarch = NULL;
 
   ARCHPY_REQUIRE_VALID (self, gdbarch);
 
-  if (!PyArg_ParseTupleAndKeywords (args, kw, GDB_PY_LLU_ARG "|OO", keywords,
-                                    &start_temp, &end_obj, &count_obj))
+  if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, GDB_PY_LLU_ARG "|OO",
+                                       keywords, &start_temp, &end_obj,
+                                       &count_obj))
     return NULL;
 
   start = start_temp;
@@ -149,8 +147,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
 #endif
       else
         {
-          Py_DECREF (end_obj);
-          Py_XDECREF (count_obj);
           PyErr_SetString (PyExc_TypeError,
                            _("Argument 'end_pc' should be a (long) integer."));
 
@@ -159,8 +155,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
 
       if (end < start)
         {
-          Py_DECREF (end_obj);
-          Py_XDECREF (count_obj);
           PyErr_SetString (PyExc_ValueError,
                            _("Argument 'end_pc' should be greater than or "
                              "equal to the argument 'start_pc'."));
@@ -173,8 +167,6 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
       count = PyInt_AsLong (count_obj);
       if (PyErr_Occurred () || count < 0)
         {
-          Py_DECREF (count_obj);
-          Py_XDECREF (end_obj);
           PyErr_SetString (PyExc_TypeError,
                            _("Argument 'count' should be an non-negative "
                              "integer."));
@@ -183,7 +175,7 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
         }
     }
 
-  result_list = PyList_New (0);
+  gdbpy_ref<> result_list (PyList_New (0));
   if (result_list == NULL)
     return NULL;
 
@@ -198,63 +190,40 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
        || (end_obj == NULL && count_obj == NULL && pc == start);)
     {
       int insn_len = 0;
-      struct ui_file *memfile = mem_fileopen ();
-      PyObject *insn_dict = PyDict_New ();
+      gdbpy_ref<> insn_dict (PyDict_New ());
 
       if (insn_dict == NULL)
-        {
-          Py_DECREF (result_list);
-          ui_file_delete (memfile);
+       return NULL;
+      if (PyList_Append (result_list.get (), insn_dict.get ()))
+       return NULL;  /* PyList_Append Sets the exception.  */
 
-          return NULL;
-        }
-      if (PyList_Append (result_list, insn_dict))
-        {
-          Py_DECREF (result_list);
-          Py_DECREF (insn_dict);
-          ui_file_delete (memfile);
-
-          return NULL;  /* PyList_Append Sets the exception.  */
-        }
+      string_file stb;
 
-      TRY
+      try
         {
-          insn_len = gdb_print_insn (gdbarch, pc, memfile, NULL);
+          insn_len = gdb_print_insn (gdbarch, pc, &stb, NULL);
         }
-      CATCH (except, RETURN_MASK_ALL)
+      catch (const gdb_exception &except)
         {
-          Py_DECREF (result_list);
-          ui_file_delete (memfile);
-
          gdbpy_convert_exception (except);
          return NULL;
         }
-      END_CATCH
-
-      std::string as = ui_file_as_string (memfile);
 
-      if (PyDict_SetItemString (insn_dict, "addr",
+      if (PyDict_SetItemString (insn_dict.get (), "addr",
                                 gdb_py_long_from_ulongest (pc))
-          || PyDict_SetItemString (insn_dict, "asm",
-                                   PyString_FromString (!as.empty ()
-                                                       ? as.c_str ()
+          || PyDict_SetItemString (insn_dict.get (), "asm",
+                                   PyString_FromString (!stb.empty ()
+                                                       ? stb.c_str ()
                                                        : "<unknown>"))
-          || PyDict_SetItemString (insn_dict, "length",
+          || PyDict_SetItemString (insn_dict.get (), "length",
                                    PyInt_FromLong (insn_len)))
-        {
-          Py_DECREF (result_list);
-
-          ui_file_delete (memfile);
-
-          return NULL;
-        }
+       return NULL;
 
       pc += insn_len;
       i++;
-      ui_file_delete (memfile);
     }
 
-  return result_list;
+  return result_list.release ();
 }
 
 /* Initializes the Architecture class in the gdb module.  */