diff options
Diffstat (limited to 'gdb/guile/scm-symtab.c')
| -rw-r--r-- | gdb/guile/scm-symtab.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gdb/guile/scm-symtab.c b/gdb/guile/scm-symtab.c index 40410f7b9fb..518ceeaa15d 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 (symtab); + struct objfile *objfile = symtab->compunit ()->objfile (); htab_t htab = (htab_t) 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 (symtab)); + return ofscm_scm_from_objfile (symtab->compunit ()->objfile ()); } /* (symtab-global-block <gdb:symtab>) -> <gdb:block> @@ -361,12 +361,11 @@ gdbscm_symtab_global_block (SCM self) = stscm_get_valid_symtab_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); const struct symtab *symtab = st_smob->symtab; const struct blockvector *blockvector; - const struct block *block; - blockvector = SYMTAB_BLOCKVECTOR (symtab); - block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK); + blockvector = symtab->compunit ()->blockvector (); + const struct block *block = blockvector->global_block (); - return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab)); + return bkscm_scm_from_block (block, symtab->compunit ()->objfile ()); } /* (symtab-static-block <gdb:symtab>) -> <gdb:block> @@ -379,12 +378,11 @@ gdbscm_symtab_static_block (SCM self) = stscm_get_valid_symtab_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); const struct symtab *symtab = st_smob->symtab; const struct blockvector *blockvector; - const struct block *block; - blockvector = SYMTAB_BLOCKVECTOR (symtab); - block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK); + blockvector = symtab->compunit ()->blockvector (); + const struct block *block = blockvector->static_block (); - return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab)); + return bkscm_scm_from_block (block, symtab->compunit ()->objfile ()); } /* Administrivia for sal (symtab-and-line) smobs. */ |