return get_objfile_arch (block_objfile (block));
}
-/* Return Nonzero if block a is lexically nested within block b,
- or if a and b have the same pc range.
- Return zero otherwise. */
+/* See block.h. */
-int
-contained_in (const struct block *a, const struct block *b)
+bool
+contained_in (const struct block *a, const struct block *b,
+ bool allow_nested)
{
if (!a || !b)
- return 0;
+ return false;
do
{
if (a == b)
- return 1;
+ return true;
/* If A is a function block, then A cannot be contained in B,
except if A was inlined. */
- if (BLOCK_FUNCTION (a) != NULL && !block_inlined_p (a))
- return 0;
+ if (!allow_nested && BLOCK_FUNCTION (a) != NULL && !block_inlined_p (a))
+ return false;
a = BLOCK_SUPERBLOCK (a);
}
while (a != NULL);
- return 0;
+ return false;
}
/* A helper function that checks whether PC is in the blockvector BL.
It returns the containing block if there is one, or else NULL. */
-static struct block *
+static const struct block *
find_block_in_blockvector (const struct blockvector *bl, CORE_ADDR pc)
{
- struct block *b;
+ const struct block *b;
int bot, top, half;
/* If we have an addrmap mapping code addresses to blocks, then use
that. */
if (BLOCKVECTOR_MAP (bl))
- return (struct block *) addrmap_find (BLOCKVECTOR_MAP (bl), pc);
+ return (const struct block *) addrmap_find (BLOCKVECTOR_MAP (bl), pc);
/* Otherwise, use binary search to find the last block that starts
before PC.
struct compunit_symtab *cust)
{
const struct blockvector *bl;
- struct block *b;
+ const struct block *b;
if (cust == NULL)
{
"DW_TAG_call_site %s in %s"),
paddress (gdbarch, pc),
(msym.minsym == NULL ? "???"
- : MSYMBOL_PRINT_NAME (msym.minsym)));
+ : msym.minsym->print_name ()));
}
return (struct call_site *) *slot;
}
/* If BLOCK_NAMESPACE (block) is NULL, allocate it via OBSTACK and
- ititialize its members to zero. */
+ initialize its members to zero. */
static void
block_initialize_namespace (struct block *block, struct obstack *obstack)