From 08be3fe322244a3684d007d9282e225fc215f5d8 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 23 Dec 2014 07:21:10 -0800 Subject: Replace some symbol accessor macros with functions. gdb/ChangeLog: * symtab.h (SYMBOL_SYMTAB): Delete (SYMBOL_OBJFILE): Delete. (symbol_symtab, symbol_set_symtab): Declare. (symbol_objfile, symbol_arch): Declare. * symtab.c (symbol_symtab): Replaces SYMBOL_SYMTAB. All uses updated. All references to symbol->symtab redirected through here. (symbol_set_symtab): New function. All assignments to SYMBOL_SYMTAB redirected through here. (symbol_arch): New function. (symbol_objfile): New function. Replaces SYMBOL_OBJFILE. All uses updated. * cp-namespace.c (cp_lookup_symbol_imports_or_template): Call symbol_arch. * findvar.c (default_read_var_value): Call symbol_arch. * guile/scm-frame.c (gdbscm_frame_block): Call symbol_objfile. * jv-lang.c (add_class_symtab_symbol): Call symbol_arch. * printcmd.c (address_info): Call symbol_arch. * tracepoint.c (scope_info): Call symbol_arch. --- gdb/guile/scm-frame.c | 7 ++----- gdb/guile/scm-symbol.c | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'gdb/guile') diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c index b2d662e..70572ab 100644 --- a/gdb/guile/scm-frame.c +++ b/gdb/guile/scm-frame.c @@ -608,11 +608,8 @@ gdbscm_frame_block (SCM self) if (block != NULL) { - struct symtab *st; - SCM block_scm; - - st = SYMBOL_SYMTAB (BLOCK_FUNCTION (fn_block)); - return bkscm_scm_from_block (block, SYMTAB_OBJFILE (st)); + return bkscm_scm_from_block + (block, symbol_objfile (BLOCK_FUNCTION (fn_block))); } return SCM_BOOL_F; diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c index d80aa54..6a19648 100644 --- a/gdb/guile/scm-symbol.c +++ b/gdb/guile/scm-symbol.c @@ -81,7 +81,7 @@ syscm_eq_symbol_smob (const void *ap, const void *bp) static htab_t syscm_objfile_symbol_map (struct symbol *symbol) { - struct objfile *objfile = SYMBOL_OBJFILE (symbol); + struct objfile *objfile = symbol_objfile (symbol); htab_t htab = objfile_data (objfile, syscm_objfile_data_key); if (htab == NULL) @@ -329,7 +329,7 @@ gdbscm_symbol_symtab (SCM self) = syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); const struct symbol *symbol = s_smob->symbol; - return stscm_scm_from_symtab (SYMBOL_SYMTAB (symbol)); + return stscm_scm_from_symtab (symbol_symtab (symbol)); } /* (symbol-name ) -> string */ -- cgit v1.1