/* Scheme interface to blocks.
- Copyright (C) 2008-2014 Free Software Foundation, Inc.
+ Copyright (C) 2008-2018 Free Software Foundation, Inc.
This file is part of GDB.
static hashval_t
bkscm_hash_block_smob (const void *p)
{
- const block_smob *b_smob = p;
+ const block_smob *b_smob = (const block_smob *) p;
return htab_hash_pointer (b_smob->block);
}
static int
bkscm_eq_block_smob (const void *ap, const void *bp)
{
- const block_smob *a = ap;
- const block_smob *b = bp;
+ const block_smob *a = (const block_smob *) ap;
+ const block_smob *b = (const block_smob *) bp;
return (a->block == b->block
&& a->block != NULL);
static htab_t
bkscm_objfile_block_map (struct objfile *objfile)
{
- htab_t htab = objfile_data (objfile, bkscm_objfile_data_key);
+ htab_t htab = (htab_t) objfile_data (objfile, bkscm_objfile_data_key);
if (htab == NULL)
{
static void
bkscm_del_objfile_blocks (struct objfile *objfile, void *datum)
{
- htab_t htab = datum;
+ htab_t htab = (htab_t) datum;
if (htab != NULL)
{
case GLOBAL_BLOCK:
case STATIC_BLOCK:
{
- struct symtab *s;
+ struct compunit_symtab *cust;
gdbscm_printf (port, " %s",
i_smob->iter.which == GLOBAL_BLOCK
? "global" : "static");
if (i_smob->iter.idx != -1)
gdbscm_printf (port, " @%d", i_smob->iter.idx);
- s = (i_smob->iter.idx == -1
- ? i_smob->iter.d.symtab
- : i_smob->iter.d.symtab->includes[i_smob->iter.idx]);
- gdbscm_printf (port, " %s", symtab_to_filename_for_display (s));
+ cust = (i_smob->iter.idx == -1
+ ? i_smob->iter.d.compunit_symtab
+ : i_smob->iter.d.compunit_symtab->includes[i_smob->iter.idx]);
+ gdbscm_printf (port, " %s",
+ symtab_to_filename_for_display
+ (compunit_primary_filetab (cust)));
break;
}
case FIRST_LOCAL_BLOCK:
{
CORE_ADDR pc;
const struct block *block = NULL;
- struct obj_section *section = NULL;
- struct symtab *symtab = NULL;
- volatile struct gdb_exception except;
+ struct compunit_symtab *cust = NULL;
gdbscm_parse_function_args (FUNC_NAME, SCM_ARG1, NULL, "U", pc_scm, &pc);
- TRY_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
- section = find_pc_mapped_section (pc);
- symtab = find_pc_sect_symtab (pc, section);
+ cust = find_pc_compunit_symtab (pc);
- if (symtab != NULL && SYMTAB_OBJFILE (symtab) != NULL)
+ if (cust != NULL && COMPUNIT_OBJFILE (cust) != NULL)
block = block_for_pc (pc);
}
- GDBSCM_HANDLE_GDB_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDBSCM_HANDLE_GDB_EXCEPTION (except);
+ }
+ END_CATCH
- if (symtab == NULL || SYMTAB_OBJFILE (symtab) == NULL)
+ if (cust == NULL || COMPUNIT_OBJFILE (cust) == 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 (symtab));
+ return bkscm_scm_from_block (block, COMPUNIT_OBJFILE (cust));
return SCM_BOOL_F;
}
\f
static const scheme_function block_functions[] =
{
- { "block?", 1, 0, 0, gdbscm_block_p,
+ { "block?", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_p),
"\
Return #t if the object is a <gdb:block> object." },
- { "block-valid?", 1, 0, 0, gdbscm_block_valid_p,
+ { "block-valid?", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_valid_p),
"\
Return #t if the block is valid.\n\
A block becomes invalid when its objfile is freed." },
- { "block-start", 1, 0, 0, gdbscm_block_start,
+ { "block-start", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_start),
"\
Return the start address of the block." },
- { "block-end", 1, 0, 0, gdbscm_block_end,
+ { "block-end", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_end),
"\
Return the end address of the block." },
- { "block-function", 1, 0, 0, gdbscm_block_function,
+ { "block-function", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_function),
"\
Return the gdb:symbol object of the function containing the block\n\
or #f if the block does not live in any function." },
- { "block-superblock", 1, 0, 0, gdbscm_block_superblock,
+ { "block-superblock", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_superblock),
"\
Return the superblock (parent block) of the block." },
- { "block-global-block", 1, 0, 0, gdbscm_block_global_block,
+ { "block-global-block", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_global_block),
"\
Return the global block of the block." },
- { "block-static-block", 1, 0, 0, gdbscm_block_static_block,
+ { "block-static-block", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_static_block),
"\
Return the static block of the block." },
- { "block-global?", 1, 0, 0, gdbscm_block_global_p,
+ { "block-global?", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_global_p),
"\
Return #t if block is a global block." },
- { "block-static?", 1, 0, 0, gdbscm_block_static_p,
+ { "block-static?", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_static_p),
"\
Return #t if block is a static block." },
- { "block-symbols", 1, 0, 0, gdbscm_block_symbols,
+ { "block-symbols", 1, 0, 0, as_a_scm_t_subr (gdbscm_block_symbols),
"\
Return a list of all symbols (as <gdb:symbol> objects) in the block." },
- { "make-block-symbols-iterator", 1, 0, 0, gdbscm_make_block_syms_iter,
+ { "make-block-symbols-iterator", 1, 0, 0,
+ as_a_scm_t_subr (gdbscm_make_block_syms_iter),
"\
Return a <gdb:iterator> object for iterating over all symbols in the block." },
- { "block-symbols-progress?", 1, 0, 0, bkscm_block_syms_progress_p,
+ { "block-symbols-progress?", 1, 0, 0,
+ as_a_scm_t_subr (bkscm_block_syms_progress_p),
"\
Return #t if the object is a <gdb:block-symbols-progress> object." },
- { "lookup-block", 1, 0, 0, gdbscm_lookup_block,
+ { "lookup-block", 1, 0, 0, as_a_scm_t_subr (gdbscm_lookup_block),
"\
Return the innermost GDB block containing the address or #f if none found.\n\
\n\
/* This function is "private". */
bkscm_next_symbol_x_proc
= scm_c_define_gsubr ("%block-next-symbol!", 1, 0, 0,
- gdbscm_block_next_symbol_x);
+ as_a_scm_t_subr (gdbscm_block_next_symbol_x));
scm_set_procedure_property_x (bkscm_next_symbol_x_proc,
gdbscm_documentation_symbol,
gdbscm_scm_from_c_string ("\
projects / deliverable / binutils-gdb.git / blobdiff