/* Python interface to objfiles.
- Copyright (C) 2008-2018 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This file is part of GDB.
#include "language.h"
#include "build-id.h"
#include "symtab.h"
-#include "py-ref.h"
typedef struct
{
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;
}
{
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;
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;
}
OBJFPY_REQUIRE_VALID (obj);
- TRY
+ try
{
build_id = build_id_bfd_get (objfile->obfd);
}
- CATCH (except, RETURN_MASK_ALL)
+ catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
- END_CATCH
if (build_id != NULL)
{
- char *hex_form = make_hex_string (build_id->data, build_id->size);
- PyObject *result;
+ gdb::unique_xmalloc_ptr<char> 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;
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;
}
static int
objfpy_set_printers (PyObject *o, PyObject *value, void *ignore)
{
- PyObject *tmp;
objfile_object *self = (objfile_object *) o;
if (! value)
}
/* 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;
}
static int
objfpy_set_frame_filters (PyObject *o, PyObject *filters, void *ignore)
{
- PyObject *tmp;
objfile_object *self = (objfile_object *) o;
if (! filters)
}
/* 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;
}
static int
objfpy_set_frame_unwinders (PyObject *o, PyObject *unwinders, void *ignore)
{
- PyObject *tmp;
objfile_object *self = (objfile_object *) o;
if (!unwinders)
}
/* 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;
}
static int
objfpy_set_type_printers (PyObject *o, PyObject *value, void *ignore)
{
- PyObject *tmp;
objfile_object *self = (objfile_object *) o;
if (! value)
}
/* 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;
}
if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "s", keywords, &file_name))
return NULL;
- TRY
+ try
{
gdb_bfd_ref_ptr abfd (symfile_bfd_open (file_name));
symbol_file_add_separate (abfd.get (), file_name, 0, obj->objfile);
}
- CATCH (except, RETURN_MASK_ALL)
+ catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
- END_CATCH
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 ("<gdb.Objfile (invalid)>");
+
+ return PyString_FromFormat ("<gdb.Objfile filename=%s>",
+ 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. */
static struct objfile *
objfpy_lookup_objfile_by_name (const char *name)
{
- struct objfile *objfile;
-
- ALL_OBJFILES (objfile)
+ for (objfile *objfile : current_program_space->objfiles ())
{
const char *filename;
static struct objfile *
objfpy_lookup_objfile_by_build_id (const char *build_id)
{
- struct objfile *objfile;
-
- ALL_OBJFILES (objfile)
+ for (objfile *objfile : current_program_space->objfiles ())
{
const struct bfd_build_id *obfd_build_id;
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;
object->objfile = NULL;
}
-/* 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)
{
- gdbpy_ref<objfile_object> object
- ((objfile_object *) objfile_data (objfile, objfpy_objfile_data_key));
- if (object == NULL)
+ PyObject *result
+ = ((PyObject *) objfile_data (objfile, objfpy_objfile_data_key));
+ if (result == NULL)
{
- object.reset (PyObject_New (objfile_object, &objfile_object_type));
- if (object != NULL)
- {
- if (!objfpy_initialize (object.get ()))
- return NULL;
+ gdbpy_ref<objfile_object> 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 ());
- }
+ object->objfile = objfile;
+ set_objfile_data (objfile, objfpy_objfile_data_key, object.get ());
+ result = (PyObject *) object.release ();
}
- return (PyObject *) object.release ();
+ return gdbpy_ref<>::new_reference (result);
}
int
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*/
projects / deliverable / binutils-gdb.git / blobdiff