X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fpython%2Fpy-objfile.c;h=d9cf548adb35264bade3d6b6053bb7b519f3a8d4;hb=aed57c537116ae91f553ac835b3f96d1f87b3bb0;hp=2585f6256eb5fb8635478d82d203b49e5fc30a9e;hpb=61baf725eca99af2569262d10aca03dcde2698f6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c index 2585f6256e..d9cf548adb 100644 --- a/gdb/python/py-objfile.c +++ b/gdb/python/py-objfile.c @@ -1,6 +1,6 @@ /* Python interface to objfiles. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -24,6 +24,7 @@ #include "language.h" #include "build-id.h" #include "symtab.h" +#include "py-ref.h" typedef struct { @@ -78,7 +79,8 @@ objfpy_get_filename (PyObject *self, void *closure) objfile_object *obj = (objfile_object *) self; if (obj->objfile) - return host_string_to_python_string (objfile_name (obj->objfile)); + return (host_string_to_python_string (objfile_name (obj->objfile)) + .release ()); Py_RETURN_NONE; } @@ -94,7 +96,7 @@ objfpy_get_username (PyObject *self, void *closure) { const char *username = obj->objfile->original_name; - return host_string_to_python_string (username); + return host_string_to_python_string (username).release (); } Py_RETURN_NONE; @@ -114,12 +116,7 @@ objfpy_get_owner (PyObject *self, void *closure) owner = objfile->separate_debug_objfile_backlink; if (owner != NULL) - { - PyObject *result = objfile_to_objfile_object (owner); - - Py_XINCREF (result); - return result; - } + return objfile_to_objfile_object (owner).release (); Py_RETURN_NONE; } @@ -146,12 +143,10 @@ objfpy_get_build_id (PyObject *self, void *closure) if (build_id != NULL) { - char *hex_form = make_hex_string (build_id->data, build_id->size); - PyObject *result; + gdb::unique_xmalloc_ptr hex_form + (make_hex_string (build_id->data, build_id->size)); - result = host_string_to_python_string (hex_form); - xfree (hex_form); - return result; + return host_string_to_python_string (hex_form.get ()).release (); } Py_RETURN_NONE; @@ -165,12 +160,7 @@ objfpy_get_progspace (PyObject *self, void *closure) objfile_object *obj = (objfile_object *) self; if (obj->objfile) - { - PyObject *pspace = pspace_to_pspace_object (obj->objfile->pspace); - - Py_XINCREF (pspace); - return pspace; - } + return pspace_to_pspace_object (obj->objfile->pspace).release (); Py_RETURN_NONE; } @@ -227,18 +217,15 @@ objfpy_initialize (objfile_object *self) static PyObject * objfpy_new (PyTypeObject *type, PyObject *args, PyObject *keywords) { - objfile_object *self = (objfile_object *) type->tp_alloc (type, 0); + gdbpy_ref self ((objfile_object *) type->tp_alloc (type, 0)); - if (self) + if (self != NULL) { - if (!objfpy_initialize (self)) - { - Py_DECREF (self); - return NULL; - } + if (!objfpy_initialize (self.get ())) + return NULL; } - return (PyObject *) self; + return (PyObject *) self.release (); } PyObject * @@ -253,7 +240,6 @@ objfpy_get_printers (PyObject *o, void *ignore) static int objfpy_set_printers (PyObject *o, PyObject *value, void *ignore) { - PyObject *tmp; objfile_object *self = (objfile_object *) o; if (! value) @@ -271,10 +257,9 @@ objfpy_set_printers (PyObject *o, PyObject *value, void *ignore) } /* Take care in case the LHS and RHS are related somehow. */ - tmp = self->printers; + gdbpy_ref<> tmp (self->printers); Py_INCREF (value); self->printers = value; - Py_XDECREF (tmp); return 0; } @@ -294,7 +279,6 @@ objfpy_get_frame_filters (PyObject *o, void *ignore) static int objfpy_set_frame_filters (PyObject *o, PyObject *filters, void *ignore) { - PyObject *tmp; objfile_object *self = (objfile_object *) o; if (! filters) @@ -312,10 +296,9 @@ objfpy_set_frame_filters (PyObject *o, PyObject *filters, void *ignore) } /* Take care in case the LHS and RHS are related somehow. */ - tmp = self->frame_filters; + gdbpy_ref<> tmp (self->frame_filters); Py_INCREF (filters); self->frame_filters = filters; - Py_XDECREF (tmp); return 0; } @@ -336,7 +319,6 @@ objfpy_get_frame_unwinders (PyObject *o, void *ignore) static int objfpy_set_frame_unwinders (PyObject *o, PyObject *unwinders, void *ignore) { - PyObject *tmp; objfile_object *self = (objfile_object *) o; if (!unwinders) @@ -354,10 +336,9 @@ objfpy_set_frame_unwinders (PyObject *o, PyObject *unwinders, void *ignore) } /* Take care in case the LHS and RHS are related somehow. */ - tmp = self->frame_unwinders; + gdbpy_ref<> tmp (self->frame_unwinders); Py_INCREF (unwinders); self->frame_unwinders = unwinders; - Py_XDECREF (tmp); return 0; } @@ -389,7 +370,6 @@ objfpy_get_xmethods (PyObject *o, void *ignore) static int objfpy_set_type_printers (PyObject *o, PyObject *value, void *ignore) { - PyObject *tmp; objfile_object *self = (objfile_object *) o; if (! value) @@ -407,10 +387,9 @@ objfpy_set_type_printers (PyObject *o, PyObject *value, void *ignore) } /* Take care in case the LHS and RHS are related somehow. */ - tmp = self->type_printers; + gdbpy_ref<> tmp (self->type_printers); Py_INCREF (value); self->type_printers = value; - Py_XDECREF (tmp); return 0; } @@ -434,20 +413,20 @@ objfpy_is_valid (PyObject *self, PyObject *args) static PyObject * objfpy_add_separate_debug_file (PyObject *self, PyObject *args, PyObject *kw) { - static char *keywords[] = { "file_name", NULL }; + static const char *keywords[] = { "file_name", NULL }; objfile_object *obj = (objfile_object *) self; const char *file_name; OBJFPY_REQUIRE_VALID (obj); - if (!PyArg_ParseTupleAndKeywords (args, kw, "s", keywords, &file_name)) + if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "s", keywords, &file_name)) return NULL; TRY { - bfd *abfd = symfile_bfd_open (file_name); + gdb_bfd_ref_ptr abfd (symfile_bfd_open (file_name)); - symbol_file_add_separate (abfd, file_name, 0, obj->objfile); + symbol_file_add_separate (abfd.get (), file_name, 0, obj->objfile); } CATCH (except, RETURN_MASK_ALL) { @@ -458,6 +437,21 @@ objfpy_add_separate_debug_file (PyObject *self, PyObject *args, PyObject *kw) Py_RETURN_NONE; } +/* Implement repr() for gdb.Objfile. */ + +static PyObject * +objfpy_repr (PyObject *self_) +{ + objfile_object *self = (objfile_object *) self_; + objfile *obj = self->objfile; + + if (obj == nullptr) + return PyString_FromString (""); + + return PyString_FromFormat ("", + objfile_filename (obj)); +} + /* Subroutine of gdbpy_lookup_objfile_by_build_id to simplify it. Return non-zero if STRING is a potentially valid build id. */ @@ -507,9 +501,7 @@ objfpy_build_id_matches (const struct bfd_build_id *build_id, static struct objfile * objfpy_lookup_objfile_by_name (const char *name) { - struct objfile *objfile; - - ALL_OBJFILES (objfile) + for (objfile *objfile : all_objfiles (current_program_space)) { const char *filename; @@ -535,9 +527,7 @@ objfpy_lookup_objfile_by_name (const char *name) static struct objfile * objfpy_lookup_objfile_by_build_id (const char *build_id) { - struct objfile *objfile; - - ALL_OBJFILES (objfile) + for (objfile *objfile : all_objfiles (current_program_space)) { const struct bfd_build_id *obfd_build_id; @@ -561,14 +551,14 @@ objfpy_lookup_objfile_by_build_id (const char *build_id) PyObject * gdbpy_lookup_objfile (PyObject *self, PyObject *args, PyObject *kw) { - static char *keywords[] = { "name", "by_build_id", NULL }; + static const char *keywords[] = { "name", "by_build_id", NULL }; const char *name; PyObject *by_build_id_obj = NULL; int by_build_id; struct objfile *objfile; - if (! PyArg_ParseTupleAndKeywords (args, kw, "s|O!", keywords, - &name, &PyBool_Type, &by_build_id_obj)) + if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "s|O!", keywords, + &name, &PyBool_Type, &by_build_id_obj)) return NULL; by_build_id = 0; @@ -594,12 +584,7 @@ gdbpy_lookup_objfile (PyObject *self, PyObject *args, PyObject *kw) objfile = objfpy_lookup_objfile_by_name (name); if (objfile != NULL) - { - PyObject *result = objfile_to_objfile_object (objfile); - - Py_XINCREF (result); - return result; - } + return objfile_to_objfile_object (objfile).release (); PyErr_SetString (PyExc_ValueError, _("Objfile not found.")); return NULL; @@ -612,43 +597,36 @@ gdbpy_lookup_objfile (PyObject *self, PyObject *args, PyObject *kw) static void py_free_objfile (struct objfile *objfile, void *datum) { - struct cleanup *cleanup; - objfile_object *object = (objfile_object *) datum; - - cleanup = ensure_python_env (get_objfile_arch (objfile), current_language); + gdbpy_enter enter_py (get_objfile_arch (objfile), current_language); + gdbpy_ref object ((objfile_object *) datum); object->objfile = NULL; - Py_DECREF ((PyObject *) object); - do_cleanups (cleanup); } -/* Return a borrowed reference to the Python object of type Objfile +/* Return a new reference to the Python object of type Objfile representing OBJFILE. If the object has already been created, return it. Otherwise, create it. Return NULL and set the Python error on failure. */ -PyObject * +gdbpy_ref<> objfile_to_objfile_object (struct objfile *objfile) { - objfile_object *object; - - object = (objfile_object *) objfile_data (objfile, objfpy_objfile_data_key); - if (!object) + PyObject *result + = ((PyObject *) objfile_data (objfile, objfpy_objfile_data_key)); + if (result == NULL) { - object = PyObject_New (objfile_object, &objfile_object_type); - if (object) - { - if (!objfpy_initialize (object)) - { - Py_DECREF (object); - return NULL; - } - - object->objfile = objfile; - set_objfile_data (objfile, objfpy_objfile_data_key, object); - } + gdbpy_ref object + ((objfile_object *) PyObject_New (objfile_object, &objfile_object_type)); + if (object == NULL) + return NULL; + if (!objfpy_initialize (object.get ())) + return NULL; + + object->objfile = objfile; + set_objfile_data (objfile, objfpy_objfile_data_key, object.get ()); + result = (PyObject *) object.release (); } - return (PyObject *) object; + return gdbpy_ref<>::new_reference (result); } int @@ -680,7 +658,7 @@ Add FILE_NAME to the list of files containing debug info for the objfile." }, { NULL } }; -static PyGetSetDef objfile_getset[] = +static gdb_PyGetSetDef objfile_getset[] = { { "__dict__", gdb_py_generic_dict, NULL, "The __dict__ for this objfile.", &objfile_object_type }, @@ -719,7 +697,7 @@ PyTypeObject objfile_object_type = 0, /*tp_getattr*/ 0, /*tp_setattr*/ 0, /*tp_compare*/ - 0, /*tp_repr*/ + objfpy_repr, /*tp_repr*/ 0, /*tp_as_number*/ 0, /*tp_as_sequence*/ 0, /*tp_as_mapping*/