/* Helper routines for C++ support in GDB.
- Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
Contributed by David Carlton and by Kealia, Inc.
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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "cp-support.h"
#include "dictionary.h"
#include "command.h"
#include "frame.h"
-
-/* When set, the file that we're processing is known to have debugging
- info for C++ namespaces. */
-
-/* NOTE: carlton/2004-01-13: No currently released version of GCC (the
- latest of which is 3.3.x at the time of this writing) produces this
- debug info. GCC 3.4 should, however. */
-
-unsigned char processing_has_namespace_info;
-
-/* This contains our best guess as to the name of the current
- enclosing namespace(s)/class(es), if any. For example, if we're
- within the method foo() in the following code:
-
- namespace N {
- class C {
- void foo () {
- }
- };
- }
-
- then processing_current_prefix should be set to "N::C". If
- processing_has_namespace_info is false, then this variable might
- not be reliable. */
-
-const char *processing_current_prefix;
-
-/* List of using directives that are active in the current file. */
-
-static struct using_direct *using_list;
-
-static struct using_direct *cp_add_using (const char *name,
- unsigned int inner_len,
- unsigned int outer_len,
- struct using_direct *next);
+#include "buildsym.h"
static struct using_direct *cp_copy_usings (struct using_direct *using,
struct obstack *obstack);
const char *linkage_name,
const struct block *block,
const domain_enum domain,
- struct symtab **symtab,
const char *scope,
int scope_len);
const char *linkage_name,
const struct block *block,
const domain_enum domain,
- struct symtab **symtab,
int anonymous_namespace);
static struct type *cp_lookup_transparent_type_loop (const char *name,
int len,
struct objfile *objfile);
-static
-struct symbol *lookup_possible_namespace_symbol (const char *name,
- struct symtab **symtab);
+static struct symbol *lookup_possible_namespace_symbol (const char *name);
static void maintenance_cplus_namespace (char *args, int from_tty);
-/* Set up support for dealing with C++ namespace info in the current
- symtab. */
-
-void cp_initialize_namespace ()
-{
- processing_has_namespace_info = 0;
- using_list = NULL;
-}
-
-/* Add all the using directives we've gathered to the current symtab.
- STATIC_BLOCK should be the symtab's static block; OBSTACK is used
- for allocation. */
-
-void
-cp_finalize_namespace (struct block *static_block,
- struct obstack *obstack)
-{
- if (using_list != NULL)
- {
- block_set_using (static_block,
- cp_copy_usings (using_list, obstack),
- obstack);
- using_list = NULL;
- }
-}
-
/* Check to see if SYMBOL refers to an object contained within an
anonymous namespace; if so, add an appropriate using directive. */
void
cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
{
- if (!processing_has_namespace_info
- && SYMBOL_CPLUS_DEMANGLED_NAME (symbol) != NULL)
+ if (SYMBOL_DEMANGLED_NAME (symbol) != NULL)
{
- const char *name = SYMBOL_CPLUS_DEMANGLED_NAME (symbol);
+ const char *name = SYMBOL_DEMANGLED_NAME (symbol);
unsigned int previous_component;
unsigned int next_component;
const char *len;
"(anonymous namespace)",
ANONYMOUS_NAMESPACE_LEN) == 0)
{
+ int outer_len = (previous_component == 0 ? 0 : previous_component - 2);
+ int inner_len = next_component;
+
+ char *outer = alloca (outer_len + 1);
+ char *inner = alloca (inner_len + 1);
+
+ memcpy (outer, name, outer_len);
+ memcpy (inner, name, inner_len);
+
+ outer[outer_len] = '\0';
+ inner[inner_len] = '\0';
+
/* We've found a component of the name that's an
anonymous namespace. So add symbols in it to the
namespace given by the previous component if there is
one, or to the global namespace if there isn't. */
- cp_add_using_directive (name,
- previous_component == 0
- ? 0 : previous_component - 2,
- next_component);
+ cp_add_using_directive (outer, inner);
}
/* The "+ 2" is for the "::". */
previous_component = next_component + 2;
}
}
-/* Add a using directive to using_list. NAME is the start of a string
- that should contain the namespaces we want to add as initial
- substrings, OUTER_LENGTH is the end of the outer namespace, and
- INNER_LENGTH is the end of the inner namespace. If the using
- directive in question has already been added, don't add it
- twice. */
+/* Add a using directive to using_list. If the using directive in question
+ has already been added, don't add it twice. */
void
-cp_add_using_directive (const char *name, unsigned int outer_length,
- unsigned int inner_length)
+cp_add_using_directive (const char *outer, const char *inner)
{
struct using_direct *current;
struct using_direct *new;
/* Has it already been added? */
- for (current = using_list; current != NULL; current = current->next)
+ for (current = using_directives; current != NULL; current = current->next)
{
- if ((strncmp (current->inner, name, inner_length) == 0)
- && (strlen (current->inner) == inner_length)
- && (strlen (current->outer) == outer_length))
+ if (strcmp (current->inner, inner) == 0
+ && strcmp (current->outer, outer) == 0)
return;
}
- using_list = cp_add_using (name, inner_length, outer_length,
- using_list);
+ using_directives = cp_add_using (outer, inner, using_directives);
+
}
/* Record the namespace that the function defined by SYMBOL was
void
cp_set_block_scope (const struct symbol *symbol,
struct block *block,
- struct obstack *obstack)
+ struct obstack *obstack,
+ const char *processing_current_prefix,
+ int processing_has_namespace_info)
{
- /* Make sure that the name was originally mangled: if not, there
- certainly isn't any namespace information to worry about! */
-
- if (SYMBOL_CPLUS_DEMANGLED_NAME (symbol) != NULL)
+ if (processing_has_namespace_info)
{
- if (processing_has_namespace_info)
- {
- block_set_scope
- (block, obsavestring (processing_current_prefix,
- strlen (processing_current_prefix),
- obstack),
- obstack);
- }
- else
- {
- /* Try to figure out the appropriate namespace from the
- demangled name. */
+ block_set_scope
+ (block, obsavestring (processing_current_prefix,
+ strlen (processing_current_prefix),
+ obstack),
+ obstack);
+ }
+ else if (SYMBOL_DEMANGLED_NAME (symbol) != NULL)
+ {
+ /* Try to figure out the appropriate namespace from the
+ demangled name. */
- /* FIXME: carlton/2003-04-15: If the function in question is
- a method of a class, the name will actually include the
- name of the class as well. This should be harmless, but
- is a little unfortunate. */
+ /* FIXME: carlton/2003-04-15: If the function in question is
+ a method of a class, the name will actually include the
+ name of the class as well. This should be harmless, but
+ is a little unfortunate. */
- const char *name = SYMBOL_CPLUS_DEMANGLED_NAME (symbol);
- unsigned int prefix_len = cp_entire_prefix_len (name);
+ const char *name = SYMBOL_DEMANGLED_NAME (symbol);
+ unsigned int prefix_len = cp_entire_prefix_len (name);
- block_set_scope (block,
- obsavestring (name, prefix_len, obstack),
- obstack);
- }
+ block_set_scope (block,
+ obsavestring (name, prefix_len, obstack),
+ obstack);
}
}
!= NULL);
}
-/* Create a new struct using direct whose inner namespace is the
- initial substring of NAME of leng INNER_LEN and whose outer
- namespace is the initial substring of NAME of length OUTER_LENGTH.
+/* Create a new struct using direct whose inner namespace is INNER
+ and whose outer namespace is OUTER.
Set its next member in the linked list to NEXT; allocate all memory
using xmalloc. It copies the strings, so NAME can be a temporary
string. */
-static struct using_direct *
-cp_add_using (const char *name,
- unsigned int inner_len,
- unsigned int outer_len,
+struct using_direct *
+cp_add_using (const char *outer,
+ const char *inner,
struct using_direct *next)
{
struct using_direct *retval;
- gdb_assert (outer_len < inner_len);
-
retval = xmalloc (sizeof (struct using_direct));
- retval->inner = savestring (name, inner_len);
- retval->outer = savestring (name, outer_len);
+ retval->inner = savestring (inner, strlen(inner));
+ retval->outer = savestring (outer, strlen(outer));
retval->next = next;
return retval;
cp_lookup_symbol_nonlocal (const char *name,
const char *linkage_name,
const struct block *block,
- const domain_enum domain,
- struct symtab **symtab)
+ const domain_enum domain)
{
return lookup_namespace_scope (name, linkage_name, block, domain,
- symtab, block_scope (block), 0);
+ block_scope (block), 0);
}
/* Lookup NAME at namespace scope (or, in C terms, in static and
const char *linkage_name,
const struct block *block,
const domain_enum domain,
- struct symtab **symtab,
const char *scope,
int scope_len)
{
}
new_scope_len += cp_find_first_component (scope + new_scope_len);
sym = lookup_namespace_scope (name, linkage_name, block,
- domain, symtab,
- scope, new_scope_len);
+ domain, scope, new_scope_len);
if (sym != NULL)
return sym;
}
strncpy (namespace, scope, scope_len);
namespace[scope_len] = '\0';
return cp_lookup_symbol_namespace (namespace, name, linkage_name,
- block, domain, symtab);
+ block, domain);
}
/* Look up NAME in the C++ namespace NAMESPACE, applying the using
const char *name,
const char *linkage_name,
const struct block *block,
- const domain_enum domain,
- struct symtab **symtab)
+ const domain_enum domain)
{
const struct using_direct *current;
struct symbol *sym;
name,
linkage_name,
block,
- domain,
- symtab);
+ domain);
if (sym != NULL)
return sym;
}
if (namespace[0] == '\0')
{
return lookup_symbol_file (name, linkage_name, block,
- domain, symtab, 0);
+ domain, 0);
}
else
{
strcat (concatenated_name, "::");
strcat (concatenated_name, name);
sym = lookup_symbol_file (concatenated_name, linkage_name,
- block, domain, symtab,
+ block, domain,
cp_is_anonymous (namespace));
return sym;
}
const char *linkage_name,
const struct block *block,
const domain_enum domain,
- struct symtab **symtab,
int anonymous_namespace)
{
struct symbol *sym = NULL;
- sym = lookup_symbol_static (name, linkage_name, block, domain, symtab);
+ sym = lookup_symbol_static (name, linkage_name, block, domain);
if (sym != NULL)
return sym;
if (global_block != NULL)
sym = lookup_symbol_aux_block (name, linkage_name, global_block,
- domain, symtab);
+ domain);
}
else
{
- sym = lookup_symbol_global (name, linkage_name, domain, symtab);
+ sym = lookup_symbol_global (name, linkage_name, block, domain);
}
if (sym != NULL)
if (domain == VAR_DOMAIN)
{
- sym = lookup_possible_namespace_symbol (name, symtab);
+ sym = lookup_possible_namespace_symbol (name);
if (sym != NULL)
return sym;
}
nested_name,
NULL,
block,
- VAR_DOMAIN,
- NULL);
+ VAR_DOMAIN);
if (sym == NULL || SYMBOL_CLASS (sym) != LOC_TYPEDEF)
return NULL;
else
}
/* Look for a symbol named NAME in all the possible namespace blocks.
- If one is found, return it; if SYMTAB is non-NULL, set *SYMTAB to
- equal the symtab where it was found. */
+ If one is found, return it. */
static struct symbol *
-lookup_possible_namespace_symbol (const char *name, struct symtab **symtab)
+lookup_possible_namespace_symbol (const char *name)
{
struct objfile *objfile;
name, NULL, VAR_DOMAIN);
if (sym != NULL)
- {
- if (symtab != NULL)
- *symtab = objfile->cp_namespace_symtab;
-
- return sym;
- }
+ return sym;
}
return NULL;
}
}
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern initialize_file_ftype _initialize_cp_namespace;
+
void
_initialize_cp_namespace (void)
{
projects / deliverable / binutils-gdb.git / blobdiff