2000-11-11 00:02:56 +01:00
|
|
|
|
/* Parser for linespec for the GNU debugger, GDB.
|
2005-01-14 21:24:20 +01:00
|
|
|
|
|
2007-01-09 18:59:20 +01:00
|
|
|
|
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
|
2009-01-03 06:58:08 +01:00
|
|
|
|
1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
|
|
|
|
|
2009 Free Software Foundation, Inc.
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
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
|
2007-08-23 20:08:50 +02:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
2000-11-11 00:02:56 +01:00
|
|
|
|
(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
|
2007-08-23 20:08:50 +02:00
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "symtab.h"
|
2000-11-30 Fernando Nasser <fnasser@redhat.com>
* linespec.h: New file. Declarations for linespec.c.
* linespec.c, alpha-tdep.c, breakpoint.c, parse.c, source.c,
symtab.c, tracepoint.c: Include the above.
* completer.c: New file. Line completion stuff for GDB.
(get_gdb_completer_word_break_characters,
get_gdb_completer_quote_characters): New functions. Accessors for
useful completer internal data.
(filename_completer, line_completion_function, skip_quoted): Moved
here from top.c.
* completer.h: New file. Declarations for the above.
* linespec.c (decode_line_1): Use
get_gdb_completer_word_break_characters and
get_gdb_completer_quote_characters.
* top.c: Include completer.h.
(filename_completer, line_completion_function, skip_quoted):
Moved to completer.c.
* corefile.c, exec.c, source.c, symfile.c, linespec.c: Include
completer.h.
* Makefile.in (SFILES): Add completer.c.
(COMMON_OBS): Add completer.o.
(completer.o): New target.
(linespec.o, alpha-tdep.o, breakpoint.o, parse.o, source.o,
symtab.o, tracepoint.o): Add linespec.h to dependencies list.
(corefile.o, exec.o, source.o, symfile.o, linespec.o): Add completer.h
to dependencies list.
2000-12-01 01:43:47 +01:00
|
|
|
|
#include "frame.h"
|
|
|
|
|
#include "command.h"
|
2000-11-11 00:02:56 +01:00
|
|
|
|
#include "symfile.h"
|
|
|
|
|
#include "objfiles.h"
|
2002-09-20 16:58:59 +02:00
|
|
|
|
#include "source.h"
|
2000-11-11 00:02:56 +01:00
|
|
|
|
#include "demangle.h"
|
2000-11-30 Fernando Nasser <fnasser@redhat.com>
* linespec.h: New file. Declarations for linespec.c.
* linespec.c, alpha-tdep.c, breakpoint.c, parse.c, source.c,
symtab.c, tracepoint.c: Include the above.
* completer.c: New file. Line completion stuff for GDB.
(get_gdb_completer_word_break_characters,
get_gdb_completer_quote_characters): New functions. Accessors for
useful completer internal data.
(filename_completer, line_completion_function, skip_quoted): Moved
here from top.c.
* completer.h: New file. Declarations for the above.
* linespec.c (decode_line_1): Use
get_gdb_completer_word_break_characters and
get_gdb_completer_quote_characters.
* top.c: Include completer.h.
(filename_completer, line_completion_function, skip_quoted):
Moved to completer.c.
* corefile.c, exec.c, source.c, symfile.c, linespec.c: Include
completer.h.
* Makefile.in (SFILES): Add completer.c.
(COMMON_OBS): Add completer.o.
(completer.o): New target.
(linespec.o, alpha-tdep.o, breakpoint.o, parse.o, source.o,
symtab.o, tracepoint.o): Add linespec.h to dependencies list.
(corefile.o, exec.o, source.o, symfile.o, linespec.o): Add completer.h
to dependencies list.
2000-12-01 01:43:47 +01:00
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "completer.h"
|
(Changes from Daniel Berlin, with revisions by Jim Blandy.)
Abstract out operations specific to particular C++ ABI's, and
invoke them through a function table. This removes the C++ ABI
dependencies scattered throughout the code, and allows us to
cleanly add support for new C++ ABI's.
* cp-abi.h, cp-abi.h, gnu-v2-abi.c, hpacc-abi.c: New files.
* c-typeprint.c, c-valprint.c, dbxread.c, eval.c, gdbtypes.c,
jv-typeprint.c, linespec.c, symtab.c, typeprint.c, valops.c:
#include "cp-abi.h". These files all use functions now declared
there.
* symtab.h (OPNAME_PREFIX_P, VTBL_PREFIX_P, DESTRUCTOR_PREFIX_P):
Deleted. These services are now provided by functions declared in
cp-abi.h.
* value.h (value_rtti_type, value_virtual_fn_field): Same.
* values.c (value_virtual_fn_field): Same, for this definition.
* valops.c (value_rtti_type): Same.
* c-typeprint.c (c_type_print_base): Use the functions from
"cp-abi.h", instead of the old macros, or hard-coded ABI-specific
tests.
* dbxread.c (record_minimal_symbol): Same.
* gdbtypes.c (get_destructor_fn_field, virtual_base_index,
virtual_base_index_skip_primaries): Same.
* jv-typeprint.c (java_type_print_base): Same.
* linespec.c (find_methods, decode_line_1): Same.
* symtab.c (gdb_mangle_name): Same.
* Makefile.in (SFILES): Add the new .c files mentioned above.
(cp_abi_h): New variable.
(COMMON_OBS): Add gnu-v2-abi.o, hpacc-abi.o, and cp-abi.o.
(cp-abi.o, gnu-v2-abi.o, hpacc-abi.o): New targets.
(c-typeprint.o, c-valprint.o, dbxread.o, eval.o, gdbtypes.o,
jv-typeprint.o, symtab.o, linespec.o, typeprint.o, valops.o): Add
dependency on $(cp_abi_h).
2001-04-27 02:19:09 +02:00
|
|
|
|
#include "cp-abi.h"
|
2002-10-24 02:13:57 +02:00
|
|
|
|
#include "parser-defs.h"
|
2003-02-19 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add block.c.
(block_h): New.
(COMMON_OBS): Add block.o.
(block.o): New.
(x86-64-tdep.o): Add $(block_h).
(values.o, valops.o, tracepoint.o, symtab.o, symmisc.o, symfile.o)
(stack.o, printcmd.o, p-exp.tab.o, parse.o, objfiles.o)
(objc-exp.tab.o, objc-lang.o, nlmread.o, mips-tdep.o, mdebugread.o)
(m2-exp.tab.o, linespec.o, jv-lang.o, jv-exp.tab.o, infcmd.o)
(f-valprint.o, findvar.o, f-exp.tab.o, expprint.o, coffread.o)
(c-exp.tab.o, buildsym.o, breakpoint.o, blockframe.o, ax-gdb.o)
(alpha-tdep.o, ada-lang.o, ada-exp.tab.o, mi-cmd-stack.o): Ditto.
* value.h: Add opaque declaration for struct block.
* parser-defs.h, objc-lang.h, buildsym.h, breakpoint.h: Ditto.
* ada-lang.h: Ditto.
* x86-64-tdep.c: #include "block.h"
* values.c, valops.c, tracepoint.c, symtab.c, symmisc.c: Ditto.
* symfile.c, stack.c, printcmd.c, p-exp.y, parse.c: Ditto.
* objfiles.c, objc-exp.y, objc-lang.c, nlmread.c: Ditto.
* mips-tdep.c, mdebugread.c, m2-exp.y, linespec.c: Ditto.
* jv-lang.c, jv-exp.y, infcmd.c, f-valprint.c: Ditto.
* findvar.c, f-exp.y, expprint.c, coffread.c, c-exp.y: Ditto.
* buildsym.c, breakpoint.c, blockframe.c, ax-gdb.c: Ditto.
* alpha-tdep.c, ada-lang.c, ada-exp.y: Ditto.
* blockframe.c (blockvector_for_pc_sect): Move to "block.c".
(blockvector_for_pc, block_for_pc_sect, block_for_pc): Ditto.
* symtab.c (block_function): Ditto.
(contained_in): Ditto.
* frame.h: Move block_for_pc and block_for_pc_sect declarations to
block.h. Add opaque declaration for struct block.
* symtab.h: Move block_function and contained_in declarations to
block.h. Add opaque declarations for struct block, struct
blockvector.
(struct block): Move to block.h.
(struct blockvector): Ditto.
(BLOCK_START, BLOCK_END, BLOCK_FUNCTION, BLOCK_SUPERBLOCK)
(BLOCK_GCC_COMPILED, BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM)
(BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE)
(ALL_BLOCK_SYMBOLS, BLOCK_SHOULD_SORT, BLOCKVECTOR_NBLOCKS)
(BLOCKVECTOR_BLOCK, GLOBAL_BLOCK, STATIC_BLOCK, FIRST_LOCAL_BLOCK):
Ditto.
* block.c: New file.
* block.h: New file.
2003-02-19 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: #include "block.h"
2003-02-20 01:01:07 +01:00
|
|
|
|
#include "block.h"
|
2003-04-27 05:23:38 +02:00
|
|
|
|
#include "objc-lang.h"
|
2003-06-08 Andrew Cagney <cagney@redhat.com>
* acinclude.m4 (gcc_AC_CHECK_DECL, (gcc_AC_CHECK_DECL): Stolen
from GCC's acinclude.m4.
* configure.in: Check for getopt's delcaration.
* aclocal.m4, config.in, configure: Re-generate.
* main.c (error_init): Delete declaration.
* defs.h (error_init): Declare.
* rs6000-tdep.c (rs6000_fetch_pointer_argument): Make static.
(rs6000_convert_from_func_ptr_addr): Make static.
(_initialize_rs6000_tdep): Add declaration.
* cli/cli-cmds.c (dont_repeat): Delete declaration.
(show_commands, set_verbose, show_history): Delete declaration.
* top.h (set_verbose): Add declaration.
(show_history, set_history, show_commands): Add declaration.
(do_restore_instream_cleanup): Add declaration.
* objc-lang.c (specialcmp): Make static.
(print_object_command): Make static.
(find_objc_msgsend): Make static.
(find_objc_msgcall_submethod_helper): Make static.
(find_objc_msgcall_submethod): Make static.
(_initialize_objc_language): Add declaration.
(find_implementation_from_class): Make static.
(find_implementation): Make static.
* objc-exp.y (yylex): Delete lookup_struct_typedef declaration.
* objc-lang.h (lookup_struct_typedef): Add declaration.
* cli/cli-interp.c (_initialize_cli_interp): Add declaration.
* cli/cli-script.c (clear_hook_in_cleanup): Make static.
(do_restore_user_call_depth): Make static.
(do_restore_instream_cleanup): Delete declaration.
(dont_repeat): Delete declaration.
* cli/cli-decode.c (add_abbrev_cmd): Delete function.
* cli/cli-dump.c (_initialize_cli_dump): Add declaration.
* reggroups.c (_initialize_reggroup): Add declaration.
* cp-support.c (_initialize_cp_support): Add declaration.
* cp-abi.c (_initialize_cp_abi): Add declaration.
* hpacc-abi.c (_initialize_hpacc_abi): Add declaration.
* gnu-v3-abi.c (gnuv3_baseclass_offset): Make static.
(_initialize_gnu_v3_abi): Add declaration.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Make static.
(_initialize_gnu_v2_abi): Add declaration.
* frame-base.c (_initialize_frame_base): Add declaration.
* doublest.c (floatformat_from_length): Make static.
* frame-unwind.c (_initialize_frame_unwind): Add declaration.
* frame.c (create_sentinel_frame): Make static.
(_initialize_frame): Add declaration.
* top.c (do_catch_errors): Make static.
(gdb_rl_operate_and_get_next_completion): Make static.
* typeprint.c: Include "typeprint.h".
* sentinel-frame.c (sentinel_frame_prev_register): Make static.
(sentinel_frame_this_id): Make static.
* p-valprint.c (_initialize_pascal_valprint): Add declaration.
* ui-out.c (make_cleanup_ui_out_begin_end): Delete function.
* dwarf2-frame.c (dwarf2_frame_cache): Make static.
* p-exp.y (push_current_type, pop_current_type): ISO C declaration.
* dwarf2expr.h (dwarf_expr_context): ISO C declaration.
* maint.c (maintenance_print_architecture): Make static.
* signals/signals.c (_initialize_signals): Add declaration.
* std-regs.c (_initialize_frame_reg): Add declaration.
* jv-exp.y (push_variable): ISO C definition.
(push_qualified_expression_name): Ditto.
* memattr.c (_initialize_mem): Add declaration.
* remote.c (remote_check_watch_resources): Make static.
(remote_stopped_by_watchpoint): Make static.
(remote_stopped_data_address): Make static.
* d10v-tdep.c (nr_dmap_regs): Make static.
(a0_regnum): Make static.
(d10v_frame_unwind_cache): Make static.
(d10v_frame_p): Make static.
* osabi.c (show_osabi): Make static.
(_initialize_gdb_osabi): Add extern declaration.
* gdbtypes.c (make_qualified_type): Make static.
(safe_parse_type): Make static.
* macrocmd.c (_initialize_macrocmd): Add extern declaration.
* macrotab.c (macro_bcache_free): Make static.
* interps.c (interp_set_quiet): Make static.
(interpreter_exec_cmd): Make static.
* stack.h (select_frame_command): New file.
* stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete function.
(select_frame_command): Make global.
* infcall.c: Include "infcall.h".
* linespec.c: Include "linespec.h".
* symfile.c (sections_overlap): Make static.
* cp-support.h (cp_initialize_namespace): ISO C declaration.
* charset.c (_initialize_charset): Add missing prototype.
* regcache.c (init_legacy_regcache_descr): Make static.
(do_regcache_xfree): Make static.
(regcache_xfer_part): Make static.
(_initialize_regcache): Add missing prototype.
* breakpoint.c (parse_breakpoint_sals): Make static.
(breakpoint_sals_to_pc): Make static.
* interps.h (clear_interpreter_hooks): ISO C declaration.
* Makefile.in (stack_h): Define.
(stack.o, typeprint.o, mi-main.o): Update dependencies.
(mi-cmd-stack.o, infcall.o, linespec.o): Update dependencies.
Index: mi/ChangeLog
2003-06-08 Andrew Cagney <cagney@redhat.com>
* mi-parse.c (_initialize_mi_parse): Delete function.
* mi-main.c: Include "mi-main.h".
* mi-interp.c (_initialize_mi_interp): Add declaration.
* mi-cmd-stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete extern declaration.
(mi_cmd_stack_select_frame): Replace select_frame_command_wrapper
with select_frame_command.
2003-06-08 20:27:14 +02:00
|
|
|
|
#include "linespec.h"
|
2005-01-14 21:24:20 +01:00
|
|
|
|
#include "exceptions.h"
|
2007-03-28 02:12:15 +02:00
|
|
|
|
#include "language.h"
|
2008-04-19 08:09:37 +02:00
|
|
|
|
#include "interps.h"
|
|
|
|
|
#include "mi/mi-cmds.h"
|
2008-05-03 02:37:35 +02:00
|
|
|
|
#include "target.h"
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
/* We share this one with symtab.c, but it is not exported widely. */
|
|
|
|
|
|
|
|
|
|
extern char *operator_chars (char *, char **);
|
|
|
|
|
|
|
|
|
|
/* Prototypes for local functions */
|
|
|
|
|
|
2002-11-11 22:18:55 +01:00
|
|
|
|
static void initialize_defaults (struct symtab **default_symtab,
|
|
|
|
|
int *default_line);
|
|
|
|
|
|
2002-11-12 00:20:07 +01:00
|
|
|
|
static void set_flags (char *arg, int *is_quoted, char **paren_pointer);
|
|
|
|
|
|
2002-11-11 22:18:55 +01:00
|
|
|
|
static struct symtabs_and_lines decode_indirect (char **argptr);
|
|
|
|
|
|
2002-11-15 22:55:16 +01:00
|
|
|
|
static char *locate_first_half (char **argptr, int *is_quote_enclosed);
|
|
|
|
|
|
2003-04-27 05:23:38 +02:00
|
|
|
|
static struct symtabs_and_lines decode_objc (char **argptr,
|
|
|
|
|
int funfirstline,
|
|
|
|
|
struct symtab *file_symtab,
|
|
|
|
|
char ***canonical,
|
|
|
|
|
char *saved_arg);
|
|
|
|
|
|
2002-12-05 23:25:49 +01:00
|
|
|
|
static struct symtabs_and_lines decode_compound (char **argptr,
|
|
|
|
|
int funfirstline,
|
|
|
|
|
char ***canonical,
|
|
|
|
|
char *saved_arg,
|
|
|
|
|
char *p);
|
|
|
|
|
|
2003-02-04 22:24:21 +01:00
|
|
|
|
static struct symbol *lookup_prefix_sym (char **argptr, char *p);
|
|
|
|
|
|
2003-02-28 18:21:16 +01:00
|
|
|
|
static struct symtabs_and_lines find_method (int funfirstline,
|
|
|
|
|
char ***canonical,
|
|
|
|
|
char *saved_arg,
|
|
|
|
|
char *copy,
|
|
|
|
|
struct type *t,
|
|
|
|
|
struct symbol *sym_class);
|
|
|
|
|
|
2003-03-03 18:20:24 +01:00
|
|
|
|
static int collect_methods (char *copy, struct type *t,
|
2007-03-28 02:12:15 +02:00
|
|
|
|
struct symbol *sym_class,
|
2003-03-03 18:20:24 +01:00
|
|
|
|
struct symbol **sym_arr);
|
|
|
|
|
|
2002-12-05 23:25:49 +01:00
|
|
|
|
static NORETURN void cplusplus_error (const char *name,
|
|
|
|
|
const char *fmt, ...)
|
|
|
|
|
ATTR_NORETURN ATTR_FORMAT (printf, 2, 3);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
static int total_number_of_methods (struct type *type);
|
|
|
|
|
|
2007-03-28 02:12:15 +02:00
|
|
|
|
static int find_methods (struct type *, char *,
|
|
|
|
|
enum language, struct symbol **);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2003-06-03 04:56:04 +02:00
|
|
|
|
static int add_matching_methods (int method_counter, struct type *t,
|
2007-03-28 02:12:15 +02:00
|
|
|
|
enum language language,
|
2003-06-03 04:56:04 +02:00
|
|
|
|
struct symbol **sym_arr);
|
|
|
|
|
|
|
|
|
|
static int add_constructors (int method_counter, struct type *t,
|
2007-03-28 02:12:15 +02:00
|
|
|
|
enum language language,
|
2003-06-03 04:56:04 +02:00
|
|
|
|
struct symbol **sym_arr);
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
static void build_canonical_line_spec (struct symtab_and_line *,
|
|
|
|
|
char *, char ***);
|
|
|
|
|
|
|
|
|
|
static char *find_toplevel_char (char *s, char c);
|
|
|
|
|
|
2003-08-02 05:59:40 +02:00
|
|
|
|
static int is_objc_method_format (const char *s);
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
static struct symtabs_and_lines decode_line_2 (struct symbol *[],
|
|
|
|
|
int, int, char ***);
|
|
|
|
|
|
2002-12-09 20:49:00 +01:00
|
|
|
|
static struct symtab *symtab_from_filename (char **argptr,
|
2003-12-17 22:47:47 +01:00
|
|
|
|
char *p, int is_quote_enclosed,
|
|
|
|
|
int *not_found_ptr);
|
2002-12-09 20:49:00 +01:00
|
|
|
|
|
2002-12-19 19:56:14 +01:00
|
|
|
|
static struct
|
|
|
|
|
symtabs_and_lines decode_all_digits (char **argptr,
|
|
|
|
|
struct symtab *default_symtab,
|
|
|
|
|
int default_line,
|
|
|
|
|
char ***canonical,
|
2003-01-11 02:01:04 +01:00
|
|
|
|
struct symtab *file_symtab,
|
2002-12-19 19:56:14 +01:00
|
|
|
|
char *q);
|
|
|
|
|
|
2003-01-07 18:05:49 +01:00
|
|
|
|
static struct symtabs_and_lines decode_dollar (char *copy,
|
|
|
|
|
int funfirstline,
|
|
|
|
|
struct symtab *default_symtab,
|
|
|
|
|
char ***canonical,
|
2003-01-11 02:01:04 +01:00
|
|
|
|
struct symtab *file_symtab);
|
2003-01-07 18:05:49 +01:00
|
|
|
|
|
2003-01-08 23:40:18 +01:00
|
|
|
|
static struct symtabs_and_lines decode_variable (char *copy,
|
|
|
|
|
int funfirstline,
|
|
|
|
|
char ***canonical,
|
2003-12-17 22:47:47 +01:00
|
|
|
|
struct symtab *file_symtab,
|
|
|
|
|
int *not_found_ptr);
|
2003-01-08 23:40:18 +01:00
|
|
|
|
|
2002-11-08 20:16:17 +01:00
|
|
|
|
static struct
|
|
|
|
|
symtabs_and_lines symbol_found (int funfirstline,
|
|
|
|
|
char ***canonical,
|
|
|
|
|
char *copy,
|
|
|
|
|
struct symbol *sym,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
struct symtab *file_symtab);
|
2002-11-08 20:16:17 +01:00
|
|
|
|
|
|
|
|
|
static struct
|
|
|
|
|
symtabs_and_lines minsym_found (int funfirstline,
|
|
|
|
|
struct minimal_symbol *msymbol);
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
/* Helper functions. */
|
|
|
|
|
|
2002-02-02 04:42:59 +01:00
|
|
|
|
/* Issue a helpful hint on using the command completion feature on
|
|
|
|
|
single quoted demangled C++ symbols as part of the completion
|
|
|
|
|
error. */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2002-12-05 23:25:49 +01:00
|
|
|
|
static NORETURN void
|
2002-02-02 04:42:59 +01:00
|
|
|
|
cplusplus_error (const char *name, const char *fmt, ...)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
2002-02-02 04:42:59 +01:00
|
|
|
|
struct ui_file *tmp_stream;
|
|
|
|
|
tmp_stream = mem_fileopen ();
|
|
|
|
|
make_cleanup_ui_file_delete (tmp_stream);
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
va_list args;
|
|
|
|
|
va_start (args, fmt);
|
|
|
|
|
vfprintf_unfiltered (tmp_stream, fmt, args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
}
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
while (*name == '\'')
|
|
|
|
|
name++;
|
2002-02-02 04:42:59 +01:00
|
|
|
|
fprintf_unfiltered (tmp_stream,
|
|
|
|
|
("Hint: try '%s<TAB> or '%s<ESC-?>\n"
|
|
|
|
|
"(Note leading single quote.)"),
|
|
|
|
|
name, name);
|
|
|
|
|
error_stream (tmp_stream);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the number of methods described for TYPE, including the
|
|
|
|
|
methods from types it derives from. This can't be done in the symbol
|
|
|
|
|
reader because the type of the baseclass might still be stubbed
|
|
|
|
|
when the definition of the derived class is parsed. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
total_number_of_methods (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
int n;
|
|
|
|
|
int count;
|
|
|
|
|
|
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
if (TYPE_CPLUS_SPECIFIC (type) == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
count = TYPE_NFN_FIELDS_TOTAL (type);
|
|
|
|
|
|
|
|
|
|
for (n = 0; n < TYPE_N_BASECLASSES (type); n++)
|
|
|
|
|
count += total_number_of_methods (TYPE_BASECLASS (type, n));
|
|
|
|
|
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Recursive helper function for decode_line_1.
|
|
|
|
|
Look for methods named NAME in type T.
|
|
|
|
|
Return number of matches.
|
|
|
|
|
Put matches in SYM_ARR, which should have been allocated with
|
|
|
|
|
a size of total_number_of_methods (T) * sizeof (struct symbol *).
|
|
|
|
|
Note that this function is g++ specific. */
|
|
|
|
|
|
|
|
|
|
static int
|
2007-03-28 02:12:15 +02:00
|
|
|
|
find_methods (struct type *t, char *name, enum language language,
|
|
|
|
|
struct symbol **sym_arr)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
|
|
|
|
int i1 = 0;
|
|
|
|
|
int ibase;
|
|
|
|
|
char *class_name = type_name_no_tag (t);
|
|
|
|
|
|
|
|
|
|
/* Ignore this class if it doesn't have a name. This is ugly, but
|
|
|
|
|
unless we figure out how to get the physname without the name of
|
|
|
|
|
the class, then the loop can't do any good. */
|
|
|
|
|
if (class_name
|
2007-03-28 02:12:15 +02:00
|
|
|
|
&& (lookup_symbol_in_language (class_name, (struct block *) NULL,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
STRUCT_DOMAIN, language, (int *) NULL)))
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
|
|
|
|
int method_counter;
|
2002-05-12 00:46:19 +02:00
|
|
|
|
int name_len = strlen (name);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2001-03-20 17:17:22 +01:00
|
|
|
|
CHECK_TYPEDEF (t);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
/* Loop over each method name. At this level, all overloads of a name
|
|
|
|
|
are counted as a single name. There is an inner loop which loops over
|
|
|
|
|
each overload. */
|
|
|
|
|
|
|
|
|
|
for (method_counter = TYPE_NFN_FIELDS (t) - 1;
|
|
|
|
|
method_counter >= 0;
|
|
|
|
|
--method_counter)
|
|
|
|
|
{
|
|
|
|
|
char *method_name = TYPE_FN_FIELDLIST_NAME (t, method_counter);
|
|
|
|
|
char dem_opname[64];
|
|
|
|
|
|
|
|
|
|
if (strncmp (method_name, "__", 2) == 0 ||
|
|
|
|
|
strncmp (method_name, "op", 2) == 0 ||
|
|
|
|
|
strncmp (method_name, "type", 4) == 0)
|
|
|
|
|
{
|
|
|
|
|
if (cplus_demangle_opname (method_name, dem_opname, DMGL_ANSI))
|
|
|
|
|
method_name = dem_opname;
|
|
|
|
|
else if (cplus_demangle_opname (method_name, dem_opname, 0))
|
|
|
|
|
method_name = dem_opname;
|
|
|
|
|
}
|
|
|
|
|
|
2001-03-21 21:51:16 +01:00
|
|
|
|
if (strcmp_iw (name, method_name) == 0)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
/* Find all the overloaded methods with that name. */
|
2007-03-28 02:12:15 +02:00
|
|
|
|
i1 += add_matching_methods (method_counter, t, language,
|
2003-06-03 04:56:04 +02:00
|
|
|
|
sym_arr + i1);
|
2002-05-12 00:46:19 +02:00
|
|
|
|
else if (strncmp (class_name, name, name_len) == 0
|
|
|
|
|
&& (class_name[name_len] == '\0'
|
|
|
|
|
|| class_name[name_len] == '<'))
|
2007-03-28 02:12:15 +02:00
|
|
|
|
i1 += add_constructors (method_counter, t, language,
|
2003-06-03 04:56:04 +02:00
|
|
|
|
sym_arr + i1);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Only search baseclasses if there is no match yet, since names in
|
|
|
|
|
derived classes override those in baseclasses.
|
|
|
|
|
|
|
|
|
|
FIXME: The above is not true; it is only true of member functions
|
|
|
|
|
if they have the same number of arguments (??? - section 13.1 of the
|
|
|
|
|
ARM says the function members are not in the same scope but doesn't
|
|
|
|
|
really spell out the rules in a way I understand. In any case, if
|
|
|
|
|
the number of arguments differ this is a case in which we can overload
|
|
|
|
|
rather than hiding without any problem, and gcc 2.4.5 does overload
|
|
|
|
|
rather than hiding in this case). */
|
|
|
|
|
|
|
|
|
|
if (i1 == 0)
|
|
|
|
|
for (ibase = 0; ibase < TYPE_N_BASECLASSES (t); ibase++)
|
2007-03-28 02:12:15 +02:00
|
|
|
|
i1 += find_methods (TYPE_BASECLASS (t, ibase), name,
|
|
|
|
|
language, sym_arr + i1);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
return i1;
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-03 04:56:04 +02:00
|
|
|
|
/* Add the symbols associated to methods of the class whose type is T
|
|
|
|
|
and whose name matches the method indexed by METHOD_COUNTER in the
|
|
|
|
|
array SYM_ARR. Return the number of methods added. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
add_matching_methods (int method_counter, struct type *t,
|
2007-03-28 02:12:15 +02:00
|
|
|
|
enum language language, struct symbol **sym_arr)
|
2003-06-03 04:56:04 +02:00
|
|
|
|
{
|
|
|
|
|
int field_counter;
|
|
|
|
|
int i1 = 0;
|
|
|
|
|
|
|
|
|
|
for (field_counter = TYPE_FN_FIELDLIST_LENGTH (t, method_counter) - 1;
|
|
|
|
|
field_counter >= 0;
|
|
|
|
|
--field_counter)
|
|
|
|
|
{
|
|
|
|
|
struct fn_field *f;
|
|
|
|
|
char *phys_name;
|
|
|
|
|
|
|
|
|
|
f = TYPE_FN_FIELDLIST1 (t, method_counter);
|
|
|
|
|
|
|
|
|
|
if (TYPE_FN_FIELD_STUB (f, field_counter))
|
|
|
|
|
{
|
|
|
|
|
char *tmp_name;
|
|
|
|
|
|
|
|
|
|
tmp_name = gdb_mangle_name (t,
|
|
|
|
|
method_counter,
|
|
|
|
|
field_counter);
|
|
|
|
|
phys_name = alloca (strlen (tmp_name) + 1);
|
|
|
|
|
strcpy (phys_name, tmp_name);
|
|
|
|
|
xfree (tmp_name);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
phys_name = TYPE_FN_FIELD_PHYSNAME (f, field_counter);
|
2007-03-28 02:12:15 +02:00
|
|
|
|
|
2003-06-03 04:56:04 +02:00
|
|
|
|
/* Destructor is handled by caller, don't add it to
|
|
|
|
|
the list. */
|
|
|
|
|
if (is_destructor_name (phys_name) != 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
2007-03-28 02:12:15 +02:00
|
|
|
|
sym_arr[i1] = lookup_symbol_in_language (phys_name,
|
2003-06-03 04:56:04 +02:00
|
|
|
|
NULL, VAR_DOMAIN,
|
2007-03-28 02:12:15 +02:00
|
|
|
|
language,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
(int *) NULL);
|
2003-06-03 04:56:04 +02:00
|
|
|
|
if (sym_arr[i1])
|
|
|
|
|
i1++;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* This error message gets printed, but the method
|
|
|
|
|
still seems to be found
|
|
|
|
|
fputs_filtered("(Cannot find method ", gdb_stdout);
|
|
|
|
|
fprintf_symbol_filtered (gdb_stdout, phys_name,
|
|
|
|
|
language_cplus,
|
|
|
|
|
DMGL_PARAMS | DMGL_ANSI);
|
|
|
|
|
fputs_filtered(" - possibly inlined.)\n", gdb_stdout);
|
|
|
|
|
*/
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return i1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add the symbols associated to constructors of the class whose type
|
|
|
|
|
is CLASS_TYPE and which are indexed by by METHOD_COUNTER to the
|
|
|
|
|
array SYM_ARR. Return the number of methods added. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
add_constructors (int method_counter, struct type *t,
|
2007-03-28 02:12:15 +02:00
|
|
|
|
enum language language, struct symbol **sym_arr)
|
2003-06-03 04:56:04 +02:00
|
|
|
|
{
|
|
|
|
|
int field_counter;
|
|
|
|
|
int i1 = 0;
|
|
|
|
|
|
|
|
|
|
/* For GCC 3.x and stabs, constructors and destructors
|
|
|
|
|
have names like __base_ctor and __complete_dtor.
|
|
|
|
|
Check the physname for now if we're looking for a
|
|
|
|
|
constructor. */
|
|
|
|
|
for (field_counter
|
|
|
|
|
= TYPE_FN_FIELDLIST_LENGTH (t, method_counter) - 1;
|
|
|
|
|
field_counter >= 0;
|
|
|
|
|
--field_counter)
|
|
|
|
|
{
|
|
|
|
|
struct fn_field *f;
|
|
|
|
|
char *phys_name;
|
2007-03-28 02:12:15 +02:00
|
|
|
|
|
2003-06-03 04:56:04 +02:00
|
|
|
|
f = TYPE_FN_FIELDLIST1 (t, method_counter);
|
|
|
|
|
|
|
|
|
|
/* GCC 3.x will never produce stabs stub methods, so
|
|
|
|
|
we don't need to handle this case. */
|
|
|
|
|
if (TYPE_FN_FIELD_STUB (f, field_counter))
|
|
|
|
|
continue;
|
|
|
|
|
phys_name = TYPE_FN_FIELD_PHYSNAME (f, field_counter);
|
|
|
|
|
if (! is_constructor_name (phys_name))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* If this method is actually defined, include it in the
|
|
|
|
|
list. */
|
2007-03-28 02:12:15 +02:00
|
|
|
|
sym_arr[i1] = lookup_symbol_in_language (phys_name,
|
2003-06-03 04:56:04 +02:00
|
|
|
|
NULL, VAR_DOMAIN,
|
2007-03-28 02:12:15 +02:00
|
|
|
|
language,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
(int *) NULL);
|
2003-06-03 04:56:04 +02:00
|
|
|
|
if (sym_arr[i1])
|
|
|
|
|
i1++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return i1;
|
|
|
|
|
}
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
/* Helper function for decode_line_1.
|
|
|
|
|
Build a canonical line spec in CANONICAL if it is non-NULL and if
|
|
|
|
|
the SAL has a symtab.
|
|
|
|
|
If SYMNAME is non-NULL the canonical line spec is `filename:symname'.
|
|
|
|
|
If SYMNAME is NULL the line number from SAL is used and the canonical
|
|
|
|
|
line spec is `filename:linenum'. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
build_canonical_line_spec (struct symtab_and_line *sal, char *symname,
|
|
|
|
|
char ***canonical)
|
|
|
|
|
{
|
|
|
|
|
char **canonical_arr;
|
|
|
|
|
char *canonical_name;
|
|
|
|
|
char *filename;
|
|
|
|
|
struct symtab *s = sal->symtab;
|
|
|
|
|
|
|
|
|
|
if (s == (struct symtab *) NULL
|
|
|
|
|
|| s->filename == (char *) NULL
|
|
|
|
|
|| canonical == (char ***) NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
canonical_arr = (char **) xmalloc (sizeof (char *));
|
|
|
|
|
*canonical = canonical_arr;
|
|
|
|
|
|
|
|
|
|
filename = s->filename;
|
|
|
|
|
if (symname != NULL)
|
|
|
|
|
{
|
|
|
|
|
canonical_name = xmalloc (strlen (filename) + strlen (symname) + 2);
|
|
|
|
|
sprintf (canonical_name, "%s:%s", filename, symname);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
canonical_name = xmalloc (strlen (filename) + 30);
|
|
|
|
|
sprintf (canonical_name, "%s:%d", filename, sal->line);
|
|
|
|
|
}
|
|
|
|
|
canonical_arr[0] = canonical_name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Find an instance of the character C in the string S that is outside
|
|
|
|
|
of all parenthesis pairs, single-quoted strings, and double-quoted
|
2002-05-10 02:29:23 +02:00
|
|
|
|
strings. Also, ignore the char within a template name, like a ','
|
|
|
|
|
within foo<int, int>. */
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
static char *
|
|
|
|
|
find_toplevel_char (char *s, char c)
|
|
|
|
|
{
|
|
|
|
|
int quoted = 0; /* zero if we're not in quotes;
|
|
|
|
|
'"' if we're in a double-quoted string;
|
|
|
|
|
'\'' if we're in a single-quoted string. */
|
2003-01-14 21:48:50 +01:00
|
|
|
|
int depth = 0; /* Number of unclosed parens we've seen. */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
char *scan;
|
|
|
|
|
|
|
|
|
|
for (scan = s; *scan; scan++)
|
|
|
|
|
{
|
|
|
|
|
if (quoted)
|
|
|
|
|
{
|
|
|
|
|
if (*scan == quoted)
|
|
|
|
|
quoted = 0;
|
|
|
|
|
else if (*scan == '\\' && *(scan + 1))
|
|
|
|
|
scan++;
|
|
|
|
|
}
|
|
|
|
|
else if (*scan == c && ! quoted && depth == 0)
|
|
|
|
|
return scan;
|
|
|
|
|
else if (*scan == '"' || *scan == '\'')
|
|
|
|
|
quoted = *scan;
|
2002-05-10 02:29:23 +02:00
|
|
|
|
else if (*scan == '(' || *scan == '<')
|
2000-11-11 00:02:56 +01:00
|
|
|
|
depth++;
|
2002-05-10 02:29:23 +02:00
|
|
|
|
else if ((*scan == ')' || *scan == '>') && depth > 0)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
depth--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-02 05:59:40 +02:00
|
|
|
|
/* Determines if the gives string corresponds to an Objective-C method
|
|
|
|
|
representation, such as -[Foo bar:] or +[Foo bar]. Objective-C symbols
|
|
|
|
|
are allowed to have spaces and parentheses in them. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
is_objc_method_format (const char *s)
|
|
|
|
|
{
|
|
|
|
|
if (s == NULL || *s == '\0')
|
|
|
|
|
return 0;
|
|
|
|
|
/* Handle arguments with the format FILENAME:SYMBOL. */
|
|
|
|
|
if ((s[0] == ':') && (strchr ("+-", s[1]) != NULL)
|
|
|
|
|
&& (s[2] == '[') && strchr(s, ']'))
|
|
|
|
|
return 1;
|
|
|
|
|
/* Handle arguments that are just SYMBOL. */
|
|
|
|
|
else if ((strchr ("+-", s[0]) != NULL) && (s[1] == '[') && strchr(s, ']'))
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
/* Given a list of NELTS symbols in SYM_ARR, return a list of lines to
|
|
|
|
|
operate on (ask user if necessary).
|
|
|
|
|
If CANONICAL is non-NULL return a corresponding array of mangled names
|
|
|
|
|
as canonical line specs there. */
|
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
decode_line_2 (struct symbol *sym_arr[], int nelts, int funfirstline,
|
|
|
|
|
char ***canonical)
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines values, return_values;
|
|
|
|
|
char *args, *arg1;
|
|
|
|
|
int i;
|
|
|
|
|
char *prompt;
|
|
|
|
|
char *symname;
|
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
char **canonical_arr = (char **) NULL;
|
2008-04-03 23:39:16 +02:00
|
|
|
|
const char *select_mode = multiple_symbols_select_mode ();
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2008-04-03 23:39:16 +02:00
|
|
|
|
if (select_mode == multiple_symbols_cancel)
|
|
|
|
|
error (_("\
|
|
|
|
|
canceled because the command is ambiguous\n\
|
|
|
|
|
See set/show multiple-symbol."));
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
values.sals = (struct symtab_and_line *)
|
|
|
|
|
alloca (nelts * sizeof (struct symtab_and_line));
|
|
|
|
|
return_values.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (nelts * sizeof (struct symtab_and_line));
|
2000-12-15 02:01:51 +01:00
|
|
|
|
old_chain = make_cleanup (xfree, return_values.sals);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
if (canonical)
|
|
|
|
|
{
|
|
|
|
|
canonical_arr = (char **) xmalloc (nelts * sizeof (char *));
|
2000-12-15 02:01:51 +01:00
|
|
|
|
make_cleanup (xfree, canonical_arr);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
memset (canonical_arr, 0, nelts * sizeof (char *));
|
|
|
|
|
*canonical = canonical_arr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
while (i < nelts)
|
|
|
|
|
{
|
2003-01-14 21:48:50 +01:00
|
|
|
|
init_sal (&return_values.sals[i]); /* Initialize to zeroes. */
|
2002-10-24 23:02:53 +02:00
|
|
|
|
init_sal (&values.sals[i]);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
if (sym_arr[i] && SYMBOL_CLASS (sym_arr[i]) == LOC_BLOCK)
|
2008-04-03 23:39:16 +02:00
|
|
|
|
values.sals[i] = find_function_start_sal (sym_arr[i], funfirstline);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-03 23:39:16 +02:00
|
|
|
|
/* If select_mode is "all", then do not print the multiple-choice
|
|
|
|
|
menu and act as if the user had chosen choice "1" (all). */
|
2008-04-19 08:09:37 +02:00
|
|
|
|
if (select_mode == multiple_symbols_all
|
|
|
|
|
|| ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ())))
|
2008-04-03 23:39:16 +02:00
|
|
|
|
args = "1";
|
|
|
|
|
else
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
2008-04-03 23:39:16 +02:00
|
|
|
|
i = 0;
|
|
|
|
|
printf_unfiltered (_("[0] cancel\n[1] all\n"));
|
|
|
|
|
while (i < nelts)
|
|
|
|
|
{
|
|
|
|
|
if (sym_arr[i] && SYMBOL_CLASS (sym_arr[i]) == LOC_BLOCK)
|
|
|
|
|
{
|
|
|
|
|
if (values.sals[i].symtab)
|
|
|
|
|
printf_unfiltered ("[%d] %s at %s:%d\n",
|
|
|
|
|
(i + 2),
|
|
|
|
|
SYMBOL_PRINT_NAME (sym_arr[i]),
|
|
|
|
|
values.sals[i].symtab->filename,
|
|
|
|
|
values.sals[i].line);
|
|
|
|
|
else
|
|
|
|
|
printf_unfiltered (_("[%d] %s at ?FILE:%d [No symtab? Probably broken debug info...]\n"),
|
|
|
|
|
(i + 2),
|
|
|
|
|
SYMBOL_PRINT_NAME (sym_arr[i]),
|
|
|
|
|
values.sals[i].line);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
printf_unfiltered (_("?HERE\n"));
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prompt = getenv ("PS2");
|
|
|
|
|
if (prompt == NULL)
|
|
|
|
|
{
|
|
|
|
|
prompt = "> ";
|
|
|
|
|
}
|
|
|
|
|
args = command_line_input (prompt, 0, "overload-choice");
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (args == 0 || *args == 0)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 19:13:55 +01:00
|
|
|
|
error_no_arg (_("one or more choice numbers"));
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
while (*args)
|
|
|
|
|
{
|
|
|
|
|
int num;
|
|
|
|
|
|
|
|
|
|
arg1 = args;
|
|
|
|
|
while (*arg1 >= '0' && *arg1 <= '9')
|
|
|
|
|
arg1++;
|
|
|
|
|
if (*arg1 && *arg1 != ' ' && *arg1 != '\t')
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("Arguments must be choice numbers."));
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
num = atoi (args);
|
|
|
|
|
|
|
|
|
|
if (num == 0)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("canceled"));
|
2000-11-11 00:02:56 +01:00
|
|
|
|
else if (num == 1)
|
|
|
|
|
{
|
|
|
|
|
if (canonical_arr)
|
|
|
|
|
{
|
|
|
|
|
for (i = 0; i < nelts; i++)
|
|
|
|
|
{
|
|
|
|
|
if (canonical_arr[i] == NULL)
|
|
|
|
|
{
|
* ax-gdb.c (gen_var_ref): Use SYMBOL_LINKAGE_NAME.
* blockframe.c (find_pc_partial_function): Likewise.
* buildsym.c (find_symbol_in_list): Likewise.
* c-valprint.c (c_val_print): Likewise.
* coffread.c (patch_opaque_types, process_coff_symbol): Likewise.
(coff_read_enum_type): Likewise. Use SYMBOL_SET_LINKAGE_NAME.
* cp-support.c (cp_remove_params): Renamed from remove_params and
made global.
(overload_list_add_symbol): Update call to remove_params.
* cp-support.h (cp_remove_params): Declare.
* dwarf2read.c (process_enumeration_scope): Use SYMBOL_LINKAGE_NAME.
(dwarf2_const_value): Use SYMBOL_PRINT_NAME.
* expprint.c (dump_subexp_body_standard): Likewise.
* f-valprint.c (info_common_command, there_is_a_visible_common_named):
Use SYMBOL_LINKAGE_NAME to find symbols and SYMBOL_PRINT_NAME
for messages.
* findvar.c (read_var_value): Use SYMBOL_LINKAGE_NAME.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Likewise.
* hppa-hpux-tdep.c (hppa32_hpux_in_solib_call_trampoline)
(hppa_hpux_skip_trampoline_code): Use SYMBOL_LINKAGE_NAME to find
symbols and SYMBOL_PRINT_NAME for messages.
* jv-lang.c (add_class_symbol): Use SYMBOL_SET_LINKAGE_NAME.
* linespec.c (decode_line_2): Use SYMBOL_LINKAGE_NAME.
* mdebugread.c (parse_symbol): Use SYMBOL_LINKAGE_NAME and
SYMBOL_SET_LINKAGE_NAME.
(mylookup_symbol): Use SYMBOL_LINKAGE_NAME.
* minsyms.c (add_minsym_to_demangled_hash_table): Use
SYMBOL_SEARCH_NAME.
(lookup_minimal_symbol): Use SYMBOL_LINKAGE_NAME or
SYMBOL_MATCHES_SEARCH_NAME, depending on the pass.
* objfiles.h (ALL_OBJFILE_MSYMBOLS): Use SYMBOL_LINKAGE_NAME.
* printcmd.c (build_address_symbolic): Use SYMBOL_LINKAGE_NAME.
(address_info): Use SYMBOL_PRINT_NAME for messages and
SYMBOL_LINKAGE_NAME for lookups.
* sol-thread.c (info_cb): Use SYMBOL_PRINT_NAME for messages.
* stabsread.c (patch_block_stabs, define_symbol)
(read_type, read_enum_type, common_block_end)
(cleanup_undefined_types_1, scan_file_globals): Use
SYMBOL_LINKAGE_NAME, SYMBOL_SET_LINKAGE_NAME, ALL_OBJFILE_MSYMBOLS,
and SYMBOL_PRINT_NAME.
* stack.c (print_frame_args): Use SYMBOL_LINKAGE_NAME.
(print_frame, frame_info): Use SYMBOL_PRINT_NAME for output. Use
cp_remove_params instead of cplus_demangle.
(print_block_frame_labels, print_frame_arg_vars): Use
SYMBOL_LINKAGE_NAME.
* symmisc.c (dump_msymbols): Use ALL_OBJFILE_MSYMBOLS and
SYMBOL_LINKAGE_NAME.
(dump_symtab_1, print_symbol, print_partial_symbols)
(maintenance_check_symtabs): Use SYMBOL_LINKAGE_NAME.
* symtab.h (DEPRECATED_SYMBOL_NAME): Delete.
(SYMBOL_SET_LINKAGE_NAME): New.
(SYMBOL_SET_NAMES): Add a comment.
* tracepoint.c (set_traceframe_context, validate_actionline)
(collect_symbol, scope_info): Use SYMBOL_LINKAGE_NAME for
lookups and SYMBOL_PRINT_NAME for output.
* typeprint.c (typedef_print): Use SYMBOL_LINKAGE_NAME.
* xcoffread.c (process_xcoff_symbol): Use SYMBOL_SET_LINKAGE_NAME.
2008-08-21 20:14:39 +02:00
|
|
|
|
symname = SYMBOL_LINKAGE_NAME (sym_arr[i]);
|
gdb/
Replace the savestring calls by xstrdup calls where possible.
* breakpoint.c (condition_command, set_raw_breakpoint)
(create_catchpoint, update_breakpoint_locations): Replace the
savestring calls by xstrdup calls where possible.
* buildsym.c (start_subfile, patch_subfile_names, record_debugformat)
(record_producer): Likewise.
* coffread.c (coff_start_symtab, complete_symtab): Likewise.
* corefile.c (set_gnutarget): Likewise.
* dbxread.c (add_new_header_file): Likewise.
* demangle.c (set_demangling_command, set_demangling_style): Likewise.
* event-top.c (push_prompt, pop_prompt, command_line_handler)
(set_async_prompt): Likewise.
* infcmd.c (set_inferior_io_terminal, attach_command_post_wait):
Likewise.
* language.c (set_language_command, _initialize_language): Likewise.
* linespec.c (decode_line_2): Likewise.
* rs6000-nat.c (add_vmap): Likewise.
* top.c (set_prompt, init_history, init_main): Likewise.
* tracepoint.c (stringify_collection_list): Likewise.
* varobj.c (varobj_create): Remove variable expr_len. Replace the
savestring calls by xstrdup calls where possible.
(value_of_root, c_name_of_variable, c_describe_child): Replace the
savestring calls by xstrdup calls where possible.
* xcoffread.c (complete_symtab): Likewise.
* cli/cli-script.c (build_command_line, define_command): Likewise.
* cli/cli-setshow.c (do_setshow_command): Likewise.
2009-05-23 18:17:18 +02:00
|
|
|
|
canonical_arr[i] = xstrdup (symname);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
memcpy (return_values.sals, values.sals,
|
|
|
|
|
(nelts * sizeof (struct symtab_and_line)));
|
|
|
|
|
return_values.nelts = nelts;
|
|
|
|
|
discard_cleanups (old_chain);
|
|
|
|
|
return return_values;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (num >= nelts + 2)
|
|
|
|
|
{
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 01:39:24 +01:00
|
|
|
|
printf_unfiltered (_("No choice number %d.\n"), num);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
num -= 2;
|
|
|
|
|
if (values.sals[num].pc)
|
|
|
|
|
{
|
|
|
|
|
if (canonical_arr)
|
|
|
|
|
{
|
* ax-gdb.c (gen_var_ref): Use SYMBOL_LINKAGE_NAME.
* blockframe.c (find_pc_partial_function): Likewise.
* buildsym.c (find_symbol_in_list): Likewise.
* c-valprint.c (c_val_print): Likewise.
* coffread.c (patch_opaque_types, process_coff_symbol): Likewise.
(coff_read_enum_type): Likewise. Use SYMBOL_SET_LINKAGE_NAME.
* cp-support.c (cp_remove_params): Renamed from remove_params and
made global.
(overload_list_add_symbol): Update call to remove_params.
* cp-support.h (cp_remove_params): Declare.
* dwarf2read.c (process_enumeration_scope): Use SYMBOL_LINKAGE_NAME.
(dwarf2_const_value): Use SYMBOL_PRINT_NAME.
* expprint.c (dump_subexp_body_standard): Likewise.
* f-valprint.c (info_common_command, there_is_a_visible_common_named):
Use SYMBOL_LINKAGE_NAME to find symbols and SYMBOL_PRINT_NAME
for messages.
* findvar.c (read_var_value): Use SYMBOL_LINKAGE_NAME.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Likewise.
* hppa-hpux-tdep.c (hppa32_hpux_in_solib_call_trampoline)
(hppa_hpux_skip_trampoline_code): Use SYMBOL_LINKAGE_NAME to find
symbols and SYMBOL_PRINT_NAME for messages.
* jv-lang.c (add_class_symbol): Use SYMBOL_SET_LINKAGE_NAME.
* linespec.c (decode_line_2): Use SYMBOL_LINKAGE_NAME.
* mdebugread.c (parse_symbol): Use SYMBOL_LINKAGE_NAME and
SYMBOL_SET_LINKAGE_NAME.
(mylookup_symbol): Use SYMBOL_LINKAGE_NAME.
* minsyms.c (add_minsym_to_demangled_hash_table): Use
SYMBOL_SEARCH_NAME.
(lookup_minimal_symbol): Use SYMBOL_LINKAGE_NAME or
SYMBOL_MATCHES_SEARCH_NAME, depending on the pass.
* objfiles.h (ALL_OBJFILE_MSYMBOLS): Use SYMBOL_LINKAGE_NAME.
* printcmd.c (build_address_symbolic): Use SYMBOL_LINKAGE_NAME.
(address_info): Use SYMBOL_PRINT_NAME for messages and
SYMBOL_LINKAGE_NAME for lookups.
* sol-thread.c (info_cb): Use SYMBOL_PRINT_NAME for messages.
* stabsread.c (patch_block_stabs, define_symbol)
(read_type, read_enum_type, common_block_end)
(cleanup_undefined_types_1, scan_file_globals): Use
SYMBOL_LINKAGE_NAME, SYMBOL_SET_LINKAGE_NAME, ALL_OBJFILE_MSYMBOLS,
and SYMBOL_PRINT_NAME.
* stack.c (print_frame_args): Use SYMBOL_LINKAGE_NAME.
(print_frame, frame_info): Use SYMBOL_PRINT_NAME for output. Use
cp_remove_params instead of cplus_demangle.
(print_block_frame_labels, print_frame_arg_vars): Use
SYMBOL_LINKAGE_NAME.
* symmisc.c (dump_msymbols): Use ALL_OBJFILE_MSYMBOLS and
SYMBOL_LINKAGE_NAME.
(dump_symtab_1, print_symbol, print_partial_symbols)
(maintenance_check_symtabs): Use SYMBOL_LINKAGE_NAME.
* symtab.h (DEPRECATED_SYMBOL_NAME): Delete.
(SYMBOL_SET_LINKAGE_NAME): New.
(SYMBOL_SET_NAMES): Add a comment.
* tracepoint.c (set_traceframe_context, validate_actionline)
(collect_symbol, scope_info): Use SYMBOL_LINKAGE_NAME for
lookups and SYMBOL_PRINT_NAME for output.
* typeprint.c (typedef_print): Use SYMBOL_LINKAGE_NAME.
* xcoffread.c (process_xcoff_symbol): Use SYMBOL_SET_LINKAGE_NAME.
2008-08-21 20:14:39 +02:00
|
|
|
|
symname = SYMBOL_LINKAGE_NAME (sym_arr[num]);
|
2000-12-15 02:01:51 +01:00
|
|
|
|
make_cleanup (xfree, symname);
|
gdb/
Replace the savestring calls by xstrdup calls where possible.
* breakpoint.c (condition_command, set_raw_breakpoint)
(create_catchpoint, update_breakpoint_locations): Replace the
savestring calls by xstrdup calls where possible.
* buildsym.c (start_subfile, patch_subfile_names, record_debugformat)
(record_producer): Likewise.
* coffread.c (coff_start_symtab, complete_symtab): Likewise.
* corefile.c (set_gnutarget): Likewise.
* dbxread.c (add_new_header_file): Likewise.
* demangle.c (set_demangling_command, set_demangling_style): Likewise.
* event-top.c (push_prompt, pop_prompt, command_line_handler)
(set_async_prompt): Likewise.
* infcmd.c (set_inferior_io_terminal, attach_command_post_wait):
Likewise.
* language.c (set_language_command, _initialize_language): Likewise.
* linespec.c (decode_line_2): Likewise.
* rs6000-nat.c (add_vmap): Likewise.
* top.c (set_prompt, init_history, init_main): Likewise.
* tracepoint.c (stringify_collection_list): Likewise.
* varobj.c (varobj_create): Remove variable expr_len. Replace the
savestring calls by xstrdup calls where possible.
(value_of_root, c_name_of_variable, c_describe_child): Replace the
savestring calls by xstrdup calls where possible.
* xcoffread.c (complete_symtab): Likewise.
* cli/cli-script.c (build_command_line, define_command): Likewise.
* cli/cli-setshow.c (do_setshow_command): Likewise.
2009-05-23 18:17:18 +02:00
|
|
|
|
canonical_arr[i] = xstrdup (symname);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
return_values.sals[i++] = values.sals[num];
|
|
|
|
|
values.sals[num].pc = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 01:39:24 +01:00
|
|
|
|
printf_unfiltered (_("duplicate request for %d ignored.\n"), num);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
args = arg1;
|
|
|
|
|
while (*args == ' ' || *args == '\t')
|
|
|
|
|
args++;
|
|
|
|
|
}
|
|
|
|
|
return_values.nelts = i;
|
|
|
|
|
discard_cleanups (old_chain);
|
|
|
|
|
return return_values;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The parser of linespec itself. */
|
|
|
|
|
|
|
|
|
|
/* Parse a string that specifies a line number.
|
|
|
|
|
Pass the address of a char * variable; that variable will be
|
|
|
|
|
advanced over the characters actually parsed.
|
|
|
|
|
|
|
|
|
|
The string can be:
|
|
|
|
|
|
|
|
|
|
LINENUM -- that line number in current file. PC returned is 0.
|
|
|
|
|
FILE:LINENUM -- that line in that file. PC returned is 0.
|
|
|
|
|
FUNCTION -- line number of openbrace of that function.
|
|
|
|
|
PC returned is the start of the function.
|
|
|
|
|
VARIABLE -- line number of definition of that variable.
|
|
|
|
|
PC returned is 0.
|
|
|
|
|
FILE:FUNCTION -- likewise, but prefer functions in that file.
|
|
|
|
|
*EXPR -- line in which address EXPR appears.
|
|
|
|
|
|
|
|
|
|
This may all be followed by an "if EXPR", which we ignore.
|
|
|
|
|
|
|
|
|
|
FUNCTION may be an undebuggable function found in minimal symbol table.
|
|
|
|
|
|
|
|
|
|
If the argument FUNFIRSTLINE is nonzero, we want the first line
|
|
|
|
|
of real code inside a function when a function is specified, and it is
|
|
|
|
|
not OK to specify a variable or type to get its line number.
|
|
|
|
|
|
|
|
|
|
DEFAULT_SYMTAB specifies the file to use if none is specified.
|
|
|
|
|
It defaults to current_source_symtab.
|
|
|
|
|
DEFAULT_LINE specifies the line number to use for relative
|
|
|
|
|
line numbers (that start with signs). Defaults to current_source_line.
|
|
|
|
|
If CANONICAL is non-NULL, store an array of strings containing the canonical
|
|
|
|
|
line specs there if necessary. Currently overloaded member functions and
|
|
|
|
|
line numbers or static functions without a filename yield a canonical
|
|
|
|
|
line spec. The array and the line spec strings are allocated on the heap,
|
|
|
|
|
it is the callers responsibility to free them.
|
|
|
|
|
|
|
|
|
|
Note that it is possible to return zero for the symtab
|
|
|
|
|
if no file is validly specified. Callers must check that.
|
2003-12-17 22:47:47 +01:00
|
|
|
|
Also, the line number returned may be invalid.
|
|
|
|
|
|
|
|
|
|
If NOT_FOUND_PTR is not null, store a boolean true/false value at the location, based
|
|
|
|
|
on whether or not failure occurs due to an unknown function or file. In the case
|
|
|
|
|
where failure does occur due to an unknown function or file, do not issue an error
|
|
|
|
|
message. */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
/* We allow single quotes in various places. This is a hideous
|
|
|
|
|
kludge, which exists because the completer can't yet deal with the
|
|
|
|
|
lack of single quotes. FIXME: write a linespec_completer which we
|
|
|
|
|
can use as appropriate instead of make_symbol_completion_list. */
|
|
|
|
|
|
|
|
|
|
struct symtabs_and_lines
|
|
|
|
|
decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
|
2003-12-17 22:47:47 +01:00
|
|
|
|
int default_line, char ***canonical, int *not_found_ptr)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
2002-12-09 20:49:00 +01:00
|
|
|
|
char *p;
|
2002-12-05 23:25:49 +01:00
|
|
|
|
char *q;
|
2003-01-11 02:01:04 +01:00
|
|
|
|
/* If a file name is specified, this is its symtab. */
|
|
|
|
|
struct symtab *file_symtab = NULL;
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
char *copy;
|
2002-11-12 00:20:07 +01:00
|
|
|
|
/* This is NULL if there are no parens in *ARGPTR, or a pointer to
|
|
|
|
|
the closing parenthesis if there are parens. */
|
|
|
|
|
char *paren_pointer;
|
|
|
|
|
/* This says whether or not something in *ARGPTR is quoted with
|
|
|
|
|
completer_quotes (i.e. with single quotes). */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
int is_quoted;
|
2002-11-15 22:55:16 +01:00
|
|
|
|
/* Is part of *ARGPTR is enclosed in double quotes? */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
int is_quote_enclosed;
|
2003-04-27 05:23:38 +02:00
|
|
|
|
int is_objc_method = 0;
|
2000-11-11 00:02:56 +01:00
|
|
|
|
char *saved_arg = *argptr;
|
|
|
|
|
|
2003-12-17 22:47:47 +01:00
|
|
|
|
if (not_found_ptr)
|
|
|
|
|
*not_found_ptr = 0;
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
/* Defaults have defaults. */
|
|
|
|
|
|
2002-11-11 22:18:55 +01:00
|
|
|
|
initialize_defaults (&default_symtab, &default_line);
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* See if arg is *PC. */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
if (**argptr == '*')
|
2002-11-11 22:18:55 +01:00
|
|
|
|
return decode_indirect (argptr);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Set various flags. 'paren_pointer' is important for overload
|
|
|
|
|
checking, where we allow things like:
|
|
|
|
|
(gdb) break c::f(int)
|
|
|
|
|
*/
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2002-11-12 00:20:07 +01:00
|
|
|
|
set_flags (*argptr, &is_quoted, &paren_pointer);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2002-11-15 22:55:16 +01:00
|
|
|
|
/* Check to see if it's a multipart linespec (with colons or
|
|
|
|
|
periods). */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2004-02-09 23:29:21 +01:00
|
|
|
|
/* Locate the end of the first half of the linespec.
|
|
|
|
|
After the call, for instance, if the argptr string is "foo.c:123"
|
|
|
|
|
p will point at "123". If there is only one part, like "foo", p
|
|
|
|
|
will point to "". If this is a C++ name, like "A::B::foo", p will
|
|
|
|
|
point to "::B::foo". Argptr is not changed by this call. */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2002-11-15 22:55:16 +01:00
|
|
|
|
p = locate_first_half (argptr, &is_quote_enclosed);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2003-04-27 05:23:38 +02:00
|
|
|
|
/* Check if this is an Objective-C method (anything that starts with
|
|
|
|
|
a '+' or '-' and a '['). */
|
2003-08-02 05:59:40 +02:00
|
|
|
|
if (is_objc_method_format (p))
|
2003-04-27 05:23:38 +02:00
|
|
|
|
{
|
|
|
|
|
is_objc_method = 1;
|
|
|
|
|
paren_pointer = NULL; /* Just a category name. Ignore it. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check if the symbol could be an Objective-C selector. */
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines values;
|
|
|
|
|
values = decode_objc (argptr, funfirstline, NULL,
|
|
|
|
|
canonical, saved_arg);
|
|
|
|
|
if (values.sals != NULL)
|
|
|
|
|
return values;
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-15 22:55:16 +01:00
|
|
|
|
/* Does it look like there actually were two parts? */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2002-11-12 00:20:07 +01:00
|
|
|
|
if ((p[0] == ':' || p[0] == '.') && paren_pointer == NULL)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
|
|
|
|
if (is_quoted)
|
|
|
|
|
*argptr = *argptr + 1;
|
2002-12-09 20:49:00 +01:00
|
|
|
|
|
2004-02-09 23:29:21 +01:00
|
|
|
|
/* Is it a C++ or Java compound data structure?
|
|
|
|
|
The check on p[1] == ':' is capturing the case of "::",
|
|
|
|
|
since p[0]==':' was checked above.
|
|
|
|
|
Note that the call to decode_compound does everything
|
|
|
|
|
for us, including the lookup on the symbol table, so we
|
|
|
|
|
can return now. */
|
|
|
|
|
|
2000-11-11 00:02:56 +01:00
|
|
|
|
if (p[0] == '.' || p[1] == ':')
|
2002-12-05 23:25:49 +01:00
|
|
|
|
return decode_compound (argptr, funfirstline, canonical,
|
|
|
|
|
saved_arg, p);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2008-05-15 21:24:46 +02:00
|
|
|
|
/* No, the first part is a filename; set file_symtab to be that file's
|
2002-12-09 20:49:00 +01:00
|
|
|
|
symtab. Also, move argptr past the filename. */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2003-12-17 22:47:47 +01:00
|
|
|
|
file_symtab = symtab_from_filename (argptr, p, is_quote_enclosed,
|
|
|
|
|
not_found_ptr);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
#if 0
|
|
|
|
|
/* No one really seems to know why this was added. It certainly
|
|
|
|
|
breaks the command line, though, whenever the passed
|
|
|
|
|
name is of the form ClassName::Method. This bit of code
|
|
|
|
|
singles out the class name, and if funfirstline is set (for
|
|
|
|
|
example, you are setting a breakpoint at this function),
|
|
|
|
|
you get an error. This did not occur with earlier
|
|
|
|
|
verions, so I am ifdef'ing this out. 3/29/99 */
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Check if what we have till now is a symbol name */
|
|
|
|
|
|
|
|
|
|
/* We may be looking at a template instantiation such
|
|
|
|
|
as "foo<int>". Check here whether we know about it,
|
|
|
|
|
instead of falling through to the code below which
|
|
|
|
|
handles ordinary function names, because that code
|
|
|
|
|
doesn't like seeing '<' and '>' in a name -- the
|
|
|
|
|
skip_quoted call doesn't go past them. So see if we
|
|
|
|
|
can figure it out right now. */
|
|
|
|
|
|
|
|
|
|
copy = (char *) alloca (p - *argptr + 1);
|
|
|
|
|
memcpy (copy, *argptr, p - *argptr);
|
|
|
|
|
copy[p - *argptr] = '\000';
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
sym = lookup_symbol (copy, 0, VAR_DOMAIN, 0);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
if (sym)
|
|
|
|
|
{
|
|
|
|
|
*argptr = (*p == '\'') ? p + 1 : p;
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
return symbol_found (funfirstline, canonical, copy, sym, NULL);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
/* Otherwise fall out from here and go to file/line spec
|
|
|
|
|
processing, etc. */
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-05-15 21:24:46 +02:00
|
|
|
|
/* file_symtab is specified file's symtab, or 0 if no file specified.
|
2000-11-11 00:02:56 +01:00
|
|
|
|
arg no longer contains the file name. */
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Check whether arg is all digits (and sign). */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
q = *argptr;
|
|
|
|
|
if (*q == '-' || *q == '+')
|
|
|
|
|
q++;
|
|
|
|
|
while (*q >= '0' && *q <= '9')
|
|
|
|
|
q++;
|
|
|
|
|
|
|
|
|
|
if (q != *argptr && (*q == 0 || *q == ' ' || *q == '\t' || *q == ','))
|
2002-12-19 19:56:14 +01:00
|
|
|
|
/* We found a token consisting of all digits -- at least one digit. */
|
|
|
|
|
return decode_all_digits (argptr, default_symtab, default_line,
|
2003-01-11 02:01:04 +01:00
|
|
|
|
canonical, file_symtab, q);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
/* Arg token is not digits => try it as a variable name
|
|
|
|
|
Find the next token (everything up to end or next whitespace). */
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
if (**argptr == '$') /* May be a convenience variable. */
|
|
|
|
|
/* One or two $ chars possible. */
|
|
|
|
|
p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1));
|
2000-11-11 00:02:56 +01:00
|
|
|
|
else if (is_quoted)
|
|
|
|
|
{
|
|
|
|
|
p = skip_quoted (*argptr);
|
|
|
|
|
if (p[-1] != '\'')
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("Unmatched single quote."));
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
2003-04-27 05:23:38 +02:00
|
|
|
|
else if (is_objc_method)
|
|
|
|
|
{
|
|
|
|
|
/* allow word separators in method names for Obj-C */
|
|
|
|
|
p = skip_quoted_chars (*argptr, NULL, "");
|
|
|
|
|
}
|
2002-11-12 00:20:07 +01:00
|
|
|
|
else if (paren_pointer != NULL)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
2002-11-12 00:20:07 +01:00
|
|
|
|
p = paren_pointer + 1;
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
p = skip_quoted (*argptr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
copy = (char *) alloca (p - *argptr + 1);
|
|
|
|
|
memcpy (copy, *argptr, p - *argptr);
|
|
|
|
|
copy[p - *argptr] = '\0';
|
|
|
|
|
if (p != *argptr
|
|
|
|
|
&& copy[0]
|
|
|
|
|
&& copy[0] == copy[p - *argptr - 1]
|
2000-11-30 Fernando Nasser <fnasser@redhat.com>
* linespec.h: New file. Declarations for linespec.c.
* linespec.c, alpha-tdep.c, breakpoint.c, parse.c, source.c,
symtab.c, tracepoint.c: Include the above.
* completer.c: New file. Line completion stuff for GDB.
(get_gdb_completer_word_break_characters,
get_gdb_completer_quote_characters): New functions. Accessors for
useful completer internal data.
(filename_completer, line_completion_function, skip_quoted): Moved
here from top.c.
* completer.h: New file. Declarations for the above.
* linespec.c (decode_line_1): Use
get_gdb_completer_word_break_characters and
get_gdb_completer_quote_characters.
* top.c: Include completer.h.
(filename_completer, line_completion_function, skip_quoted):
Moved to completer.c.
* corefile.c, exec.c, source.c, symfile.c, linespec.c: Include
completer.h.
* Makefile.in (SFILES): Add completer.c.
(COMMON_OBS): Add completer.o.
(completer.o): New target.
(linespec.o, alpha-tdep.o, breakpoint.o, parse.o, source.o,
symtab.o, tracepoint.o): Add linespec.h to dependencies list.
(corefile.o, exec.o, source.o, symfile.o, linespec.o): Add completer.h
to dependencies list.
2000-12-01 01:43:47 +01:00
|
|
|
|
&& strchr (get_gdb_completer_quote_characters (), copy[0]) != NULL)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
|
|
|
|
copy[p - *argptr - 1] = '\0';
|
|
|
|
|
copy++;
|
|
|
|
|
}
|
|
|
|
|
while (*p == ' ' || *p == '\t')
|
|
|
|
|
p++;
|
|
|
|
|
*argptr = p;
|
|
|
|
|
|
|
|
|
|
/* If it starts with $: may be a legitimate variable or routine name
|
|
|
|
|
(e.g. HP-UX millicode routines such as $$dyncall), or it may
|
2003-01-14 21:48:50 +01:00
|
|
|
|
be history value, or it may be a convenience variable. */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
if (*copy == '$')
|
2003-01-07 18:05:49 +01:00
|
|
|
|
return decode_dollar (copy, funfirstline, default_symtab,
|
2003-01-11 02:01:04 +01:00
|
|
|
|
canonical, file_symtab);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
|
|
|
|
/* Look up that token as a variable.
|
|
|
|
|
If file specified, use that file's per-file block to start with. */
|
|
|
|
|
|
2003-12-17 22:47:47 +01:00
|
|
|
|
return decode_variable (copy, funfirstline, canonical,
|
|
|
|
|
file_symtab, not_found_ptr);
|
2002-11-08 20:16:17 +01:00
|
|
|
|
}
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2002-11-11 22:18:55 +01:00
|
|
|
|
|
|
|
|
|
|
2002-12-05 23:25:49 +01:00
|
|
|
|
/* Now, more helper functions for decode_line_1. Some conventions
|
|
|
|
|
that these functions follow:
|
|
|
|
|
|
|
|
|
|
Decode_line_1 typically passes along some of its arguments or local
|
|
|
|
|
variables to the subfunctions. It passes the variables by
|
|
|
|
|
reference if they are modified by the subfunction, and by value
|
|
|
|
|
otherwise.
|
|
|
|
|
|
|
|
|
|
Some of the functions have side effects that don't arise from
|
|
|
|
|
variables that are passed by reference. In particular, if a
|
|
|
|
|
function is passed ARGPTR as an argument, it modifies what ARGPTR
|
|
|
|
|
points to; typically, it advances *ARGPTR past whatever substring
|
|
|
|
|
it has just looked at. (If it doesn't modify *ARGPTR, then the
|
|
|
|
|
function gets passed *ARGPTR instead, which is then called ARG: see
|
|
|
|
|
set_flags, for example.) Also, functions that return a struct
|
|
|
|
|
symtabs_and_lines may modify CANONICAL, as in the description of
|
|
|
|
|
decode_line_1.
|
|
|
|
|
|
|
|
|
|
If a function returns a struct symtabs_and_lines, then that struct
|
|
|
|
|
will immediately make its way up the call chain to be returned by
|
|
|
|
|
decode_line_1. In particular, all of the functions decode_XXX
|
|
|
|
|
calculate the appropriate struct symtabs_and_lines, under the
|
|
|
|
|
assumption that their argument is of the form XXX. */
|
2002-11-11 22:18:55 +01:00
|
|
|
|
|
|
|
|
|
/* First, some functions to initialize stuff at the beggining of the
|
|
|
|
|
function. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
initialize_defaults (struct symtab **default_symtab, int *default_line)
|
|
|
|
|
{
|
|
|
|
|
if (*default_symtab == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Use whatever we have for the default source line. We don't use
|
|
|
|
|
get_current_or_default_symtab_and_line as it can recurse and call
|
|
|
|
|
us back! */
|
|
|
|
|
struct symtab_and_line cursal =
|
|
|
|
|
get_current_source_symtab_and_line ();
|
|
|
|
|
|
|
|
|
|
*default_symtab = cursal.symtab;
|
|
|
|
|
*default_line = cursal.line;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-12 00:20:07 +01:00
|
|
|
|
static void
|
|
|
|
|
set_flags (char *arg, int *is_quoted, char **paren_pointer)
|
|
|
|
|
{
|
|
|
|
|
char *ii;
|
|
|
|
|
int has_if = 0;
|
|
|
|
|
|
|
|
|
|
/* 'has_if' is for the syntax:
|
2003-01-14 21:48:50 +01:00
|
|
|
|
(gdb) break foo if (a==b)
|
|
|
|
|
*/
|
2002-11-12 00:20:07 +01:00
|
|
|
|
if ((ii = strstr (arg, " if ")) != NULL ||
|
|
|
|
|
(ii = strstr (arg, "\tif ")) != NULL ||
|
|
|
|
|
(ii = strstr (arg, " if\t")) != NULL ||
|
|
|
|
|
(ii = strstr (arg, "\tif\t")) != NULL ||
|
|
|
|
|
(ii = strstr (arg, " if(")) != NULL ||
|
|
|
|
|
(ii = strstr (arg, "\tif( ")) != NULL)
|
|
|
|
|
has_if = 1;
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Temporarily zap out "if (condition)" to not confuse the
|
|
|
|
|
parenthesis-checking code below. This is undone below. Do not
|
|
|
|
|
change ii!! */
|
2002-11-12 00:20:07 +01:00
|
|
|
|
if (has_if)
|
|
|
|
|
{
|
|
|
|
|
*ii = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*is_quoted = (*arg
|
|
|
|
|
&& strchr (get_gdb_completer_quote_characters (),
|
|
|
|
|
*arg) != NULL);
|
|
|
|
|
|
|
|
|
|
*paren_pointer = strchr (arg, '(');
|
|
|
|
|
if (*paren_pointer != NULL)
|
|
|
|
|
*paren_pointer = strrchr (*paren_pointer, ')');
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Now that we're safely past the paren_pointer check, put back " if
|
|
|
|
|
(condition)" so outer layers can see it. */
|
2002-11-12 00:20:07 +01:00
|
|
|
|
if (has_if)
|
|
|
|
|
*ii = ' ';
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-11 22:18:55 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Decode arg of the form *PC. */
|
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
decode_indirect (char **argptr)
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines values;
|
|
|
|
|
CORE_ADDR pc;
|
|
|
|
|
|
|
|
|
|
(*argptr)++;
|
|
|
|
|
pc = parse_and_eval_address_1 (argptr);
|
|
|
|
|
|
|
|
|
|
values.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (sizeof (struct symtab_and_line));
|
|
|
|
|
|
|
|
|
|
values.nelts = 1;
|
|
|
|
|
values.sals[0] = find_pc_line (pc, 0);
|
|
|
|
|
values.sals[0].pc = pc;
|
|
|
|
|
values.sals[0].section = find_pc_overlay (pc);
|
2007-09-24 09:40:32 +02:00
|
|
|
|
values.sals[0].explicit_pc = 1;
|
2002-11-11 22:18:55 +01:00
|
|
|
|
|
|
|
|
|
return values;
|
|
|
|
|
}
|
2002-11-08 20:16:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-11-15 22:55:16 +01:00
|
|
|
|
/* Locate the first half of the linespec, ending in a colon, period,
|
|
|
|
|
or whitespace. (More or less.) Also, check to see if *ARGPTR is
|
|
|
|
|
enclosed in double quotes; if so, set is_quote_enclosed, advance
|
2004-02-09 23:29:21 +01:00
|
|
|
|
ARGPTR past that and zero out the trailing double quote.
|
|
|
|
|
If ARGPTR is just a simple name like "main", p will point to ""
|
|
|
|
|
at the end. */
|
2002-11-15 22:55:16 +01:00
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
locate_first_half (char **argptr, int *is_quote_enclosed)
|
|
|
|
|
{
|
|
|
|
|
char *ii;
|
|
|
|
|
char *p, *p1;
|
|
|
|
|
int has_comma;
|
|
|
|
|
|
|
|
|
|
/* Maybe we were called with a line range FILENAME:LINENUM,FILENAME:LINENUM
|
|
|
|
|
and we must isolate the first half. Outer layers will call again later
|
|
|
|
|
for the second half.
|
|
|
|
|
|
|
|
|
|
Don't count commas that appear in argument lists of overloaded
|
|
|
|
|
functions, or in quoted strings. It's stupid to go to this much
|
|
|
|
|
trouble when the rest of the function is such an obvious roach hotel. */
|
|
|
|
|
ii = find_toplevel_char (*argptr, ',');
|
|
|
|
|
has_comma = (ii != 0);
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Temporarily zap out second half to not confuse the code below.
|
|
|
|
|
This is undone below. Do not change ii!! */
|
2002-11-15 22:55:16 +01:00
|
|
|
|
if (has_comma)
|
|
|
|
|
{
|
|
|
|
|
*ii = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Maybe arg is FILE : LINENUM or FILE : FUNCTION. May also be
|
|
|
|
|
CLASS::MEMBER, or NAMESPACE::NAME. Look for ':', but ignore
|
|
|
|
|
inside of <>. */
|
2002-11-15 22:55:16 +01:00
|
|
|
|
|
|
|
|
|
p = *argptr;
|
|
|
|
|
if (p[0] == '"')
|
|
|
|
|
{
|
|
|
|
|
*is_quote_enclosed = 1;
|
|
|
|
|
(*argptr)++;
|
|
|
|
|
p++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
*is_quote_enclosed = 0;
|
|
|
|
|
for (; *p; p++)
|
|
|
|
|
{
|
|
|
|
|
if (p[0] == '<')
|
|
|
|
|
{
|
|
|
|
|
char *temp_end = find_template_name_end (p);
|
|
|
|
|
if (!temp_end)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("malformed template specification in command"));
|
2002-11-15 22:55:16 +01:00
|
|
|
|
p = temp_end;
|
|
|
|
|
}
|
2003-04-27 05:23:38 +02:00
|
|
|
|
/* Check for a colon and a plus or minus and a [ (which
|
|
|
|
|
indicates an Objective-C method) */
|
2003-08-02 05:59:40 +02:00
|
|
|
|
if (is_objc_method_format (p))
|
2003-04-27 05:23:38 +02:00
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Check for the end of the first half of the linespec. End of
|
|
|
|
|
line, a tab, a double colon or the last single colon, or a
|
|
|
|
|
space. But if enclosed in double quotes we do not break on
|
|
|
|
|
enclosed spaces. */
|
2002-11-15 22:55:16 +01:00
|
|
|
|
if (!*p
|
|
|
|
|
|| p[0] == '\t'
|
|
|
|
|
|| ((p[0] == ':')
|
|
|
|
|
&& ((p[1] == ':') || (strchr (p + 1, ':') == NULL)))
|
|
|
|
|
|| ((p[0] == ' ') && !*is_quote_enclosed))
|
|
|
|
|
break;
|
2003-01-14 21:48:50 +01:00
|
|
|
|
if (p[0] == '.' && strchr (p, ':') == NULL)
|
2002-11-15 22:55:16 +01:00
|
|
|
|
{
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Java qualified method. Find the *last* '.', since the
|
|
|
|
|
others are package qualifiers. */
|
2002-11-15 22:55:16 +01:00
|
|
|
|
for (p1 = p; *p1; p1++)
|
|
|
|
|
{
|
|
|
|
|
if (*p1 == '.')
|
|
|
|
|
p = p1;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (p[0] == ' ' || p[0] == '\t')
|
|
|
|
|
p++;
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* If the closing double quote was left at the end, remove it. */
|
2002-11-15 22:55:16 +01:00
|
|
|
|
if (*is_quote_enclosed)
|
|
|
|
|
{
|
|
|
|
|
char *closing_quote = strchr (p - 1, '"');
|
|
|
|
|
if (closing_quote && closing_quote[1] == '\0')
|
|
|
|
|
*closing_quote = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Now that we've safely parsed the first half, put back ',' so
|
|
|
|
|
outer layers can see it. */
|
2002-11-15 22:55:16 +01:00
|
|
|
|
if (has_comma)
|
|
|
|
|
*ii = ',';
|
|
|
|
|
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-04-27 05:23:38 +02:00
|
|
|
|
/* Here's where we recognise an Objective-C Selector. An Objective C
|
|
|
|
|
selector may be implemented by more than one class, therefore it
|
|
|
|
|
may represent more than one method/function. This gives us a
|
|
|
|
|
situation somewhat analogous to C++ overloading. If there's more
|
|
|
|
|
than one method that could represent the selector, then use some of
|
|
|
|
|
the existing C++ code to let the user choose one. */
|
|
|
|
|
|
|
|
|
|
struct symtabs_and_lines
|
|
|
|
|
decode_objc (char **argptr, int funfirstline, struct symtab *file_symtab,
|
|
|
|
|
char ***canonical, char *saved_arg)
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines values;
|
|
|
|
|
struct symbol **sym_arr = NULL;
|
|
|
|
|
struct symbol *sym = NULL;
|
|
|
|
|
char *copy = NULL;
|
|
|
|
|
struct block *block = NULL;
|
2006-01-10 23:14:43 +01:00
|
|
|
|
unsigned i1 = 0;
|
|
|
|
|
unsigned i2 = 0;
|
2003-04-27 05:23:38 +02:00
|
|
|
|
|
|
|
|
|
values.sals = NULL;
|
|
|
|
|
values.nelts = 0;
|
|
|
|
|
|
|
|
|
|
if (file_symtab != NULL)
|
|
|
|
|
block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (file_symtab), STATIC_BLOCK);
|
|
|
|
|
else
|
2008-05-24 01:39:03 +02:00
|
|
|
|
{
|
|
|
|
|
enum language save_language;
|
|
|
|
|
|
|
|
|
|
/* get_selected_block can change the current language when there is
|
|
|
|
|
no selected frame yet. */
|
|
|
|
|
save_language = current_language->la_language;
|
|
|
|
|
block = get_selected_block (0);
|
|
|
|
|
set_language (save_language);
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-27 05:23:38 +02:00
|
|
|
|
copy = find_imps (file_symtab, block, *argptr, NULL, &i1, &i2);
|
|
|
|
|
|
|
|
|
|
if (i1 > 0)
|
|
|
|
|
{
|
|
|
|
|
sym_arr = (struct symbol **) alloca ((i1 + 1) * sizeof (struct symbol *));
|
2007-08-11 00:01:27 +02:00
|
|
|
|
sym_arr[i1] = NULL;
|
2003-04-27 05:23:38 +02:00
|
|
|
|
|
|
|
|
|
copy = find_imps (file_symtab, block, *argptr, sym_arr, &i1, &i2);
|
|
|
|
|
*argptr = copy;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* i1 now represents the TOTAL number of matches found.
|
|
|
|
|
i2 represents how many HIGH-LEVEL (struct symbol) matches,
|
|
|
|
|
which will come first in the sym_arr array. Any low-level
|
|
|
|
|
(minimal_symbol) matches will follow those. */
|
|
|
|
|
|
|
|
|
|
if (i1 == 1)
|
|
|
|
|
{
|
|
|
|
|
if (i2 > 0)
|
|
|
|
|
{
|
|
|
|
|
/* Already a struct symbol. */
|
|
|
|
|
sym = sym_arr[0];
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
sym = find_pc_function (SYMBOL_VALUE_ADDRESS (sym_arr[0]));
|
|
|
|
|
if ((sym != NULL) && strcmp (SYMBOL_LINKAGE_NAME (sym_arr[0]), SYMBOL_LINKAGE_NAME (sym)) != 0)
|
|
|
|
|
{
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
warning (_("debugging symbol \"%s\" does not match selector; ignoring"), SYMBOL_LINKAGE_NAME (sym));
|
2003-04-27 05:23:38 +02:00
|
|
|
|
sym = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
values.sals = (struct symtab_and_line *) xmalloc (sizeof (struct symtab_and_line));
|
|
|
|
|
values.nelts = 1;
|
|
|
|
|
|
|
|
|
|
if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
|
|
|
|
|
{
|
|
|
|
|
/* Canonicalize this, so it remains resolved for dylib loads. */
|
|
|
|
|
values.sals[0] = find_function_start_sal (sym, funfirstline);
|
|
|
|
|
build_canonical_line_spec (values.sals, SYMBOL_NATURAL_NAME (sym), canonical);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* The only match was a non-debuggable symbol. */
|
2007-08-11 00:01:27 +02:00
|
|
|
|
values.sals[0].symtab = NULL;
|
2003-04-27 05:23:38 +02:00
|
|
|
|
values.sals[0].line = 0;
|
|
|
|
|
values.sals[0].end = 0;
|
|
|
|
|
values.sals[0].pc = SYMBOL_VALUE_ADDRESS (sym_arr[0]);
|
|
|
|
|
}
|
|
|
|
|
return values;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i1 > 1)
|
|
|
|
|
{
|
|
|
|
|
/* More than one match. The user must choose one or more. */
|
|
|
|
|
return decode_line_2 (sym_arr, i2, funfirstline, canonical);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return values;
|
|
|
|
|
}
|
|
|
|
|
|
2002-12-05 23:25:49 +01:00
|
|
|
|
/* This handles C++ and Java compound data structures. P should point
|
2004-02-09 23:29:21 +01:00
|
|
|
|
at the first component separator, i.e. double-colon or period. As
|
|
|
|
|
an example, on entrance to this function we could have ARGPTR
|
|
|
|
|
pointing to "AAA::inA::fun" and P pointing to "::inA::fun". */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
decode_compound (char **argptr, int funfirstline, char ***canonical,
|
|
|
|
|
char *saved_arg, char *p)
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines values;
|
2003-02-04 22:24:21 +01:00
|
|
|
|
char *p2;
|
2002-12-05 23:25:49 +01:00
|
|
|
|
char *saved_arg2 = *argptr;
|
|
|
|
|
char *temp_end;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
char *copy;
|
|
|
|
|
struct symbol *sym_class;
|
|
|
|
|
struct symbol **sym_arr;
|
|
|
|
|
struct type *t;
|
|
|
|
|
|
2004-02-09 23:29:21 +01:00
|
|
|
|
/* First check for "global" namespace specification, of the form
|
|
|
|
|
"::foo". If found, skip over the colons and jump to normal
|
|
|
|
|
symbol processing. I.e. the whole line specification starts with
|
|
|
|
|
"::" (note the condition that *argptr == p). */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
if (p[0] == ':'
|
|
|
|
|
&& ((*argptr == p) || (p[-1] == ' ') || (p[-1] == '\t')))
|
|
|
|
|
saved_arg2 += 2;
|
|
|
|
|
|
2004-02-11 19:04:14 +01:00
|
|
|
|
/* Given our example "AAA::inA::fun", we have two cases to consider:
|
|
|
|
|
|
|
|
|
|
1) AAA::inA is the name of a class. In that case, presumably it
|
|
|
|
|
has a method called "fun"; we then look up that method using
|
|
|
|
|
find_method.
|
|
|
|
|
|
|
|
|
|
2) AAA::inA isn't the name of a class. In that case, either the
|
|
|
|
|
user made a typo or AAA::inA is the name of a namespace.
|
|
|
|
|
Either way, we just look up AAA::inA::fun with lookup_symbol.
|
|
|
|
|
|
|
|
|
|
Thus, our first task is to find everything before the last set of
|
|
|
|
|
double-colons and figure out if it's the name of a class. So we
|
|
|
|
|
first loop through all of the double-colons. */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
p2 = p; /* Save for restart. */
|
2004-02-09 23:29:21 +01:00
|
|
|
|
|
|
|
|
|
/* This is very messy. Following the example above we have now the
|
|
|
|
|
following pointers:
|
|
|
|
|
p -> "::inA::fun"
|
|
|
|
|
argptr -> "AAA::inA::fun
|
|
|
|
|
saved_arg -> "AAA::inA::fun
|
|
|
|
|
saved_arg2 -> "AAA::inA::fun
|
|
|
|
|
p2 -> "::inA::fun". */
|
|
|
|
|
|
|
|
|
|
/* In the loop below, with these strings, we'll make 2 passes, each
|
|
|
|
|
is marked in comments.*/
|
|
|
|
|
|
2002-12-05 23:25:49 +01:00
|
|
|
|
while (1)
|
|
|
|
|
{
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Move pointer up to next possible class/namespace token. */
|
2004-02-09 23:29:21 +01:00
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
p = p2 + 1; /* Restart with old value +1. */
|
2004-02-09 23:29:21 +01:00
|
|
|
|
|
|
|
|
|
/* PASS1: at this point p2->"::inA::fun", so p->":inA::fun",
|
|
|
|
|
i.e. if there is a double-colon, p will now point to the
|
|
|
|
|
second colon. */
|
2004-02-11 19:04:14 +01:00
|
|
|
|
/* PASS2: p2->"::fun", p->":fun" */
|
2004-02-09 23:29:21 +01:00
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Move pointer ahead to next double-colon. */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
while (*p && (p[0] != ' ') && (p[0] != '\t') && (p[0] != '\''))
|
|
|
|
|
{
|
|
|
|
|
if (p[0] == '<')
|
|
|
|
|
{
|
|
|
|
|
temp_end = find_template_name_end (p);
|
|
|
|
|
if (!temp_end)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("malformed template specification in command"));
|
2002-12-05 23:25:49 +01:00
|
|
|
|
p = temp_end;
|
|
|
|
|
}
|
2004-02-09 23:29:21 +01:00
|
|
|
|
/* Note that, since, at the start of this loop, p would be
|
|
|
|
|
pointing to the second colon in a double-colon, we only
|
|
|
|
|
satisfy the condition below if there is another
|
|
|
|
|
double-colon to the right (after). I.e. there is another
|
|
|
|
|
component that can be a class or a namespace. I.e, if at
|
|
|
|
|
the beginning of this loop (PASS1), we had
|
|
|
|
|
p->":inA::fun", we'll trigger this when p has been
|
|
|
|
|
advanced to point to "::fun". */
|
2004-02-11 19:04:14 +01:00
|
|
|
|
/* PASS2: we will not trigger this. */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
else if ((p[0] == ':') && (p[1] == ':'))
|
2003-01-14 21:48:50 +01:00
|
|
|
|
break; /* Found double-colon. */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
else
|
2004-02-11 19:04:14 +01:00
|
|
|
|
/* PASS2: We'll keep getting here, until p->"", at which point
|
|
|
|
|
we exit this loop. */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
p++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*p != ':')
|
2004-02-09 23:29:21 +01:00
|
|
|
|
break; /* Out of the while (1). This would happen
|
|
|
|
|
for instance if we have looked up
|
|
|
|
|
unsuccessfully all the components of the
|
2004-02-11 19:04:14 +01:00
|
|
|
|
string, and p->""(PASS2) */
|
2004-02-09 23:29:21 +01:00
|
|
|
|
|
|
|
|
|
/* We get here if p points to ' ', '\t', '\'', "::" or ""(i.e
|
|
|
|
|
string ended). */
|
|
|
|
|
/* Save restart for next time around. */
|
|
|
|
|
p2 = p;
|
|
|
|
|
/* Restore argptr as it was on entry to this function. */
|
|
|
|
|
*argptr = saved_arg2;
|
2004-02-11 19:04:14 +01:00
|
|
|
|
/* PASS1: at this point p->"::fun" argptr->"AAA::inA::fun",
|
|
|
|
|
p2->"::fun". */
|
2004-02-09 23:29:21 +01:00
|
|
|
|
|
|
|
|
|
/* All ready for next pass through the loop. */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
} /* while (1) */
|
|
|
|
|
|
2004-02-11 19:04:14 +01:00
|
|
|
|
|
|
|
|
|
/* Start of lookup in the symbol tables. */
|
|
|
|
|
|
|
|
|
|
/* Lookup in the symbol table the substring between argptr and
|
|
|
|
|
p. Note, this call changes the value of argptr. */
|
|
|
|
|
/* Before the call, argptr->"AAA::inA::fun",
|
|
|
|
|
p->"", p2->"::fun". After the call: argptr->"fun", p, p2
|
|
|
|
|
unchanged. */
|
|
|
|
|
sym_class = lookup_prefix_sym (argptr, p2);
|
|
|
|
|
|
|
|
|
|
/* If sym_class has been found, and if "AAA::inA" is a class, then
|
|
|
|
|
we're in case 1 above. So we look up "fun" as a method of that
|
|
|
|
|
class. */
|
|
|
|
|
if (sym_class &&
|
|
|
|
|
(t = check_typedef (SYMBOL_TYPE (sym_class)),
|
|
|
|
|
(TYPE_CODE (t) == TYPE_CODE_STRUCT
|
|
|
|
|
|| TYPE_CODE (t) == TYPE_CODE_UNION)))
|
|
|
|
|
{
|
|
|
|
|
/* Arg token is not digits => try it as a function name.
|
|
|
|
|
Find the next token (everything up to end or next
|
|
|
|
|
blank). */
|
|
|
|
|
if (**argptr
|
|
|
|
|
&& strchr (get_gdb_completer_quote_characters (),
|
|
|
|
|
**argptr) != NULL)
|
|
|
|
|
{
|
|
|
|
|
p = skip_quoted (*argptr);
|
|
|
|
|
*argptr = *argptr + 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* At this point argptr->"fun". */
|
|
|
|
|
p = *argptr;
|
|
|
|
|
while (*p && *p != ' ' && *p != '\t' && *p != ',' && *p != ':')
|
|
|
|
|
p++;
|
|
|
|
|
/* At this point p->"". String ended. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allocate our own copy of the substring between argptr and
|
|
|
|
|
p. */
|
|
|
|
|
copy = (char *) alloca (p - *argptr + 1);
|
|
|
|
|
memcpy (copy, *argptr, p - *argptr);
|
|
|
|
|
copy[p - *argptr] = '\0';
|
|
|
|
|
if (p != *argptr
|
|
|
|
|
&& copy[p - *argptr - 1]
|
|
|
|
|
&& strchr (get_gdb_completer_quote_characters (),
|
|
|
|
|
copy[p - *argptr - 1]) != NULL)
|
|
|
|
|
copy[p - *argptr - 1] = '\0';
|
|
|
|
|
|
|
|
|
|
/* At this point copy->"fun", p->"" */
|
|
|
|
|
|
|
|
|
|
/* No line number may be specified. */
|
|
|
|
|
while (*p == ' ' || *p == '\t')
|
|
|
|
|
p++;
|
|
|
|
|
*argptr = p;
|
|
|
|
|
/* At this point arptr->"". */
|
|
|
|
|
|
|
|
|
|
/* Look for copy as a method of sym_class. */
|
|
|
|
|
/* At this point copy->"fun", sym_class is "AAA:inA",
|
|
|
|
|
saved_arg->"AAA::inA::fun". This concludes the scanning of
|
|
|
|
|
the string for possible components matches. If we find it
|
|
|
|
|
here, we return. If not, and we are at the and of the string,
|
|
|
|
|
we'll lookup the whole string in the symbol tables. */
|
|
|
|
|
|
|
|
|
|
return find_method (funfirstline, canonical, saved_arg,
|
|
|
|
|
copy, t, sym_class);
|
|
|
|
|
|
|
|
|
|
} /* End if symbol found */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* We couldn't find a class, so we're in case 2 above. We check the
|
|
|
|
|
entire name as a symbol instead. */
|
|
|
|
|
|
2002-12-05 23:25:49 +01:00
|
|
|
|
copy = (char *) alloca (p - saved_arg2 + 1);
|
|
|
|
|
memcpy (copy, saved_arg2, p - saved_arg2);
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Note: if is_quoted should be true, we snuff out quote here
|
|
|
|
|
anyway. */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
copy[p - saved_arg2] = '\000';
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Set argptr to skip over the name. */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
*argptr = (*p == '\'') ? p + 1 : p;
|
2004-02-09 23:29:21 +01:00
|
|
|
|
|
2002-12-05 23:25:49 +01:00
|
|
|
|
/* Look up entire name */
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
sym = lookup_symbol (copy, 0, VAR_DOMAIN, 0);
|
2002-12-05 23:25:49 +01:00
|
|
|
|
if (sym)
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
return symbol_found (funfirstline, canonical, copy, sym, NULL);
|
2002-12-05 23:25:49 +01:00
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Couldn't find any interpretation as classes/namespaces, so give
|
|
|
|
|
up. The quotes are important if copy is empty. */
|
2002-12-05 23:25:49 +01:00
|
|
|
|
cplusplus_error (saved_arg,
|
|
|
|
|
"Can't find member of namespace, class, struct, or union named \"%s\"\n",
|
|
|
|
|
copy);
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-04 22:24:21 +01:00
|
|
|
|
/* Next come some helper functions for decode_compound. */
|
|
|
|
|
|
|
|
|
|
/* Return the symbol corresponding to the substring of *ARGPTR ending
|
|
|
|
|
at P, allowing whitespace. Also, advance *ARGPTR past the symbol
|
|
|
|
|
name in question, the compound object separator ("::" or "."), and
|
2004-02-09 23:29:21 +01:00
|
|
|
|
whitespace. Note that *ARGPTR is changed whether or not the
|
|
|
|
|
lookup_symbol call finds anything (i.e we return NULL). As an
|
|
|
|
|
example, say ARGPTR is "AAA::inA::fun" and P is "::inA::fun". */
|
2003-02-04 22:24:21 +01:00
|
|
|
|
|
|
|
|
|
static struct symbol *
|
|
|
|
|
lookup_prefix_sym (char **argptr, char *p)
|
|
|
|
|
{
|
|
|
|
|
char *p1;
|
|
|
|
|
char *copy;
|
|
|
|
|
|
|
|
|
|
/* Extract the class name. */
|
|
|
|
|
p1 = p;
|
|
|
|
|
while (p != *argptr && p[-1] == ' ')
|
|
|
|
|
--p;
|
|
|
|
|
copy = (char *) alloca (p - *argptr + 1);
|
|
|
|
|
memcpy (copy, *argptr, p - *argptr);
|
|
|
|
|
copy[p - *argptr] = 0;
|
|
|
|
|
|
2004-02-09 23:29:21 +01:00
|
|
|
|
/* Discard the class name from the argptr. */
|
2003-02-04 22:24:21 +01:00
|
|
|
|
p = p1 + (p1[0] == ':' ? 2 : 1);
|
|
|
|
|
while (*p == ' ' || *p == '\t')
|
|
|
|
|
p++;
|
|
|
|
|
*argptr = p;
|
|
|
|
|
|
2004-02-09 23:29:21 +01:00
|
|
|
|
/* At this point p1->"::inA::fun", p->"inA::fun" copy->"AAA",
|
|
|
|
|
argptr->"inA::fun" */
|
|
|
|
|
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
return lookup_symbol (copy, 0, STRUCT_DOMAIN, 0);
|
2003-02-04 22:24:21 +01:00
|
|
|
|
}
|
|
|
|
|
|
2003-02-28 18:21:16 +01:00
|
|
|
|
/* This finds the method COPY in the class whose type is T and whose
|
|
|
|
|
symbol is SYM_CLASS. */
|
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
find_method (int funfirstline, char ***canonical, char *saved_arg,
|
|
|
|
|
char *copy, struct type *t, struct symbol *sym_class)
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines values;
|
2007-08-11 00:01:27 +02:00
|
|
|
|
struct symbol *sym = NULL;
|
2003-03-03 18:20:24 +01:00
|
|
|
|
int i1; /* Counter for the symbol array. */
|
2003-02-28 18:21:16 +01:00
|
|
|
|
struct symbol **sym_arr = alloca (total_number_of_methods (t)
|
|
|
|
|
* sizeof (struct symbol *));
|
|
|
|
|
|
2003-03-03 18:20:24 +01:00
|
|
|
|
/* Find all methods with a matching name, and put them in
|
|
|
|
|
sym_arr. */
|
2003-02-28 18:21:16 +01:00
|
|
|
|
|
2007-03-28 02:12:15 +02:00
|
|
|
|
i1 = collect_methods (copy, t, sym_class, sym_arr);
|
2003-02-28 18:21:16 +01:00
|
|
|
|
|
|
|
|
|
if (i1 == 1)
|
|
|
|
|
{
|
|
|
|
|
/* There is exactly one field with that name. */
|
|
|
|
|
sym = sym_arr[0];
|
|
|
|
|
|
|
|
|
|
if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
|
|
|
|
|
{
|
|
|
|
|
values.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (sizeof (struct symtab_and_line));
|
|
|
|
|
values.nelts = 1;
|
|
|
|
|
values.sals[0] = find_function_start_sal (sym,
|
|
|
|
|
funfirstline);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2006-01-10 23:14:43 +01:00
|
|
|
|
values.sals = NULL;
|
2003-02-28 18:21:16 +01:00
|
|
|
|
values.nelts = 0;
|
|
|
|
|
}
|
|
|
|
|
return values;
|
|
|
|
|
}
|
|
|
|
|
if (i1 > 0)
|
|
|
|
|
{
|
|
|
|
|
/* There is more than one field with that name
|
|
|
|
|
(overloaded). Ask the user which one to use. */
|
|
|
|
|
return decode_line_2 (sym_arr, i1, funfirstline, canonical);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *tmp;
|
|
|
|
|
|
|
|
|
|
if (is_operator_name (copy))
|
|
|
|
|
{
|
|
|
|
|
tmp = (char *) alloca (strlen (copy + 3) + 9);
|
|
|
|
|
strcpy (tmp, "operator ");
|
|
|
|
|
strcat (tmp, copy + 3);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
tmp = copy;
|
|
|
|
|
if (tmp[0] == '~')
|
|
|
|
|
cplusplus_error (saved_arg,
|
|
|
|
|
"the class `%s' does not have destructor defined\n",
|
|
|
|
|
SYMBOL_PRINT_NAME (sym_class));
|
|
|
|
|
else
|
|
|
|
|
cplusplus_error (saved_arg,
|
|
|
|
|
"the class %s does not have any method named %s\n",
|
|
|
|
|
SYMBOL_PRINT_NAME (sym_class), tmp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-03-03 18:20:24 +01:00
|
|
|
|
/* Find all methods named COPY in the class whose type is T, and put
|
|
|
|
|
them in SYM_ARR. Return the number of methods found. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
collect_methods (char *copy, struct type *t,
|
2007-03-28 02:12:15 +02:00
|
|
|
|
struct symbol *sym_class, struct symbol **sym_arr)
|
2003-03-03 18:20:24 +01:00
|
|
|
|
{
|
|
|
|
|
int i1 = 0; /* Counter for the symbol array. */
|
|
|
|
|
|
|
|
|
|
if (destructor_name_p (copy, t))
|
|
|
|
|
{
|
|
|
|
|
/* Destructors are a special case. */
|
|
|
|
|
int m_index, f_index;
|
|
|
|
|
|
|
|
|
|
if (get_destructor_fn_field (t, &m_index, &f_index))
|
|
|
|
|
{
|
|
|
|
|
struct fn_field *f = TYPE_FN_FIELDLIST1 (t, m_index);
|
|
|
|
|
|
|
|
|
|
sym_arr[i1] =
|
|
|
|
|
lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, f_index),
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
NULL, VAR_DOMAIN, (int *) NULL);
|
2003-03-03 18:20:24 +01:00
|
|
|
|
if (sym_arr[i1])
|
|
|
|
|
i1++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
2007-03-28 02:12:15 +02:00
|
|
|
|
i1 = find_methods (t, copy, SYMBOL_LANGUAGE (sym_class), sym_arr);
|
2003-03-03 18:20:24 +01:00
|
|
|
|
|
|
|
|
|
return i1;
|
|
|
|
|
}
|
|
|
|
|
|
2002-12-09 20:49:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the symtab associated to the filename given by the substring
|
2003-12-17 22:47:47 +01:00
|
|
|
|
of *ARGPTR ending at P, and advance ARGPTR past that filename. If
|
|
|
|
|
NOT_FOUND_PTR is not null and the source file is not found, store
|
|
|
|
|
boolean true at the location pointed to and do not issue an
|
|
|
|
|
error message. */
|
2002-12-09 20:49:00 +01:00
|
|
|
|
|
|
|
|
|
static struct symtab *
|
2003-12-17 22:47:47 +01:00
|
|
|
|
symtab_from_filename (char **argptr, char *p, int is_quote_enclosed,
|
|
|
|
|
int *not_found_ptr)
|
2002-12-09 20:49:00 +01:00
|
|
|
|
{
|
|
|
|
|
char *p1;
|
|
|
|
|
char *copy;
|
2003-01-12 21:55:32 +01:00
|
|
|
|
struct symtab *file_symtab;
|
2002-12-09 20:49:00 +01:00
|
|
|
|
|
|
|
|
|
p1 = p;
|
|
|
|
|
while (p != *argptr && p[-1] == ' ')
|
|
|
|
|
--p;
|
|
|
|
|
if ((*p == '"') && is_quote_enclosed)
|
|
|
|
|
--p;
|
|
|
|
|
copy = (char *) alloca (p - *argptr + 1);
|
|
|
|
|
memcpy (copy, *argptr, p - *argptr);
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* It may have the ending quote right after the file name. */
|
2002-12-09 20:49:00 +01:00
|
|
|
|
if (is_quote_enclosed && copy[p - *argptr - 1] == '"')
|
|
|
|
|
copy[p - *argptr - 1] = 0;
|
|
|
|
|
else
|
|
|
|
|
copy[p - *argptr] = 0;
|
|
|
|
|
|
|
|
|
|
/* Find that file's data. */
|
2003-01-12 21:55:32 +01:00
|
|
|
|
file_symtab = lookup_symtab (copy);
|
|
|
|
|
if (file_symtab == 0)
|
2002-12-09 20:49:00 +01:00
|
|
|
|
{
|
2003-12-17 22:47:47 +01:00
|
|
|
|
if (not_found_ptr)
|
2005-01-14 21:24:20 +01:00
|
|
|
|
*not_found_ptr = 1;
|
2008-08-20 13:47:57 +02:00
|
|
|
|
if (!have_full_symbols () && !have_partial_symbols ())
|
|
|
|
|
throw_error (NOT_FOUND_ERROR,
|
|
|
|
|
_("No symbol table is loaded. Use the \"file\" command."));
|
2005-04-26 16:57:22 +02:00
|
|
|
|
throw_error (NOT_FOUND_ERROR, _("No source file named %s."), copy);
|
2002-12-09 20:49:00 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Discard the file name from the arg. */
|
|
|
|
|
p = p1 + 1;
|
|
|
|
|
while (*p == ' ' || *p == '\t')
|
|
|
|
|
p++;
|
|
|
|
|
*argptr = p;
|
|
|
|
|
|
2003-01-12 21:55:32 +01:00
|
|
|
|
return file_symtab;
|
2002-12-09 20:49:00 +01:00
|
|
|
|
}
|
|
|
|
|
|
2002-12-19 19:56:14 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This decodes a line where the argument is all digits (possibly
|
|
|
|
|
preceded by a sign). Q should point to the end of those digits;
|
|
|
|
|
the other arguments are as usual. */
|
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
decode_all_digits (char **argptr, struct symtab *default_symtab,
|
|
|
|
|
int default_line, char ***canonical,
|
2003-01-11 02:01:04 +01:00
|
|
|
|
struct symtab *file_symtab, char *q)
|
2002-12-19 19:56:14 +01:00
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines values;
|
|
|
|
|
struct symtab_and_line val;
|
|
|
|
|
|
|
|
|
|
enum sign
|
|
|
|
|
{
|
|
|
|
|
none, plus, minus
|
|
|
|
|
}
|
|
|
|
|
sign = none;
|
|
|
|
|
|
|
|
|
|
/* We might need a canonical line spec if no file was specified. */
|
2007-08-11 00:01:27 +02:00
|
|
|
|
int need_canonical = (file_symtab == NULL) ? 1 : 0;
|
2002-12-19 19:56:14 +01:00
|
|
|
|
|
|
|
|
|
init_sal (&val);
|
|
|
|
|
|
|
|
|
|
/* This is where we need to make sure that we have good defaults.
|
|
|
|
|
We must guarantee that this section of code is never executed
|
|
|
|
|
when we are called with just a function name, since
|
|
|
|
|
set_default_source_symtab_and_line uses
|
2003-01-14 21:48:50 +01:00
|
|
|
|
select_source_symtab that calls us with such an argument. */
|
2002-12-19 19:56:14 +01:00
|
|
|
|
|
2003-01-11 02:01:04 +01:00
|
|
|
|
if (file_symtab == 0 && default_symtab == 0)
|
2002-12-19 19:56:14 +01:00
|
|
|
|
{
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Make sure we have at least a default source file. */
|
2002-12-19 19:56:14 +01:00
|
|
|
|
set_default_source_symtab_and_line ();
|
|
|
|
|
initialize_defaults (&default_symtab, &default_line);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (**argptr == '+')
|
|
|
|
|
sign = plus, (*argptr)++;
|
|
|
|
|
else if (**argptr == '-')
|
|
|
|
|
sign = minus, (*argptr)++;
|
|
|
|
|
val.line = atoi (*argptr);
|
|
|
|
|
switch (sign)
|
|
|
|
|
{
|
|
|
|
|
case plus:
|
|
|
|
|
if (q == *argptr)
|
|
|
|
|
val.line = 5;
|
2003-01-11 02:01:04 +01:00
|
|
|
|
if (file_symtab == 0)
|
2002-12-19 19:56:14 +01:00
|
|
|
|
val.line = default_line + val.line;
|
|
|
|
|
break;
|
|
|
|
|
case minus:
|
|
|
|
|
if (q == *argptr)
|
|
|
|
|
val.line = 15;
|
2003-01-11 02:01:04 +01:00
|
|
|
|
if (file_symtab == 0)
|
2002-12-19 19:56:14 +01:00
|
|
|
|
val.line = default_line - val.line;
|
|
|
|
|
else
|
|
|
|
|
val.line = 1;
|
|
|
|
|
break;
|
|
|
|
|
case none:
|
|
|
|
|
break; /* No need to adjust val.line. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (*q == ' ' || *q == '\t')
|
|
|
|
|
q++;
|
|
|
|
|
*argptr = q;
|
2003-01-11 02:01:04 +01:00
|
|
|
|
if (file_symtab == 0)
|
|
|
|
|
file_symtab = default_symtab;
|
2002-12-19 19:56:14 +01:00
|
|
|
|
|
|
|
|
|
/* It is possible that this source file has more than one symtab,
|
|
|
|
|
and that the new line number specification has moved us from the
|
2003-01-11 02:01:04 +01:00
|
|
|
|
default (in file_symtab) to a new one. */
|
|
|
|
|
val.symtab = find_line_symtab (file_symtab, val.line, NULL, NULL);
|
2002-12-19 19:56:14 +01:00
|
|
|
|
if (val.symtab == 0)
|
2003-01-11 02:01:04 +01:00
|
|
|
|
val.symtab = file_symtab;
|
2002-12-19 19:56:14 +01:00
|
|
|
|
|
|
|
|
|
val.pc = 0;
|
|
|
|
|
values.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (sizeof (struct symtab_and_line));
|
|
|
|
|
values.sals[0] = val;
|
|
|
|
|
values.nelts = 1;
|
|
|
|
|
if (need_canonical)
|
|
|
|
|
build_canonical_line_spec (values.sals, NULL, canonical);
|
2007-09-24 09:40:32 +02:00
|
|
|
|
values.sals[0].explicit_line = 1;
|
2002-12-19 19:56:14 +01:00
|
|
|
|
return values;
|
|
|
|
|
}
|
2002-12-09 20:49:00 +01:00
|
|
|
|
|
2002-12-05 23:25:49 +01:00
|
|
|
|
|
|
|
|
|
|
2003-01-07 18:05:49 +01:00
|
|
|
|
/* Decode a linespec starting with a dollar sign. */
|
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
decode_dollar (char *copy, int funfirstline, struct symtab *default_symtab,
|
2003-01-11 02:01:04 +01:00
|
|
|
|
char ***canonical, struct symtab *file_symtab)
|
2003-01-07 18:05:49 +01:00
|
|
|
|
{
|
|
|
|
|
struct value *valx;
|
|
|
|
|
int index = 0;
|
|
|
|
|
int need_canonical = 0;
|
|
|
|
|
struct symtabs_and_lines values;
|
|
|
|
|
struct symtab_and_line val;
|
|
|
|
|
char *p;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
|
|
|
|
|
p = (copy[1] == '$') ? copy + 2 : copy + 1;
|
|
|
|
|
while (*p >= '0' && *p <= '9')
|
|
|
|
|
p++;
|
2003-01-14 21:48:50 +01:00
|
|
|
|
if (!*p) /* Reached end of token without hitting non-digit. */
|
2003-01-07 18:05:49 +01:00
|
|
|
|
{
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* We have a value history reference. */
|
2003-01-07 18:05:49 +01:00
|
|
|
|
sscanf ((copy[1] == '$') ? copy + 2 : copy + 1, "%d", &index);
|
|
|
|
|
valx = access_value_history ((copy[1] == '$') ? -index : index);
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (TYPE_CODE (value_type (valx)) != TYPE_CODE_INT)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("History values used in line specs must have integer values."));
|
2003-01-07 18:05:49 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Not all digits -- may be user variable/function or a
|
2003-01-14 21:48:50 +01:00
|
|
|
|
convenience variable. */
|
2003-01-07 18:05:49 +01:00
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Look up entire name as a symbol first. */
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
sym = lookup_symbol (copy, 0, VAR_DOMAIN, 0);
|
2007-08-11 00:01:27 +02:00
|
|
|
|
file_symtab = (struct symtab *) NULL;
|
2003-01-07 18:05:49 +01:00
|
|
|
|
need_canonical = 1;
|
|
|
|
|
/* Symbol was found --> jump to normal symbol processing. */
|
|
|
|
|
if (sym)
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
return symbol_found (funfirstline, canonical, copy, sym, NULL);
|
2003-01-07 18:05:49 +01:00
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* If symbol was not found, look in minimal symbol tables. */
|
2003-01-07 18:05:49 +01:00
|
|
|
|
msymbol = lookup_minimal_symbol (copy, NULL, NULL);
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Min symbol was found --> jump to minsym processing. */
|
2003-01-07 18:05:49 +01:00
|
|
|
|
if (msymbol)
|
|
|
|
|
return minsym_found (funfirstline, msymbol);
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Not a user variable or function -- must be convenience variable. */
|
2003-01-07 18:05:49 +01:00
|
|
|
|
valx = value_of_internalvar (lookup_internalvar (copy + 1));
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-12 22:45:08 +01:00
|
|
|
|
if (TYPE_CODE (value_type (valx)) != TYPE_CODE_INT)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("Convenience variables used in line specs must have integer values."));
|
2003-01-07 18:05:49 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
init_sal (&val);
|
|
|
|
|
|
2003-01-14 21:48:50 +01:00
|
|
|
|
/* Either history value or convenience value from above, in valx. */
|
2003-01-11 02:01:04 +01:00
|
|
|
|
val.symtab = file_symtab ? file_symtab : default_symtab;
|
2003-01-07 18:05:49 +01:00
|
|
|
|
val.line = value_as_long (valx);
|
|
|
|
|
val.pc = 0;
|
|
|
|
|
|
|
|
|
|
values.sals = (struct symtab_and_line *) xmalloc (sizeof val);
|
|
|
|
|
values.sals[0] = val;
|
|
|
|
|
values.nelts = 1;
|
|
|
|
|
|
|
|
|
|
if (need_canonical)
|
|
|
|
|
build_canonical_line_spec (values.sals, NULL, canonical);
|
|
|
|
|
|
|
|
|
|
return values;
|
|
|
|
|
}
|
|
|
|
|
|
2003-01-08 23:40:18 +01:00
|
|
|
|
|
|
|
|
|
|
2003-01-11 02:01:04 +01:00
|
|
|
|
/* Decode a linespec that's a variable. If FILE_SYMTAB is non-NULL,
|
2003-12-17 22:47:47 +01:00
|
|
|
|
look in that symtab's static variables first. If NOT_FOUND_PTR is not NULL and
|
|
|
|
|
the function cannot be found, store boolean true in the location pointed to
|
|
|
|
|
and do not issue an error message. */
|
2003-01-08 23:40:18 +01:00
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
decode_variable (char *copy, int funfirstline, char ***canonical,
|
2003-12-17 22:47:47 +01:00
|
|
|
|
struct symtab *file_symtab, int *not_found_ptr)
|
2003-01-08 23:40:18 +01:00
|
|
|
|
{
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
|
|
|
|
|
sym = lookup_symbol (copy,
|
2003-01-11 02:01:04 +01:00
|
|
|
|
(file_symtab
|
|
|
|
|
? BLOCKVECTOR_BLOCK (BLOCKVECTOR (file_symtab),
|
|
|
|
|
STATIC_BLOCK)
|
2003-01-08 23:40:18 +01:00
|
|
|
|
: get_selected_block (0)),
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
VAR_DOMAIN, 0);
|
2003-01-08 23:40:18 +01:00
|
|
|
|
|
|
|
|
|
if (sym != NULL)
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
return symbol_found (funfirstline, canonical, copy, sym, file_symtab);
|
2003-01-08 23:40:18 +01:00
|
|
|
|
|
|
|
|
|
msymbol = lookup_minimal_symbol (copy, NULL, NULL);
|
|
|
|
|
|
|
|
|
|
if (msymbol != NULL)
|
|
|
|
|
return minsym_found (funfirstline, msymbol);
|
|
|
|
|
|
2003-12-17 22:47:47 +01:00
|
|
|
|
if (not_found_ptr)
|
2005-01-14 21:24:20 +01:00
|
|
|
|
*not_found_ptr = 1;
|
2008-08-20 13:47:57 +02:00
|
|
|
|
|
|
|
|
|
if (!have_full_symbols ()
|
|
|
|
|
&& !have_partial_symbols ()
|
|
|
|
|
&& !have_minimal_symbols ())
|
|
|
|
|
throw_error (NOT_FOUND_ERROR,
|
|
|
|
|
_("No symbol table is loaded. Use the \"file\" command."));
|
2005-04-26 16:57:22 +02:00
|
|
|
|
throw_error (NOT_FOUND_ERROR, _("Function \"%s\" not defined."), copy);
|
2003-01-08 23:40:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-01-07 18:05:49 +01:00
|
|
|
|
|
|
|
|
|
|
2002-11-08 20:16:17 +01:00
|
|
|
|
/* Now come some functions that are called from multiple places within
|
|
|
|
|
decode_line_1. */
|
|
|
|
|
|
|
|
|
|
/* We've found a symbol SYM to associate with our linespec; build a
|
|
|
|
|
corresponding struct symtabs_and_lines. */
|
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
symbol_found (int funfirstline, char ***canonical, char *copy,
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
struct symbol *sym, struct symtab *file_symtab)
|
2002-11-08 20:16:17 +01:00
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines values;
|
|
|
|
|
|
|
|
|
|
if (SYMBOL_CLASS (sym) == LOC_BLOCK)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
2002-11-08 20:16:17 +01:00
|
|
|
|
/* Arg is the name of a function */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
values.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (sizeof (struct symtab_and_line));
|
2002-11-08 20:16:17 +01:00
|
|
|
|
values.sals[0] = find_function_start_sal (sym, funfirstline);
|
|
|
|
|
values.nelts = 1;
|
|
|
|
|
|
|
|
|
|
/* Don't use the SYMBOL_LINE; if used at all it points to
|
|
|
|
|
the line containing the parameters or thereabouts, not
|
|
|
|
|
the first line of code. */
|
|
|
|
|
|
|
|
|
|
/* We might need a canonical line spec if it is a static
|
|
|
|
|
function. */
|
2003-01-11 02:01:04 +01:00
|
|
|
|
if (file_symtab == 0)
|
2000-11-11 00:02:56 +01:00
|
|
|
|
{
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
struct blockvector *bv = BLOCKVECTOR (SYMBOL_SYMTAB (sym));
|
2002-11-08 20:16:17 +01:00
|
|
|
|
struct block *b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
|
if (lookup_block_symbol (b, copy, NULL, VAR_DOMAIN) != NULL)
|
2002-11-08 20:16:17 +01:00
|
|
|
|
build_canonical_line_spec (values.sals, copy, canonical);
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|
|
|
|
|
return values;
|
|
|
|
|
}
|
2002-11-08 20:16:17 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (funfirstline)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("\"%s\" is not a function"), copy);
|
2002-11-08 20:16:17 +01:00
|
|
|
|
else if (SYMBOL_LINE (sym) != 0)
|
|
|
|
|
{
|
|
|
|
|
/* We know its line number. */
|
|
|
|
|
values.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (sizeof (struct symtab_and_line));
|
|
|
|
|
values.nelts = 1;
|
|
|
|
|
memset (&values.sals[0], 0, sizeof (values.sals[0]));
|
* symtab.h (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
* symtab.c (lookup_symbol_in_language): Remove SYMTAB parameter.
(lookup_symbol): Likewise.
(search_symbols): Update.
* linespec.c (find_methods, collect_methods): Update.
(add_matching_methods, add_constructors): Update.
(decode_compound, decode_dollar, decode_variable): Update.
(lookup_prefix_sym): Update.
(symbol_found): Remove SYM_SYMTAB parameter.
Use SYMBOL_SYMTAB (sym) instead.
* gdbtypes.c (lookup_typename): Update.
(lookup_struct, lookup_union, lookup_enum): Update.
(lookup_template_type): Update.
(check_typedef): Update.
* language.c (lang_bool_type): Update.
* mdebugread.c (parse_procedure): Update.
* mi/mi-cmd-stack.c (list_args_or_locals): Update.
* parse.c (write_dollar_variable): Update.
* printcmd.c (address_info): Update.
* source.c (select_source_symtab): Update.
* stack.c (print_frame_args, print_frame_arg_vars): Update.
* valops.c (find_function_in_inferior): Update.
(value_struct_elt_for_reference): Update.
* value.c (value_static_field, value_fn_field): Update.
* alpha-mdebug-tdep.c (find_proc_desc): Update.
* arm-tdep.c (arm_skip_prologue): Update.
* mt-tdep.c (mt_skip_prologue): Update.
* xstormy16-tdep.c (xstormy16_skip_prologue): Update.
* ada-lang.h (struct ada_symbol_info): Remove SYMTAB member.
* ada-lang.c (ada_add_block_symbols): Remove SYMTAB parameter.
(add_defn_to_vec): Likewise.
(ada_add_block_symbols): Likewise.
(lookup_cached_symbol, cache_symbol): Likewise.
(standard_lookup): Update.
(ada_lookup_symbol_list): Update.
* c-valprint.c (c_val_print): Update.
* cp-support.c (cp_lookup_rtti_type): Update.
* jv-lang.c (java_lookup_class, get_java_object_type): Update.
* objc-lang.c (lookup_struct_typedef, find_imps): Update.
* p-valprint.c (pascal_val_print): Update.
* scm-lang.c (scm_lookup_name): Update.
* c-exp.y: Update.
* f-exp.y: Update.
* jv-exp.y: Update.
* m2-exp.y: Update.
* objc-exp.y: Update.
* p-exp.y: Update.
2008-05-19 17:50:10 +02:00
|
|
|
|
values.sals[0].symtab = SYMBOL_SYMTAB (sym);
|
2002-11-08 20:16:17 +01:00
|
|
|
|
values.sals[0].line = SYMBOL_LINE (sym);
|
|
|
|
|
return values;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* This can happen if it is compiled with a compiler which doesn't
|
|
|
|
|
put out line numbers for variables. */
|
|
|
|
|
/* FIXME: Shouldn't we just set .line and .symtab to zero
|
|
|
|
|
and return? For example, "info line foo" could print
|
|
|
|
|
the address. */
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 05:06:14 +01:00
|
|
|
|
error (_("Line number not known for symbol \"%s\""), copy);
|
2002-11-08 20:16:17 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2002-11-08 20:16:17 +01:00
|
|
|
|
/* We've found a minimal symbol MSYMBOL to associate with our
|
|
|
|
|
linespec; build a corresponding struct symtabs_and_lines. */
|
2000-11-11 00:02:56 +01:00
|
|
|
|
|
2002-11-08 20:16:17 +01:00
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
minsym_found (int funfirstline, struct minimal_symbol *msymbol)
|
|
|
|
|
{
|
2008-05-03 02:37:35 +02:00
|
|
|
|
struct objfile *objfile = msymbol_objfile (msymbol);
|
|
|
|
|
struct gdbarch *gdbarch = get_objfile_arch (objfile);
|
2002-11-08 20:16:17 +01:00
|
|
|
|
struct symtabs_and_lines values;
|
2008-05-03 02:37:35 +02:00
|
|
|
|
CORE_ADDR pc;
|
2002-11-08 20:16:17 +01:00
|
|
|
|
|
|
|
|
|
values.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (sizeof (struct symtab_and_line));
|
|
|
|
|
values.sals[0] = find_pc_sect_line (SYMBOL_VALUE_ADDRESS (msymbol),
|
* breakpoint.h (struct bp_location): Change type of section
member to "struct obj_section *".
* tracepoint.h (struct tracepoint): Likewise.
* symtab.h (struct general_symbol_info): Replace bfd_section
member with obj_section.
(struct symtab_and_line): Change type of section member to
"struct obj_section *".
(SYMBOL_BFD_SECTION): Remove macro, replace by ...
(SYMBOL_OBJ_SECTION): ... this.
* minsym.c (prim_record_minimal_symbol_and_info): Record symbol
section as obj_section instead of bfd_section.
* ada-lang.c (ada_decode_symbol): Use gsymbol->obj_section
directly instead of looking of obj_section from bfd_section.
* objfiles.h (find_pc_sect_section): Remove.
* objfiles.c (find_pc_sect_section): Remove.
(find_pc_section): Inline find_pc_sect_section code.
* symfile.h (find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(section_is_overlay, section_is_mapped): Change type of section
argument to struct obj_section *.
(pc_in_mapped_range, pc_in_unmapped_range): Likewise.
(overlay_mapped_address, overlay_unmapped_address): Likewise.
(symbol_overlayed_address): Likewise.
* symtab.h (symbol_overlayed_address): Likewise.
* symfile.c (overlay_is_mapped): Remove.
(section_is_mapped): Inline overlay_is_mapped code. Update.
(overlay_invalidate_all): Update.
(section_is_overlay): Change section argument to type
"struct obj_section *". Use bfd_ methods.
(pc_in_unmapped_range): Likewise. Handle relocated sections.
(pc_in_mapped_range): Likewise. Handle relocated sections.
(sections_overlap): Likewise.
(overlay_unmapped_address): Likewise.
(overlay_mapped_address): Likewise.
(symbol_overlayed_address): Likewise.
(find_pc_overlay): Return struct obj_section *.
(find_pc_mapped_section): Likewise.
(list_overlays_command): Update.
(map_overlay_command, unmap_overlay_command): Update.
(simple_overlay_update): Update.
* block.h (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* block.c (blockvector_for_pc_sect): Change section argument
to type "struct obj_section *".
(block_for_pc_sect): Likewise.
* symtab.h (find_pc_sect_function, find_pc_sect_psymtab,
find_pc_sect_symtab, find_pc_sect_psymbol, find_pc_sect_line,
lookup_minimal_symbol_by_pc_section, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_sect_function): Likewise.
* breakpoint.c (describe_other_breakpoints): Likewise.
(breakpoint_has_pc, check_duplicates_for): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_minimal_symbol_by_pc_section): Likewise.
* symtab.c (find_pc_sect_psymtab_closer): Likewise.
(find_pc_sect_psymtab, find_pc_sect_psymbol, find_pc_sect_symtab,
find_pc_sect_line, find_function_start_pc): Likewise.
(matching_bfd_sections): Rename to ...
(matching_obj_sections): ... this. Update argument types.
* blockframe.c (find_pc_partial_function): Update to section
type changes. No longer call find_pc_sect_section.
(cache_pc_function_section): Change to type "struct obj_section *".
* breakpoint.c (resolve_sal_pc): Update to section type changes.
* exec.c (xfer_memory): Likewise.
* findvar.c (read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section_1): Likewise.
(lookup_solib_trampoline_symbol_by_pc): Likewise.
* parse.c (write_exp_msymbol): Likewise.
* printcmd.c (build_address_symbolic): Likewise.
(address_info, sym_info): Likewise.
* symmisc.c (dump_msymbols, print_symbol): Likewise.
* symtab.c (fixup_section): Likewise.
(fixup_symbol_section, fixup_psymbol_section): Likewise.
(find_pc_line, find_function_start_sal): Likewise.
* target.c (memory_xfer_partial): Likewise.
* hppa-hpux-tdep.c (hppa64_hpux_in_solib_call_trampoline): Likewise.
* spu-tdep.c (spu_overlay_update): Likewise.
2008-09-05 13:37:18 +02:00
|
|
|
|
(struct obj_section *) 0, 0);
|
|
|
|
|
values.sals[0].section = SYMBOL_OBJ_SECTION (msymbol);
|
2008-05-03 02:37:35 +02:00
|
|
|
|
|
|
|
|
|
/* The minimal symbol might point to a function descriptor;
|
|
|
|
|
resolve it to the actual code address instead. */
|
|
|
|
|
pc = gdbarch_convert_from_func_ptr_addr (gdbarch,
|
|
|
|
|
values.sals[0].pc,
|
|
|
|
|
¤t_target);
|
|
|
|
|
if (pc != values.sals[0].pc)
|
|
|
|
|
values.sals[0] = find_pc_sect_line (pc, NULL, 0);
|
|
|
|
|
|
2002-11-08 20:16:17 +01:00
|
|
|
|
if (funfirstline)
|
|
|
|
|
{
|
2007-07-31 21:58:40 +02:00
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
|
2008-05-03 02:37:35 +02:00
|
|
|
|
values.sals[0].pc = find_function_start_pc (gdbarch,
|
|
|
|
|
values.sals[0].pc,
|
|
|
|
|
values.sals[0].section);
|
2007-07-31 21:58:40 +02:00
|
|
|
|
|
|
|
|
|
sal = find_pc_sect_line (values.sals[0].pc, values.sals[0].section, 0);
|
|
|
|
|
|
|
|
|
|
/* Check if SKIP_PROLOGUE left us in mid-line, and the next
|
|
|
|
|
line is still part of the same function. If there is no
|
|
|
|
|
line information here, sal.pc will be the passed in PC. */
|
|
|
|
|
if (sal.pc != values.sals[0].pc
|
|
|
|
|
&& (lookup_minimal_symbol_by_pc_section (values.sals[0].pc,
|
|
|
|
|
values.sals[0].section)
|
|
|
|
|
== lookup_minimal_symbol_by_pc_section (sal.end,
|
|
|
|
|
values.sals[0].section)))
|
|
|
|
|
/* Recalculate the line number (might not be N+1). */
|
|
|
|
|
values.sals[0] = find_pc_sect_line (sal.end, values.sals[0].section, 0);
|
2002-11-08 20:16:17 +01:00
|
|
|
|
}
|
2007-07-31 21:58:40 +02:00
|
|
|
|
|
2002-11-08 20:16:17 +01:00
|
|
|
|
values.nelts = 1;
|
|
|
|
|
return values;
|
2000-11-11 00:02:56 +01:00
|
|
|
|
}
|