9219021cb5
* Makefile.in (SFILES): Add cp-namespace.c. (COMMON_OBS): Add cp-namespace.o. (block.o): Depend on gdb_obstack_h and cp_support_h. (buildsym.o): Depend on cp_support_h. (cp-namespace.o): New. (cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h, gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h. (dwarf2read.o): Depend on cp_support_h. * jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE. * dwarf2read.c (process_die): Set processing_has_namespace_info, processing_current_namespace. (read_namespace): Update processing_current_namespace; check for anonymous namespaces. (dwarf2_name): New function. (dwarf2_extension): Ditto. * cp-support.h: Update copyright, contributors. Add inclusion guards. Add opaque declaration for structs obstack, block, symbol. (struct using_direct): New struct. Add declarations for cp_find_first_component, cp_entire_prefix_len, processing_has_namespace_info, processing_current_namespace, cp_is_anonymous, cp_add_using_directive, cp_initialize_namespace, cp_finalize_namespace, cp_set_block_scope, cp_scan_for_anonymous_namespaces. * cp-namespace.c: New file. * cp-support.c: Update copyright. Include ctype.h, gdb_assert.h, gdbcmd.h. New variable maint_cplus_cmd_list. (cp_find_first_component): New function. (cp_entire_prefix_len, maint_cplus_command) (first_component_command, _initialize_cp_support): Ditto. * buildsym.c: Include cp-support.h. New variable using_list. (add_symbol_to_list): Check for anonymous namespaces. (finish_block): Set block's scope. (start_symtab): Initialize C++ namespace support. (end_symtab): Finalize C++ namespace support. * block.h: Add opaque declarations for structs block_namespace_info, using_direct, and obstack. Add declarations for block_set_scope and block_set_using. (struct block): Add 'language_specific' member. (BLOCK_NAMESPACE): New macro. * block.c: Include gdb_obstack.h and cp-support.h. (struct block_namespace_info): New struct. (block_set_scope): New function. (block_set_using, block_initialize_namespace): Ditto. 2003-04-15 David Carlton <carlton@math.stanford.edu> * gdb.c++/maint.exp: New file.
201 lines
5.4 KiB
C
201 lines
5.4 KiB
C
/* Block-related functions for the GNU debugger, GDB.
|
|
|
|
Copyright 2003 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include "defs.h"
|
|
#include "block.h"
|
|
#include "symtab.h"
|
|
#include "symfile.h"
|
|
#include "gdb_obstack.h"
|
|
#include "cp-support.h"
|
|
|
|
/* This is used by struct block to store namespace-related info for
|
|
C++ files, namely using declarations and the current namespace in
|
|
scope. */
|
|
|
|
struct block_namespace_info
|
|
{
|
|
const char *scope;
|
|
struct using_direct *using;
|
|
};
|
|
|
|
static void block_initialize_namespace (struct block *block,
|
|
struct obstack *obstack);
|
|
|
|
/* Return Nonzero if block a is lexically nested within block b,
|
|
or if a and b have the same pc range.
|
|
Return zero otherwise. */
|
|
|
|
int
|
|
contained_in (struct block *a, struct block *b)
|
|
{
|
|
if (!a || !b)
|
|
return 0;
|
|
return BLOCK_START (a) >= BLOCK_START (b)
|
|
&& BLOCK_END (a) <= BLOCK_END (b);
|
|
}
|
|
|
|
|
|
/* Return the symbol for the function which contains a specified
|
|
lexical block, described by a struct block BL. */
|
|
|
|
struct symbol *
|
|
block_function (struct block *bl)
|
|
{
|
|
while (BLOCK_FUNCTION (bl) == 0 && BLOCK_SUPERBLOCK (bl) != 0)
|
|
bl = BLOCK_SUPERBLOCK (bl);
|
|
|
|
return BLOCK_FUNCTION (bl);
|
|
}
|
|
|
|
/* Return the blockvector immediately containing the innermost lexical block
|
|
containing the specified pc value and section, or 0 if there is none.
|
|
PINDEX is a pointer to the index value of the block. If PINDEX
|
|
is NULL, we don't pass this information back to the caller. */
|
|
|
|
struct blockvector *
|
|
blockvector_for_pc_sect (register CORE_ADDR pc, struct sec *section,
|
|
int *pindex, struct symtab *symtab)
|
|
{
|
|
register struct block *b;
|
|
register int bot, top, half;
|
|
struct blockvector *bl;
|
|
|
|
if (symtab == 0) /* if no symtab specified by caller */
|
|
{
|
|
/* First search all symtabs for one whose file contains our pc */
|
|
if ((symtab = find_pc_sect_symtab (pc, section)) == 0)
|
|
return 0;
|
|
}
|
|
|
|
bl = BLOCKVECTOR (symtab);
|
|
b = BLOCKVECTOR_BLOCK (bl, 0);
|
|
|
|
/* Then search that symtab for the smallest block that wins. */
|
|
/* Use binary search to find the last block that starts before PC. */
|
|
|
|
bot = 0;
|
|
top = BLOCKVECTOR_NBLOCKS (bl);
|
|
|
|
while (top - bot > 1)
|
|
{
|
|
half = (top - bot + 1) >> 1;
|
|
b = BLOCKVECTOR_BLOCK (bl, bot + half);
|
|
if (BLOCK_START (b) <= pc)
|
|
bot += half;
|
|
else
|
|
top = bot + half;
|
|
}
|
|
|
|
/* Now search backward for a block that ends after PC. */
|
|
|
|
while (bot >= 0)
|
|
{
|
|
b = BLOCKVECTOR_BLOCK (bl, bot);
|
|
if (BLOCK_END (b) > pc)
|
|
{
|
|
if (pindex)
|
|
*pindex = bot;
|
|
return bl;
|
|
}
|
|
bot--;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Return the blockvector immediately containing the innermost lexical block
|
|
containing the specified pc value, or 0 if there is none.
|
|
Backward compatibility, no section. */
|
|
|
|
struct blockvector *
|
|
blockvector_for_pc (register CORE_ADDR pc, int *pindex)
|
|
{
|
|
return blockvector_for_pc_sect (pc, find_pc_mapped_section (pc),
|
|
pindex, NULL);
|
|
}
|
|
|
|
/* Return the innermost lexical block containing the specified pc value
|
|
in the specified section, or 0 if there is none. */
|
|
|
|
struct block *
|
|
block_for_pc_sect (register CORE_ADDR pc, struct sec *section)
|
|
{
|
|
register struct blockvector *bl;
|
|
int index;
|
|
|
|
bl = blockvector_for_pc_sect (pc, section, &index, NULL);
|
|
if (bl)
|
|
return BLOCKVECTOR_BLOCK (bl, index);
|
|
return 0;
|
|
}
|
|
|
|
/* Return the innermost lexical block containing the specified pc value,
|
|
or 0 if there is none. Backward compatibility, no section. */
|
|
|
|
struct block *
|
|
block_for_pc (register CORE_ADDR pc)
|
|
{
|
|
return block_for_pc_sect (pc, find_pc_mapped_section (pc));
|
|
}
|
|
|
|
/* Now come some functions designed to deal with C++ namespace
|
|
issues. */
|
|
|
|
/* Set BLOCK's scope member to SCOPE; if needed, allocate memory via
|
|
OBSTACK. (It won't make a copy of SCOPE, however, so that already
|
|
has to be allocated correctly.) */
|
|
|
|
void
|
|
block_set_scope (struct block *block, const char *scope,
|
|
struct obstack *obstack)
|
|
{
|
|
block_initialize_namespace (block, obstack);
|
|
|
|
BLOCK_NAMESPACE (block)->scope = scope;
|
|
}
|
|
|
|
/* Set BLOCK's using member to USING; if needed, allocate memory via
|
|
OBSTACK. (It won't make a copy of USING, however, so that already
|
|
has to be allocated correctly.) */
|
|
|
|
void
|
|
block_set_using (struct block *block,
|
|
struct using_direct *using,
|
|
struct obstack *obstack)
|
|
{
|
|
block_initialize_namespace (block, obstack);
|
|
|
|
BLOCK_NAMESPACE (block)->using = using;
|
|
}
|
|
|
|
/* If BLOCK_NAMESPACE (block) is NULL, allocate it via OBSTACK and
|
|
ititialize its members to zero. */
|
|
|
|
static void
|
|
block_initialize_namespace (struct block *block, struct obstack *obstack)
|
|
{
|
|
if (BLOCK_NAMESPACE (block) == NULL)
|
|
{
|
|
BLOCK_NAMESPACE (block)
|
|
= obstack_alloc (obstack, sizeof (struct block_namespace_info));
|
|
BLOCK_NAMESPACE (block)->scope = NULL;
|
|
BLOCK_NAMESPACE (block)->using = NULL;
|
|
}
|
|
}
|