diff options
Diffstat (limited to 'gdb/python')
| -rw-r--r-- | gdb/python/py-frame.c | 6 | ||||
| -rw-r--r-- | gdb/python/py-symbol.c | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c index 62176df..d78d807 100644 --- a/gdb/python/py-frame.c +++ b/gdb/python/py-frame.c @@ -300,10 +300,8 @@ frapy_block (PyObject *self, PyObject *args) if (block) { - struct symtab *symt; - - symt = SYMBOL_SYMTAB (BLOCK_FUNCTION (fn_block)); - return block_to_block_object (block, SYMTAB_OBJFILE (symt)); + return block_to_block_object + (block, symbol_objfile (BLOCK_FUNCTION (fn_block))); } Py_RETURN_NONE; diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index caf0a74..62fde64 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -87,7 +87,7 @@ sympy_get_symtab (PyObject *self, void *closure) SYMPY_REQUIRE_VALID (self, symbol); - return symtab_to_symtab_object (SYMBOL_SYMTAB (symbol)); + return symtab_to_symtab_object (symbol_symtab (symbol)); } static PyObject * @@ -290,15 +290,14 @@ set_symbol (symbol_object *obj, struct symbol *symbol) { obj->symbol = symbol; obj->prev = NULL; - if (SYMBOL_SYMTAB (symbol)) + if (symbol_symtab (symbol) != NULL) { - obj->next = objfile_data (SYMBOL_OBJFILE (symbol), - sympy_objfile_data_key); + struct objfile *objfile = symbol_objfile (symbol); + obj->next = objfile_data (objfile, sympy_objfile_data_key); if (obj->next) obj->next->prev = obj; - set_objfile_data (SYMBOL_OBJFILE (symbol), - sympy_objfile_data_key, obj); + set_objfile_data (objfile, sympy_objfile_data_key, obj); } else obj->next = NULL; @@ -334,9 +333,10 @@ sympy_dealloc (PyObject *obj) if (sym_obj->prev) sym_obj->prev->next = sym_obj->next; - else if (sym_obj->symbol && SYMBOL_SYMTAB (sym_obj->symbol)) + else if (sym_obj->symbol != NULL + && symbol_symtab (sym_obj->symbol) != NULL) { - set_objfile_data (SYMBOL_OBJFILE (sym_obj->symbol), + set_objfile_data (symbol_objfile (sym_obj->symbol), sympy_objfile_data_key, sym_obj->next); } if (sym_obj->next) |