diff options
author | Doug Evans <xdje42@gmail.com> | 2014-11-18 09:19:11 -0800 |
---|---|---|
committer | Doug Evans <xdje42@gmail.com> | 2014-11-18 09:19:11 -0800 |
commit | eb822aa6d0f2cdc1a3125da084b96c5bbe32cb86 (patch) | |
tree | d26ba8ac15567c8accf2d4bb9b24a4ed83d00a1d /gdb/guile | |
parent | 98387a2917d136b1acbaa9229d5b6a787d9efd54 (diff) | |
download | gdb-eb822aa6d0f2cdc1a3125da084b96c5bbe32cb86.zip gdb-eb822aa6d0f2cdc1a3125da084b96c5bbe32cb86.tar.gz gdb-eb822aa6d0f2cdc1a3125da084b96c5bbe32cb86.tar.bz2 |
SYMTAB_OBJFILE: New macro.
gdb/ChangeLog:
* symtab.h (SYMTAB_OBJFILE): New macro. All uses of member
symtab.objfile updated to use it.
Diffstat (limited to 'gdb/guile')
-rw-r--r-- | gdb/guile/scm-block.c | 6 | ||||
-rw-r--r-- | gdb/guile/scm-frame.c | 2 | ||||
-rw-r--r-- | gdb/guile/scm-symtab.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c index 67864f8..bbde77e 100644 --- a/gdb/guile/scm-block.c +++ b/gdb/guile/scm-block.c @@ -686,19 +686,19 @@ gdbscm_lookup_block (SCM pc_scm) section = find_pc_mapped_section (pc); symtab = find_pc_sect_symtab (pc, section); - if (symtab != NULL && symtab->objfile != NULL) + if (symtab != NULL && SYMTAB_OBJFILE (symtab) != NULL) block = block_for_pc (pc); } GDBSCM_HANDLE_GDB_EXCEPTION (except); - if (symtab == NULL || symtab->objfile == NULL) + if (symtab == NULL || SYMTAB_OBJFILE (symtab) == NULL) { gdbscm_out_of_range_error (FUNC_NAME, SCM_ARG1, pc_scm, _("cannot locate object file for block")); } if (block != NULL) - return bkscm_scm_from_block (block, symtab->objfile); + return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab)); return SCM_BOOL_F; } diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c index c335385..b2d662e 100644 --- a/gdb/guile/scm-frame.c +++ b/gdb/guile/scm-frame.c @@ -612,7 +612,7 @@ gdbscm_frame_block (SCM self) SCM block_scm; st = SYMBOL_SYMTAB (BLOCK_FUNCTION (fn_block)); - return bkscm_scm_from_block (block, st->objfile); + return bkscm_scm_from_block (block, SYMTAB_OBJFILE (st)); } return SCM_BOOL_F; diff --git a/gdb/guile/scm-symtab.c b/gdb/guile/scm-symtab.c index dbf9f7d..3567ad8 100644 --- a/gdb/guile/scm-symtab.c +++ b/gdb/guile/scm-symtab.c @@ -109,7 +109,7 @@ stscm_eq_symtab_smob (const void *ap, const void *bp) static htab_t stscm_objfile_symtab_map (struct symtab *symtab) { - struct objfile *objfile = symtab->objfile; + struct objfile *objfile = SYMTAB_OBJFILE (symtab); htab_t htab = objfile_data (objfile, stscm_objfile_data_key); if (htab == NULL) @@ -348,7 +348,7 @@ gdbscm_symtab_objfile (SCM self) = stscm_get_valid_symtab_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); const struct symtab *symtab = st_smob->symtab; - return ofscm_scm_from_objfile (symtab->objfile); + return ofscm_scm_from_objfile (SYMTAB_OBJFILE (symtab)); } /* (symtab-global-block <gdb:symtab>) -> <gdb:block> @@ -366,7 +366,7 @@ gdbscm_symtab_global_block (SCM self) blockvector = BLOCKVECTOR (symtab); block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK); - return bkscm_scm_from_block (block, symtab->objfile); + return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab)); } /* (symtab-static-block <gdb:symtab>) -> <gdb:block> @@ -384,7 +384,7 @@ gdbscm_symtab_static_block (SCM self) blockvector = BLOCKVECTOR (symtab); block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK); - return bkscm_scm_from_block (block, symtab->objfile); + return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab)); } /* Administrivia for sal (symtab-and-line) smobs. */ |