1999-04-16 03:35:26 +02:00
|
|
|
|
/* Print and select stack frames for GDB, the GNU debugger.
|
2002-01-17 23:15:18 +01:00
|
|
|
|
|
|
|
|
|
Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
|
2004-01-12 19:33:47 +01:00
|
|
|
|
1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
|
|
|
|
|
Software Foundation, Inc.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
This file is part of GDB.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
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.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "gdb_string.h"
|
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
|
#include "expression.h"
|
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "frame.h"
|
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
|
#include "gdbcore.h"
|
|
|
|
|
#include "target.h"
|
2002-09-20 16:58:59 +02:00
|
|
|
|
#include "source.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#include "breakpoint.h"
|
|
|
|
|
#include "demangle.h"
|
|
|
|
|
#include "inferior.h"
|
|
|
|
|
#include "annotate.h"
|
2000-02-03 05:14:45 +01:00
|
|
|
|
#include "ui-out.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-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 "stack.h"
|
2003-06-09 17:20:21 +02:00
|
|
|
|
#include "gdb_assert.h"
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
#include "dictionary.h"
|
2003-09-25 18:12:32 +02:00
|
|
|
|
#include "reggroups.h"
|
2003-10-24 00:36:14 +02:00
|
|
|
|
#include "regcache.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Prototypes for exported functions. */
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
void args_info (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
void locals_info (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 01:52:21 +02:00
|
|
|
|
void (*deprecated_selected_frame_level_changed_hook) (int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
void _initialize_stack (void);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2002-10-03 04:34:07 +02:00
|
|
|
|
/* Prototypes for local functions. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void down_command (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void down_silently_base (char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void down_silently_command (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void up_command (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void up_silently_base (char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void up_silently_command (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
void frame_command (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void current_frame_command (char *, int);
|
1999-04-26 20:34:20 +02:00
|
|
|
|
|
2000-02-02 01:21:19 +01:00
|
|
|
|
static void print_frame_arg_vars (struct frame_info *, struct ui_file *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void catch_info (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void args_plus_locals_info (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-02-02 01:21:19 +01:00
|
|
|
|
static void print_frame_label_vars (struct frame_info *, int,
|
|
|
|
|
struct ui_file *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-02-02 01:21:19 +01:00
|
|
|
|
static void print_frame_local_vars (struct frame_info *, int,
|
|
|
|
|
struct ui_file *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-02-02 01:21:19 +01:00
|
|
|
|
static int print_block_frame_labels (struct block *, int *,
|
|
|
|
|
struct ui_file *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-02-02 01:21:19 +01:00
|
|
|
|
static int print_block_frame_locals (struct block *,
|
|
|
|
|
struct frame_info *,
|
|
|
|
|
int,
|
|
|
|
|
struct ui_file *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-01-18 01:55:13 +01:00
|
|
|
|
static void print_frame (struct frame_info *fi,
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
int print_level,
|
|
|
|
|
enum print_what print_what,
|
|
|
|
|
int print_args,
|
2000-01-18 01:55:13 +01:00
|
|
|
|
struct symtab_and_line sal);
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void backtrace_command (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
struct frame_info *parse_frame_specification (char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void frame_info (char *, int);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
extern int addressprint; /* Print addresses, or stay symbolic only? */
|
|
|
|
|
|
|
|
|
|
/* Zero means do things normally; we are interacting directly with the
|
|
|
|
|
user. One means print the full filename and linenumber when a
|
|
|
|
|
frame is printed, and do so in a format emacs18/emacs19.22 can
|
|
|
|
|
parse. Two means print similar annotations, but in many more
|
|
|
|
|
cases and in a slightly different syntax. */
|
|
|
|
|
|
|
|
|
|
int annotation_level = 0;
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
struct print_stack_frame_args
|
|
|
|
|
{
|
|
|
|
|
struct frame_info *fi;
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
int print_level;
|
|
|
|
|
enum print_what print_what;
|
|
|
|
|
int print_args;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
};
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Show or print the frame arguments.
|
|
|
|
|
Pass the args the way catch_errors wants them. */
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
print_stack_frame_stub (void *args)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct print_stack_frame_args *p = (struct print_stack_frame_args *) args;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_frame_info (p->fi, p->print_level, p->print_what, p->print_args);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-29 00:47:21 +02:00
|
|
|
|
/* Show or print a stack frame FI briefly. The output is format
|
|
|
|
|
according to PRINT_LEVEL and PRINT_WHAT printing the frame's
|
|
|
|
|
relative level, function name, argument list, and file name and
|
|
|
|
|
line number. If the frame's PC is not at the beginning of the
|
|
|
|
|
source line, the actual PC is printed at the beginning. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
void
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_stack_frame (struct frame_info *fi, int print_level,
|
|
|
|
|
enum print_what print_what)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct print_stack_frame_args args;
|
|
|
|
|
|
|
|
|
|
args.fi = fi;
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
args.print_level = print_level;
|
|
|
|
|
args.print_what = print_what;
|
|
|
|
|
args.print_args = 1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
catch_errors (print_stack_frame_stub, (char *) &args, "", RETURN_MASK_ALL);
|
2003-01-13 Elena Zannoni <ezannoni@redhat.com>
* stack.c (print_frame_info, print_stack_frame_base_stub,
print_stack_frame_base, show_and_print_stack_frame_stub,
show_and_print_stack_frame, print_only_stack_frame_stub,
print_only_stack_frame): Delete functions.
(print_stack_frame_stub): Call print_frame_info instead of
print_frame_info_base.
(print_frame_info_base): Rename to print_frame_info.
(backtrace_command_1): Call print_frame_info, instead of
print_frame_info_base.
(current_frame_command): Call print_stack_frame, instead of
print_only_stack_frame.
(frame_command): Call print_stack_frame, instead of
show_and_print_stack_frame.
(up_command): Ditto.
(down_command): Ditto.
* frame.h (print_only_stack_frame): Delete prototype.
* infrun.c (normal_stop): Call print_stack_frame, instead of
show_and_print_stack_frame.
* thread.c (info_threads_command): Call print_stack_frame, instead
of print_only_stack_frame.
2003-01-13 Elena Zannoni <ezannoni@redhat.com>
* mi-main.c (mi_cmd_exec_return): Use print_stack_frame instead of
show_and_print_stack_frame.
2003-01-14 01:07:43 +01:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct print_args_args
|
|
|
|
|
{
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct symbol *func;
|
|
|
|
|
struct frame_info *fi;
|
2000-02-02 01:21:19 +01:00
|
|
|
|
struct ui_file *stream;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
};
|
|
|
|
|
|
2003-01-18 Andrew Cagney <ac131313@redhat.com>
* ada-valprint.c: Eliminate PTR.
* breakpoint.c, corelow.c, cris-tdep.c, dbxread.c: Ditto.
* defs.h, dve3900-rom.c, dwarf2read.c, dwarfread.c: Ditto.
* exec.c, hppa-tdep.c, hpread.c, infcmd.c, mdebugread.c: Ditto.
* objfiles.c, objfiles.h, ocd.c, remote-es.c: Ditto.
* remote-mips.c, remote-sds.c, remote-vx.c: Ditto.
* solib-svr4.c, solib.c, stack.c, symfile.c, symfile.h: Ditto.
* symmisc.c, v850ice.c, xcoffread.c, cli/cli-script.c: Ditto.
2003-01-18 16:55:53 +01:00
|
|
|
|
static int print_args_stub (void *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-06-09 17:20:21 +02:00
|
|
|
|
/* Print nameless args on STREAM.
|
|
|
|
|
FI is the frameinfo for this frame, START is the offset
|
|
|
|
|
of the first nameless arg, and NUM is the number of nameless args to
|
|
|
|
|
print. FIRST is nonzero if this is the first argument (not just
|
|
|
|
|
the first nameless arg). */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_frame_nameless_args (struct frame_info *fi, long start, int num,
|
|
|
|
|
int first, struct ui_file *stream)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
CORE_ADDR argsaddr;
|
|
|
|
|
long arg_value;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < num; i++)
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
argsaddr = get_frame_args_address (fi);
|
|
|
|
|
if (!argsaddr)
|
|
|
|
|
return;
|
|
|
|
|
arg_value = read_memory_integer (argsaddr + start, sizeof (int));
|
|
|
|
|
if (!first)
|
|
|
|
|
fprintf_filtered (stream, ", ");
|
|
|
|
|
fprintf_filtered (stream, "%ld", arg_value);
|
|
|
|
|
first = 0;
|
|
|
|
|
start += sizeof (int);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print the arguments of a stack frame, given the function FUNC
|
|
|
|
|
running in that frame (as a symbol), the info on the frame,
|
|
|
|
|
and the number of args according to the stack frame (or -1 if unknown). */
|
|
|
|
|
|
|
|
|
|
/* References here and elsewhere to "number of args according to the
|
|
|
|
|
stack frame" appear in all cases to refer to "number of ints of args
|
|
|
|
|
according to the stack frame". At least for VAX, i386, isi. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_frame_args (struct symbol *func, struct frame_info *fi, int num,
|
|
|
|
|
struct ui_file *stream)
|
|
|
|
|
{
|
|
|
|
|
struct block *b = NULL;
|
|
|
|
|
int first = 1;
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
struct dict_iterator iter;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct symbol *sym;
|
2003-06-09 17:20:21 +02:00
|
|
|
|
struct value *val;
|
|
|
|
|
/* Offset of next stack argument beyond the one we have seen that is
|
|
|
|
|
at the highest offset.
|
|
|
|
|
-1 if we haven't come to a stack argument yet. */
|
|
|
|
|
long highest_offset = -1;
|
|
|
|
|
int arg_size;
|
|
|
|
|
/* Number of ints of arguments that we have printed so far. */
|
|
|
|
|
int args_printed = 0;
|
|
|
|
|
struct cleanup *old_chain, *list_chain;
|
|
|
|
|
struct ui_stream *stb;
|
|
|
|
|
|
|
|
|
|
stb = ui_out_stream_new (uiout);
|
|
|
|
|
old_chain = make_cleanup_ui_out_stream_delete (stb);
|
|
|
|
|
|
|
|
|
|
if (func)
|
|
|
|
|
{
|
|
|
|
|
b = SYMBOL_BLOCK_VALUE (func);
|
|
|
|
|
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
ALL_BLOCK_SYMBOLS (b, iter, sym)
|
2003-06-09 17:20:21 +02:00
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
|
|
|
|
|
/* Keep track of the highest stack argument offset seen, and
|
|
|
|
|
skip over any kinds of symbols we don't care about. */
|
|
|
|
|
|
|
|
|
|
switch (SYMBOL_CLASS (sym))
|
|
|
|
|
{
|
|
|
|
|
case LOC_ARG:
|
|
|
|
|
case LOC_REF_ARG:
|
|
|
|
|
{
|
|
|
|
|
long current_offset = SYMBOL_VALUE (sym);
|
|
|
|
|
arg_size = TYPE_LENGTH (SYMBOL_TYPE (sym));
|
|
|
|
|
|
|
|
|
|
/* Compute address of next argument by adding the size of
|
|
|
|
|
this argument and rounding to an int boundary. */
|
|
|
|
|
current_offset =
|
|
|
|
|
((current_offset + arg_size + sizeof (int) - 1)
|
|
|
|
|
& ~(sizeof (int) - 1));
|
|
|
|
|
|
|
|
|
|
/* If this is the highest offset seen yet, set highest_offset. */
|
|
|
|
|
if (highest_offset == -1
|
|
|
|
|
|| (current_offset > highest_offset))
|
|
|
|
|
highest_offset = current_offset;
|
|
|
|
|
|
|
|
|
|
/* Add the number of ints we're about to print to args_printed. */
|
|
|
|
|
args_printed += (arg_size + sizeof (int) - 1) / sizeof (int);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We care about types of symbols, but don't need to keep track of
|
|
|
|
|
stack offsets in them. */
|
|
|
|
|
case LOC_REGPARM:
|
|
|
|
|
case LOC_REGPARM_ADDR:
|
|
|
|
|
case LOC_LOCAL_ARG:
|
|
|
|
|
case LOC_BASEREG_ARG:
|
|
|
|
|
case LOC_COMPUTED_ARG:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Other types of symbols we just skip over. */
|
|
|
|
|
default:
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We have to look up the symbol because arguments can have
|
|
|
|
|
two entries (one a parameter, one a local) and the one we
|
|
|
|
|
want is the local, which lookup_symbol will find for us.
|
|
|
|
|
This includes gcc1 (not gcc2) on the sparc when passing a
|
|
|
|
|
small structure and gcc2 when the argument type is float
|
|
|
|
|
and it is passed as a double and converted to float by
|
|
|
|
|
the prologue (in the latter case the type of the LOC_ARG
|
|
|
|
|
symbol is double and the type of the LOC_LOCAL symbol is
|
|
|
|
|
float). */
|
|
|
|
|
/* But if the parameter name is null, don't try it.
|
|
|
|
|
Null parameter names occur on the RS/6000, for traceback tables.
|
|
|
|
|
FIXME, should we even print them? */
|
|
|
|
|
|
|
|
|
|
if (*DEPRECATED_SYMBOL_NAME (sym))
|
|
|
|
|
{
|
|
|
|
|
struct symbol *nsym;
|
|
|
|
|
nsym = lookup_symbol
|
|
|
|
|
(DEPRECATED_SYMBOL_NAME (sym),
|
|
|
|
|
b, VAR_DOMAIN, (int *) NULL, (struct symtab **) NULL);
|
|
|
|
|
if (SYMBOL_CLASS (nsym) == LOC_REGISTER)
|
|
|
|
|
{
|
|
|
|
|
/* There is a LOC_ARG/LOC_REGISTER pair. This means that
|
|
|
|
|
it was passed on the stack and loaded into a register,
|
|
|
|
|
or passed in a register and stored in a stack slot.
|
|
|
|
|
GDB 3.x used the LOC_ARG; GDB 4.0-4.11 used the LOC_REGISTER.
|
|
|
|
|
|
|
|
|
|
Reasons for using the LOC_ARG:
|
|
|
|
|
(1) because find_saved_registers may be slow for remote
|
|
|
|
|
debugging,
|
|
|
|
|
(2) because registers are often re-used and stack slots
|
|
|
|
|
rarely (never?) are. Therefore using the stack slot is
|
|
|
|
|
much less likely to print garbage.
|
|
|
|
|
|
|
|
|
|
Reasons why we might want to use the LOC_REGISTER:
|
|
|
|
|
(1) So that the backtrace prints the same value as
|
|
|
|
|
"print foo". I see no compelling reason why this needs
|
|
|
|
|
to be the case; having the backtrace print the value which
|
|
|
|
|
was passed in, and "print foo" print the value as modified
|
|
|
|
|
within the called function, makes perfect sense to me.
|
|
|
|
|
|
|
|
|
|
Additional note: It might be nice if "info args" displayed
|
|
|
|
|
both values.
|
|
|
|
|
One more note: There is a case with sparc structure passing
|
|
|
|
|
where we need to use the LOC_REGISTER, but this is dealt with
|
|
|
|
|
by creating a single LOC_REGPARM in symbol reading. */
|
|
|
|
|
|
|
|
|
|
/* Leave sym (the LOC_ARG) alone. */
|
|
|
|
|
;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
sym = nsym;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print the current arg. */
|
|
|
|
|
if (!first)
|
|
|
|
|
ui_out_text (uiout, ", ");
|
|
|
|
|
ui_out_wrap_hint (uiout, " ");
|
|
|
|
|
|
|
|
|
|
annotate_arg_begin ();
|
|
|
|
|
|
|
|
|
|
list_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
|
|
|
|
fprintf_symbol_filtered (stb->stream, SYMBOL_PRINT_NAME (sym),
|
|
|
|
|
SYMBOL_LANGUAGE (sym), DMGL_PARAMS | DMGL_ANSI);
|
|
|
|
|
ui_out_field_stream (uiout, "name", stb);
|
|
|
|
|
annotate_arg_name_end ();
|
|
|
|
|
ui_out_text (uiout, "=");
|
|
|
|
|
|
|
|
|
|
/* Avoid value_print because it will deref ref parameters. We just
|
|
|
|
|
want to print their addresses. Print ??? for args whose address
|
|
|
|
|
we do not know. We pass 2 as "recurse" to val_print because our
|
|
|
|
|
standard indentation here is 4 spaces, and val_print indents
|
|
|
|
|
2 for each recurse. */
|
|
|
|
|
val = read_var_value (sym, fi);
|
|
|
|
|
|
|
|
|
|
annotate_arg_value (val == NULL ? NULL : VALUE_TYPE (val));
|
|
|
|
|
|
|
|
|
|
if (val)
|
|
|
|
|
{
|
|
|
|
|
val_print (VALUE_TYPE (val), VALUE_CONTENTS (val), 0,
|
|
|
|
|
VALUE_ADDRESS (val),
|
|
|
|
|
stb->stream, 0, 0, 2, Val_no_prettyprint);
|
|
|
|
|
ui_out_field_stream (uiout, "value", stb);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
ui_out_text (uiout, "???");
|
|
|
|
|
|
|
|
|
|
/* Invoke ui_out_tuple_end. */
|
|
|
|
|
do_cleanups (list_chain);
|
|
|
|
|
|
|
|
|
|
annotate_arg_end ();
|
|
|
|
|
|
|
|
|
|
first = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Don't print nameless args in situations where we don't know
|
|
|
|
|
enough about the stack to find them. */
|
|
|
|
|
if (num != -1)
|
|
|
|
|
{
|
|
|
|
|
long start;
|
|
|
|
|
|
|
|
|
|
if (highest_offset == -1)
|
|
|
|
|
start = FRAME_ARGS_SKIP;
|
|
|
|
|
else
|
|
|
|
|
start = highest_offset;
|
|
|
|
|
|
|
|
|
|
print_frame_nameless_args (fi, start, num - args_printed,
|
|
|
|
|
first, stream);
|
|
|
|
|
}
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Pass the args the way catch_errors wants them. */
|
|
|
|
|
|
|
|
|
|
static int
|
2003-01-18 Andrew Cagney <ac131313@redhat.com>
* ada-valprint.c: Eliminate PTR.
* breakpoint.c, corelow.c, cris-tdep.c, dbxread.c: Ditto.
* defs.h, dve3900-rom.c, dwarf2read.c, dwarfread.c: Ditto.
* exec.c, hppa-tdep.c, hpread.c, infcmd.c, mdebugread.c: Ditto.
* objfiles.c, objfiles.h, ocd.c, remote-es.c: Ditto.
* remote-mips.c, remote-sds.c, remote-vx.c: Ditto.
* solib-svr4.c, solib.c, stack.c, symfile.c, symfile.h: Ditto.
* symmisc.c, v850ice.c, xcoffread.c, cli/cli-script.c: Ditto.
2003-01-18 16:55:53 +01:00
|
|
|
|
print_args_stub (void *args)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int numargs;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct print_args_args *p = (struct print_args_args *) args;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-06-09 19:35:59 +02:00
|
|
|
|
if (FRAME_NUM_ARGS_P ())
|
|
|
|
|
{
|
|
|
|
|
numargs = FRAME_NUM_ARGS (p->fi);
|
|
|
|
|
gdb_assert (numargs >= 0);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
numargs = -1;
|
1999-06-01 17:44:41 +02:00
|
|
|
|
print_frame_args (p->func, p->fi, numargs, p->stream);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print information about a frame for frame "fi" at level "level".
|
2000-01-18 01:55:13 +01:00
|
|
|
|
Used in "where" output, also used to emit breakpoint or step
|
|
|
|
|
messages.
|
|
|
|
|
LEVEL is the level of the frame, or -1 if it is the
|
|
|
|
|
innermost frame but we don't want to print the level.
|
|
|
|
|
The meaning of the SOURCE argument is:
|
|
|
|
|
SRC_LINE: Print only source line
|
|
|
|
|
LOCATION: Print only location
|
|
|
|
|
LOC_AND_SRC: Print location and source line. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-01-13 Elena Zannoni <ezannoni@redhat.com>
* stack.c (print_frame_info, print_stack_frame_base_stub,
print_stack_frame_base, show_and_print_stack_frame_stub,
show_and_print_stack_frame, print_only_stack_frame_stub,
print_only_stack_frame): Delete functions.
(print_stack_frame_stub): Call print_frame_info instead of
print_frame_info_base.
(print_frame_info_base): Rename to print_frame_info.
(backtrace_command_1): Call print_frame_info, instead of
print_frame_info_base.
(current_frame_command): Call print_stack_frame, instead of
print_only_stack_frame.
(frame_command): Call print_stack_frame, instead of
show_and_print_stack_frame.
(up_command): Ditto.
(down_command): Ditto.
* frame.h (print_only_stack_frame): Delete prototype.
* infrun.c (normal_stop): Call print_stack_frame, instead of
show_and_print_stack_frame.
* thread.c (info_threads_command): Call print_stack_frame, instead
of print_only_stack_frame.
2003-01-13 Elena Zannoni <ezannoni@redhat.com>
* mi-main.c (mi_cmd_exec_return): Use print_stack_frame instead of
show_and_print_stack_frame.
2003-01-14 01:07:43 +01:00
|
|
|
|
void
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_frame_info (struct frame_info *fi, int print_level,
|
|
|
|
|
enum print_what print_what, int print_args)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct symtab_and_line sal;
|
2000-01-18 01:55:13 +01:00
|
|
|
|
int source_print;
|
|
|
|
|
int location_print;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-02-02 06:51:09 +01:00
|
|
|
|
if (get_frame_type (fi) == DUMMY_FRAME
|
|
|
|
|
|| get_frame_type (fi) == SIGTRAMP_FRAME)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-02-02 06:51:09 +01:00
|
|
|
|
struct cleanup *uiout_cleanup
|
|
|
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout, "frame");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
annotate_frame_begin (print_level ? frame_relative_level (fi) : 0,
|
|
|
|
|
get_frame_pc (fi));
|
2003-02-02 19:30:56 +01:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Do this regardless of SOURCE because we don't have any source
|
1999-07-07 22:19:36 +02:00
|
|
|
|
to list for this frame. */
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
if (print_level)
|
2002-10-04 00:34:58 +02:00
|
|
|
|
{
|
|
|
|
|
ui_out_text (uiout, "#");
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
ui_out_field_fmt_int (uiout, 2, ui_left, "level",
|
|
|
|
|
frame_relative_level (fi));
|
2002-10-04 00:34:58 +02:00
|
|
|
|
}
|
2003-02-02 06:51:09 +01:00
|
|
|
|
if (ui_out_is_mi_like_p (uiout))
|
2002-10-04 00:34:58 +02:00
|
|
|
|
{
|
2003-02-02 06:51:09 +01:00
|
|
|
|
annotate_frame_address ();
|
2003-04-05 17:19:12 +02:00
|
|
|
|
ui_out_field_core_addr (uiout, "addr", get_frame_pc (fi));
|
2003-02-02 06:51:09 +01:00
|
|
|
|
annotate_frame_address_end ();
|
2002-10-04 00:34:58 +02:00
|
|
|
|
}
|
2003-02-02 19:30:56 +01:00
|
|
|
|
|
2003-02-02 06:51:09 +01:00
|
|
|
|
if (get_frame_type (fi) == DUMMY_FRAME)
|
|
|
|
|
{
|
|
|
|
|
annotate_function_call ();
|
|
|
|
|
ui_out_field_string (uiout, "func", "<function called from gdb>");
|
|
|
|
|
}
|
|
|
|
|
else if (get_frame_type (fi) == SIGTRAMP_FRAME)
|
|
|
|
|
{
|
|
|
|
|
annotate_signal_handler_caller ();
|
|
|
|
|
ui_out_field_string (uiout, "func", "<signal handler called>");
|
|
|
|
|
}
|
|
|
|
|
ui_out_text (uiout, "\n");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
annotate_frame_end ();
|
2003-02-02 06:51:09 +01:00
|
|
|
|
|
|
|
|
|
do_cleanups (uiout_cleanup);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If fi is not the innermost frame, that normally means that fi->pc
|
2002-11-18 23:19:33 +01:00
|
|
|
|
points to *after* the call instruction, and we want to get the
|
|
|
|
|
line containing the call, never the next line. But if the next
|
|
|
|
|
frame is a SIGTRAMP_FRAME or a DUMMY_FRAME, then the next frame
|
|
|
|
|
was not entered as the result of a call, and we want to get the
|
|
|
|
|
line containing fi->pc. */
|
2002-11-29 02:52:02 +01:00
|
|
|
|
find_frame_sal (fi, &sal);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
location_print = (print_what == LOCATION
|
|
|
|
|
|| print_what == LOC_AND_ADDRESS
|
|
|
|
|
|| print_what == SRC_AND_LOC);
|
2000-01-18 01:55:13 +01:00
|
|
|
|
|
|
|
|
|
if (location_print || !sal.symtab)
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_frame (fi, print_level, print_what, print_args, sal);
|
2000-01-18 01:55:13 +01:00
|
|
|
|
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
source_print = (print_what == SRC_LINE || print_what == SRC_AND_LOC);
|
2002-09-20 16:58:59 +02:00
|
|
|
|
|
2002-08-29 21:59:35 +02:00
|
|
|
|
if (sal.symtab)
|
2002-09-20 16:58:59 +02:00
|
|
|
|
set_current_source_symtab_and_line (&sal);
|
2000-01-18 01:55:13 +01:00
|
|
|
|
|
|
|
|
|
if (source_print && sal.symtab)
|
|
|
|
|
{
|
2002-09-20 16:58:59 +02:00
|
|
|
|
struct symtab_and_line cursal;
|
2000-01-18 01:55:13 +01:00
|
|
|
|
int done = 0;
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
int mid_statement = ((print_what == SRC_LINE)
|
|
|
|
|
&& (get_frame_pc (fi) != sal.pc));
|
2000-01-18 01:55:13 +01:00
|
|
|
|
|
|
|
|
|
if (annotation_level)
|
|
|
|
|
done = identify_source_line (sal.symtab, sal.line, mid_statement,
|
2002-12-09 04:30:44 +01:00
|
|
|
|
get_frame_pc (fi));
|
2000-01-18 01:55:13 +01:00
|
|
|
|
if (!done)
|
|
|
|
|
{
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 01:52:21 +02:00
|
|
|
|
if (deprecated_print_frame_info_listing_hook)
|
|
|
|
|
deprecated_print_frame_info_listing_hook (sal.symtab, sal.line, sal.line + 1, 0);
|
2002-01-13 21:19:28 +01:00
|
|
|
|
else
|
2000-01-18 01:55:13 +01:00
|
|
|
|
{
|
2002-01-13 21:19:28 +01:00
|
|
|
|
/* We used to do this earlier, but that is clearly
|
|
|
|
|
wrong. This function is used by many different
|
|
|
|
|
parts of gdb, including normal_stop in infrun.c,
|
|
|
|
|
which uses this to print out the current PC
|
|
|
|
|
when we stepi/nexti into the middle of a source
|
|
|
|
|
line. Only the command line really wants this
|
|
|
|
|
behavior. Other UIs probably would like the
|
|
|
|
|
ability to decide for themselves if it is desired. */
|
|
|
|
|
if (addressprint && mid_statement)
|
|
|
|
|
{
|
2002-12-09 04:30:44 +01:00
|
|
|
|
ui_out_field_core_addr (uiout, "addr", get_frame_pc (fi));
|
2002-01-13 21:19:28 +01:00
|
|
|
|
ui_out_text (uiout, "\t");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
|
2000-01-18 01:55:13 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2002-09-23 00:18:41 +02:00
|
|
|
|
/* Make sure we have at least a default source file */
|
|
|
|
|
set_default_source_symtab_and_line ();
|
|
|
|
|
cursal = get_current_source_symtab_and_line ();
|
2002-09-20 16:58:59 +02:00
|
|
|
|
cursal.line = max (sal.line - get_lines_to_list () / 2, 1);
|
|
|
|
|
set_current_source_symtab_and_line (&cursal);
|
2000-01-18 01:55:13 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
if (print_what != LOCATION)
|
2002-12-09 04:30:44 +01:00
|
|
|
|
set_default_breakpoint (1, get_frame_pc (fi), sal.symtab, sal.line);
|
2000-01-18 01:55:13 +01:00
|
|
|
|
|
|
|
|
|
annotate_frame_end ();
|
|
|
|
|
|
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_frame (struct frame_info *fi,
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
int print_level,
|
|
|
|
|
enum print_what print_what,
|
|
|
|
|
int print_args,
|
2000-01-18 01:55:13 +01:00
|
|
|
|
struct symtab_and_line sal)
|
|
|
|
|
{
|
|
|
|
|
struct symbol *func;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
char *funname = 0;
|
2000-01-18 01:55:13 +01:00
|
|
|
|
enum language funlang = language_unknown;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
struct ui_stream *stb;
|
|
|
|
|
struct cleanup *old_chain;
|
2001-01-27 18:57:53 +01:00
|
|
|
|
struct cleanup *list_chain;
|
2000-02-03 05:14:45 +01:00
|
|
|
|
|
|
|
|
|
stb = ui_out_stream_new (uiout);
|
2000-05-15 05:16:15 +02:00
|
|
|
|
old_chain = make_cleanup_ui_out_stream_delete (stb);
|
2000-01-18 01:55:13 +01:00
|
|
|
|
|
2003-07-11 17:31:43 +02:00
|
|
|
|
func = find_pc_function (get_frame_address_in_block (fi));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (func)
|
|
|
|
|
{
|
|
|
|
|
/* In certain pathological cases, the symtabs give the wrong
|
1999-07-07 22:19:36 +02:00
|
|
|
|
function (when we are in the first function in a file which
|
|
|
|
|
is compiled without debugging symbols, the previous function
|
|
|
|
|
is compiled with debugging symbols, and the "foo.o" symbol
|
|
|
|
|
that is supposed to tell us where the file with debugging symbols
|
|
|
|
|
ends has been truncated by ar because it is longer than 15
|
|
|
|
|
characters). This also occurs if the user uses asm() to create
|
|
|
|
|
a function but not stabs for it (in a file compiled -g).
|
|
|
|
|
|
|
|
|
|
So look in the minimal symbol tables as well, and if it comes
|
|
|
|
|
up with a larger address for the function use that instead.
|
|
|
|
|
I don't think this can ever cause any problems; there shouldn't
|
|
|
|
|
be any minimal symbols in the middle of a function; if this is
|
|
|
|
|
ever changed many parts of GDB will need to be changed (and we'll
|
|
|
|
|
create a find_pc_minimal_function or some such). */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-07-11 17:31:43 +02:00
|
|
|
|
struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_address_in_block (fi));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (msymbol != NULL
|
1999-07-07 22:19:36 +02:00
|
|
|
|
&& (SYMBOL_VALUE_ADDRESS (msymbol)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
> BLOCK_START (SYMBOL_BLOCK_VALUE (func))))
|
|
|
|
|
{
|
|
|
|
|
/* We also don't know anything about the function besides
|
|
|
|
|
its address and name. */
|
|
|
|
|
func = 0;
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 22:36:23 +01:00
|
|
|
|
funname = DEPRECATED_SYMBOL_NAME (msymbol);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
funlang = SYMBOL_LANGUAGE (msymbol);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
/* I'd like to use SYMBOL_PRINT_NAME() here, to display the
|
2000-01-18 01:55:13 +01:00
|
|
|
|
demangled name that we already have stored in the symbol
|
|
|
|
|
table, but we stored a version with DMGL_PARAMS turned
|
|
|
|
|
on, and here we don't want to display parameters. So call
|
|
|
|
|
the demangler again, with DMGL_ANSI only. (Yes, I know
|
|
|
|
|
that printf_symbol_filtered() will again try to demangle
|
|
|
|
|
the name on the fly, but the issue is that if
|
|
|
|
|
cplus_demangle() fails here, it'll fail there too. So we
|
|
|
|
|
want to catch the failure ("demangled==NULL" case below)
|
|
|
|
|
here, while we still have our hands on the function
|
|
|
|
|
symbol.) */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
char *demangled;
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 22:36:23 +01:00
|
|
|
|
funname = DEPRECATED_SYMBOL_NAME (func);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
funlang = SYMBOL_LANGUAGE (func);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (funlang == language_cplus)
|
|
|
|
|
{
|
|
|
|
|
demangled = cplus_demangle (funname, DMGL_ANSI);
|
|
|
|
|
if (demangled == NULL)
|
2000-01-18 01:55:13 +01:00
|
|
|
|
/* If the demangler fails, try the demangled name from
|
|
|
|
|
the symbol table. This'll have parameters, but
|
|
|
|
|
that's preferable to diplaying a mangled name. */
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
funname = SYMBOL_PRINT_NAME (func);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-07-11 17:31:43 +02:00
|
|
|
|
struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_address_in_block (fi));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (msymbol != NULL)
|
|
|
|
|
{
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 22:36:23 +01:00
|
|
|
|
funname = DEPRECATED_SYMBOL_NAME (msymbol);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
funlang = SYMBOL_LANGUAGE (msymbol);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
annotate_frame_begin (print_level ? frame_relative_level (fi) : 0,
|
|
|
|
|
get_frame_pc (fi));
|
2000-01-18 01:55:13 +01:00
|
|
|
|
|
2001-05-12 06:08:24 +02:00
|
|
|
|
list_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "frame");
|
2000-01-18 01:55:13 +01:00
|
|
|
|
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
if (print_level)
|
2000-02-03 05:14:45 +01:00
|
|
|
|
{
|
|
|
|
|
ui_out_text (uiout, "#");
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
ui_out_field_fmt_int (uiout, 2, ui_left, "level",
|
|
|
|
|
frame_relative_level (fi));
|
2000-02-03 05:14:45 +01:00
|
|
|
|
}
|
2000-01-18 01:55:13 +01:00
|
|
|
|
if (addressprint)
|
2002-12-09 04:30:44 +01:00
|
|
|
|
if (get_frame_pc (fi) != sal.pc
|
|
|
|
|
|| !sal.symtab
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
|| print_what == LOC_AND_ADDRESS)
|
2000-01-18 01:55:13 +01:00
|
|
|
|
{
|
|
|
|
|
annotate_frame_address ();
|
2002-12-09 04:30:44 +01:00
|
|
|
|
ui_out_field_core_addr (uiout, "addr", get_frame_pc (fi));
|
2000-02-03 05:14:45 +01:00
|
|
|
|
annotate_frame_address_end ();
|
|
|
|
|
ui_out_text (uiout, " in ");
|
2000-01-18 01:55:13 +01:00
|
|
|
|
}
|
|
|
|
|
annotate_frame_function_name ();
|
2000-02-03 05:14:45 +01:00
|
|
|
|
fprintf_symbol_filtered (stb->stream, funname ? funname : "??", funlang,
|
|
|
|
|
DMGL_ANSI);
|
|
|
|
|
ui_out_field_stream (uiout, "func", stb);
|
|
|
|
|
ui_out_wrap_hint (uiout, " ");
|
2000-01-18 01:55:13 +01:00
|
|
|
|
annotate_frame_args ();
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
ui_out_text (uiout, " (");
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
if (print_args)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-01-18 01:55:13 +01:00
|
|
|
|
struct print_args_args args;
|
2001-04-08 19:55:13 +02:00
|
|
|
|
struct cleanup *args_list_chain;
|
2000-01-18 01:55:13 +01:00
|
|
|
|
args.fi = fi;
|
|
|
|
|
args.func = func;
|
|
|
|
|
args.stream = gdb_stdout;
|
2001-06-26 06:48:49 +02:00
|
|
|
|
args_list_chain = make_cleanup_ui_out_list_begin_end (uiout, "args");
|
2000-01-18 01:55:13 +01:00
|
|
|
|
catch_errors (print_args_stub, &args, "", RETURN_MASK_ALL);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
/* FIXME: args must be a list. If one argument is a string it will
|
|
|
|
|
have " that will not be properly escaped. */
|
2001-05-12 06:08:24 +02:00
|
|
|
|
/* Invoke ui_out_tuple_end. */
|
2001-04-08 19:55:13 +02:00
|
|
|
|
do_cleanups (args_list_chain);
|
2000-01-18 01:55:13 +01:00
|
|
|
|
QUIT;
|
|
|
|
|
}
|
2000-02-03 05:14:45 +01:00
|
|
|
|
ui_out_text (uiout, ")");
|
2000-01-18 01:55:13 +01:00
|
|
|
|
if (sal.symtab && sal.symtab->filename)
|
|
|
|
|
{
|
|
|
|
|
annotate_frame_source_begin ();
|
2000-02-03 05:14:45 +01:00
|
|
|
|
ui_out_wrap_hint (uiout, " ");
|
|
|
|
|
ui_out_text (uiout, " at ");
|
|
|
|
|
annotate_frame_source_file ();
|
|
|
|
|
ui_out_field_string (uiout, "file", sal.symtab->filename);
|
|
|
|
|
annotate_frame_source_file_end ();
|
|
|
|
|
ui_out_text (uiout, ":");
|
|
|
|
|
annotate_frame_source_line ();
|
|
|
|
|
ui_out_field_int (uiout, "line", sal.line);
|
2000-01-18 01:55:13 +01:00
|
|
|
|
annotate_frame_source_end ();
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2000-01-18 01:55:13 +01:00
|
|
|
|
#ifdef PC_SOLIB
|
|
|
|
|
if (!funname || (!sal.symtab || !sal.symtab->filename))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-12-09 04:30:44 +01:00
|
|
|
|
char *lib = PC_SOLIB (get_frame_pc (fi));
|
2000-01-18 01:55:13 +01:00
|
|
|
|
if (lib)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2000-01-18 01:55:13 +01:00
|
|
|
|
annotate_frame_where ();
|
2000-02-03 05:14:45 +01:00
|
|
|
|
ui_out_wrap_hint (uiout, " ");
|
|
|
|
|
ui_out_text (uiout, " from ");
|
|
|
|
|
ui_out_field_string (uiout, "from", lib);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2000-01-18 01:55:13 +01:00
|
|
|
|
#endif /* PC_SOLIB */
|
1999-10-26 05:43:48 +02:00
|
|
|
|
|
2001-05-12 06:08:24 +02:00
|
|
|
|
/* do_cleanups will call ui_out_tuple_end() for us. */
|
2001-01-27 18:57:53 +01:00
|
|
|
|
do_cleanups (list_chain);
|
2000-02-03 05:14:45 +01:00
|
|
|
|
ui_out_text (uiout, "\n");
|
|
|
|
|
do_cleanups (old_chain);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Show the frame info. If this is the tui, it will be shown in
|
|
|
|
|
the source display otherwise, nothing is done */
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
show_stack_frame (struct frame_info *fi)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Read a frame specification in whatever the appropriate format is.
|
|
|
|
|
Call error() if the specification is in any way invalid (i.e.
|
|
|
|
|
this function never returns NULL). */
|
|
|
|
|
|
|
|
|
|
struct frame_info *
|
2000-07-30 03:48:28 +02:00
|
|
|
|
parse_frame_specification (char *frame_exp)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int numargs = 0;
|
|
|
|
|
#define MAXARGS 4
|
|
|
|
|
CORE_ADDR args[MAXARGS];
|
2001-03-08 21:45:22 +01:00
|
|
|
|
int level;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (frame_exp)
|
|
|
|
|
{
|
|
|
|
|
char *addr_string, *p;
|
|
|
|
|
struct cleanup *tmp_cleanup;
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
while (*frame_exp == ' ')
|
|
|
|
|
frame_exp++;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
while (*frame_exp)
|
|
|
|
|
{
|
|
|
|
|
if (numargs > MAXARGS)
|
|
|
|
|
error ("Too many args in frame specification");
|
|
|
|
|
/* Parse an argument. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
for (p = frame_exp; *p && *p != ' '; p++)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
addr_string = savestring (frame_exp, p - frame_exp);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
{
|
2001-11-10 22:34:56 +01:00
|
|
|
|
struct value *vp;
|
2001-03-08 21:45:22 +01:00
|
|
|
|
|
2000-12-15 02:01:51 +01:00
|
|
|
|
tmp_cleanup = make_cleanup (xfree, addr_string);
|
2001-03-08 21:45:22 +01:00
|
|
|
|
|
2001-03-08 21:51:38 +01:00
|
|
|
|
/* NOTE: we call parse_and_eval and then both
|
* value.h (value_as_address): Rename value_as_pointer.
* eval.c, findvar.c, gnu-v2-abi.c, gnu-v3-abi.c, jv-lang.c,
jv-valprint.c, printcmd.c, stack.c, top.c, valarith.c, valops.c,
values.c: Update.
2001-10-16 03:58:07 +02:00
|
|
|
|
value_as_long and value_as_address rather than calling
|
2001-03-08 21:51:38 +01:00
|
|
|
|
parse_and_eval_long and parse_and_eval_address because
|
|
|
|
|
of the issue of potential side effects from evaluating
|
|
|
|
|
the expression. */
|
2001-03-08 21:45:22 +01:00
|
|
|
|
vp = parse_and_eval (addr_string);
|
|
|
|
|
if (numargs == 0)
|
|
|
|
|
level = value_as_long (vp);
|
|
|
|
|
|
* value.h (value_as_address): Rename value_as_pointer.
* eval.c, findvar.c, gnu-v2-abi.c, gnu-v3-abi.c, jv-lang.c,
jv-valprint.c, printcmd.c, stack.c, top.c, valarith.c, valops.c,
values.c: Update.
2001-10-16 03:58:07 +02:00
|
|
|
|
args[numargs++] = value_as_address (vp);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
do_cleanups (tmp_cleanup);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Skip spaces, move to possible next arg. */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
while (*p == ' ')
|
|
|
|
|
p++;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
frame_exp = p;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (numargs)
|
|
|
|
|
{
|
|
|
|
|
case 0:
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (deprecated_selected_frame == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("No selected frame.");
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
return deprecated_selected_frame;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* NOTREACHED */
|
|
|
|
|
case 1:
|
|
|
|
|
{
|
|
|
|
|
struct frame_info *fid =
|
1999-07-07 22:19:36 +02:00
|
|
|
|
find_relative_frame (get_current_frame (), &level);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
struct frame_info *tfid;
|
|
|
|
|
|
|
|
|
|
if (level == 0)
|
|
|
|
|
/* find_relative_frame was successful */
|
|
|
|
|
return fid;
|
|
|
|
|
|
|
|
|
|
/* If SETUP_ARBITRARY_FRAME is defined, then frame specifications
|
|
|
|
|
take at least 2 addresses. It is important to detect this case
|
|
|
|
|
here so that "frame 100" does not give a confusing error message
|
|
|
|
|
like "frame specification requires two addresses". This of course
|
|
|
|
|
does not solve the "frame 100" problem for machines on which
|
|
|
|
|
a frame specification can be made with one address. To solve
|
|
|
|
|
that, we need a new syntax for a specifying a frame by address.
|
|
|
|
|
I think the cleanest syntax is $frame(0x45) ($frame(0x23,0x45) for
|
|
|
|
|
two args, etc.), but people might think that is too much typing,
|
|
|
|
|
so I guess *0x23,0x45 would be a possible alternative (commas
|
|
|
|
|
really should be used instead of spaces to delimit; using spaces
|
|
|
|
|
normally works in an expression). */
|
|
|
|
|
#ifdef SETUP_ARBITRARY_FRAME
|
2002-03-23 18:38:13 +01:00
|
|
|
|
error ("No frame %s", paddr_d (args[0]));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* If (s)he specifies the frame with an address, he deserves what
|
|
|
|
|
(s)he gets. Still, give the highest one that matches. */
|
|
|
|
|
|
|
|
|
|
for (fid = get_current_frame ();
|
2002-12-09 02:40:25 +01:00
|
|
|
|
fid && get_frame_base (fid) != args[0];
|
1999-04-16 03:35:26 +02:00
|
|
|
|
fid = get_prev_frame (fid))
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
if (fid)
|
|
|
|
|
while ((tfid = get_prev_frame (fid)) &&
|
2002-12-09 02:40:25 +01:00
|
|
|
|
(get_frame_base (tfid) == args[0]))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
fid = tfid;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* We couldn't identify the frame as an existing frame, but
|
|
|
|
|
perhaps we can create one with a single argument. */
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
default:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#ifdef SETUP_ARBITRARY_FRAME
|
|
|
|
|
return SETUP_ARBITRARY_FRAME (numargs, args);
|
|
|
|
|
#else
|
|
|
|
|
/* Usual case. Do it here rather than have everyone supply
|
1999-07-07 22:19:36 +02:00
|
|
|
|
a SETUP_ARBITRARY_FRAME that does this. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (numargs == 1)
|
|
|
|
|
return create_new_frame (args[0], 0);
|
|
|
|
|
error ("Too many args in frame specification");
|
|
|
|
|
#endif
|
|
|
|
|
/* NOTREACHED */
|
|
|
|
|
}
|
|
|
|
|
/* NOTREACHED */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print verbosely the selected frame or the frame at address ADDR.
|
|
|
|
|
This means absolutely all information in the frame is printed. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
frame_info (char *addr_exp, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct frame_info *fi;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
struct symbol *func;
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
struct frame_info *calling_frame_info;
|
|
|
|
|
int i, count, numregs;
|
|
|
|
|
char *funname = 0;
|
|
|
|
|
enum language funlang = language_unknown;
|
2003-05-03 02:26:34 +02:00
|
|
|
|
const char *pc_regname;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (!target_has_stack)
|
|
|
|
|
error ("No stack.");
|
|
|
|
|
|
2003-05-03 02:26:34 +02:00
|
|
|
|
/* Name of the value returned by get_frame_pc(). Per comments, "pc"
|
|
|
|
|
is not a good name. */
|
|
|
|
|
if (PC_REGNUM >= 0)
|
|
|
|
|
/* OK, this is weird. The PC_REGNUM hardware register's value can
|
|
|
|
|
easily not match that of the internal value returned by
|
|
|
|
|
get_frame_pc(). */
|
|
|
|
|
pc_regname = REGISTER_NAME (PC_REGNUM);
|
|
|
|
|
else
|
|
|
|
|
/* But then, this is weird to. Even without PC_REGNUM, an
|
|
|
|
|
architectures will often have a hardware register called "pc",
|
|
|
|
|
and that register's value, again, can easily not match
|
|
|
|
|
get_frame_pc(). */
|
|
|
|
|
pc_regname = "pc";
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
fi = parse_frame_specification (addr_exp);
|
|
|
|
|
if (fi == NULL)
|
|
|
|
|
error ("Invalid frame specified.");
|
|
|
|
|
|
2002-11-29 02:52:02 +01:00
|
|
|
|
find_frame_sal (fi, &sal);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
func = get_frame_function (fi);
|
2002-11-29 02:52:02 +01:00
|
|
|
|
/* FIXME: cagney/2002-11-28: Why bother? Won't sal.symtab contain
|
|
|
|
|
the same value. */
|
2002-12-09 04:30:44 +01:00
|
|
|
|
s = find_pc_symtab (get_frame_pc (fi));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (func)
|
|
|
|
|
{
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
/* I'd like to use SYMBOL_PRINT_NAME() here, to display
|
1999-04-16 03:35:26 +02:00
|
|
|
|
* the demangled name that we already have stored in
|
|
|
|
|
* the symbol table, but we stored a version with
|
|
|
|
|
* DMGL_PARAMS turned on, and here we don't want
|
|
|
|
|
* to display parameters. So call the demangler again,
|
|
|
|
|
* with DMGL_ANSI only. RT
|
|
|
|
|
* (Yes, I know that printf_symbol_filtered() will
|
|
|
|
|
* again try to demangle the name on the fly, but
|
|
|
|
|
* the issue is that if cplus_demangle() fails here,
|
|
|
|
|
* it'll fail there too. So we want to catch the failure
|
|
|
|
|
* ("demangled==NULL" case below) here, while we still
|
|
|
|
|
* have our hands on the function symbol.)
|
|
|
|
|
*/
|
1999-07-07 22:19:36 +02:00
|
|
|
|
char *demangled;
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 22:36:23 +01:00
|
|
|
|
funname = DEPRECATED_SYMBOL_NAME (func);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
funlang = SYMBOL_LANGUAGE (func);
|
|
|
|
|
if (funlang == language_cplus)
|
|
|
|
|
{
|
|
|
|
|
demangled = cplus_demangle (funname, DMGL_ANSI);
|
|
|
|
|
/* If the demangler fails, try the demangled name
|
|
|
|
|
* from the symbol table. This'll have parameters,
|
|
|
|
|
* but that's preferable to diplaying a mangled name.
|
|
|
|
|
*/
|
|
|
|
|
if (demangled == NULL)
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
funname = SYMBOL_PRINT_NAME (func);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (msymbol != NULL)
|
|
|
|
|
{
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 22:36:23 +01:00
|
|
|
|
funname = DEPRECATED_SYMBOL_NAME (msymbol);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
funlang = SYMBOL_LANGUAGE (msymbol);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
calling_frame_info = get_prev_frame (fi);
|
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (!addr_exp && frame_relative_level (deprecated_selected_frame) >= 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-04-21 22:23:34 +02:00
|
|
|
|
printf_filtered ("Stack level %d, frame at ",
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
frame_relative_level (deprecated_selected_frame));
|
2002-12-09 02:40:25 +01:00
|
|
|
|
print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
printf_filtered (":\n");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf_filtered ("Stack frame at ");
|
2002-12-09 02:40:25 +01:00
|
|
|
|
print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
printf_filtered (":\n");
|
|
|
|
|
}
|
2003-05-03 02:26:34 +02:00
|
|
|
|
printf_filtered (" %s = ", pc_regname);
|
2002-12-09 04:30:44 +01:00
|
|
|
|
print_address_numeric (get_frame_pc (fi), 1, gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
wrap_here (" ");
|
|
|
|
|
if (funname)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered (" in ");
|
|
|
|
|
fprintf_symbol_filtered (gdb_stdout, funname, funlang,
|
|
|
|
|
DMGL_ANSI | DMGL_PARAMS);
|
|
|
|
|
}
|
|
|
|
|
wrap_here (" ");
|
|
|
|
|
if (sal.symtab)
|
|
|
|
|
printf_filtered (" (%s:%d)", sal.symtab->filename, sal.line);
|
|
|
|
|
puts_filtered ("; ");
|
|
|
|
|
wrap_here (" ");
|
2003-05-03 02:26:34 +02:00
|
|
|
|
printf_filtered ("saved %s ", pc_regname);
|
2002-11-15 23:16:25 +01:00
|
|
|
|
print_address_numeric (frame_pc_unwind (fi), 1, gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
|
|
|
|
|
if (calling_frame_info)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered (" called by frame at ");
|
2002-12-09 02:40:25 +01:00
|
|
|
|
print_address_numeric (get_frame_base (calling_frame_info),
|
|
|
|
|
1, gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2002-12-09 01:32:08 +01:00
|
|
|
|
if (get_next_frame (fi) && calling_frame_info)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
puts_filtered (",");
|
|
|
|
|
wrap_here (" ");
|
2002-12-09 01:32:08 +01:00
|
|
|
|
if (get_next_frame (fi))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
printf_filtered (" caller of frame at ");
|
2002-12-09 02:40:25 +01:00
|
|
|
|
print_address_numeric (get_frame_base (get_next_frame (fi)), 1,
|
|
|
|
|
gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2002-12-09 01:32:08 +01:00
|
|
|
|
if (get_next_frame (fi) || calling_frame_info)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
puts_filtered ("\n");
|
|
|
|
|
if (s)
|
2002-11-29 02:52:02 +01:00
|
|
|
|
printf_filtered (" source language %s.\n",
|
|
|
|
|
language_str (s->language));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
/* Address of the argument list for this frame, or 0. */
|
2003-04-01 21:11:01 +02:00
|
|
|
|
CORE_ADDR arg_list = get_frame_args_address (fi);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Number of args for this frame, or -1 if unknown. */
|
|
|
|
|
int numargs;
|
|
|
|
|
|
|
|
|
|
if (arg_list == 0)
|
|
|
|
|
printf_filtered (" Arglist at unknown address.\n");
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf_filtered (" Arglist at ");
|
|
|
|
|
print_address_numeric (arg_list, 1, gdb_stdout);
|
|
|
|
|
printf_filtered (",");
|
|
|
|
|
|
2003-06-09 19:35:59 +02:00
|
|
|
|
if (!FRAME_NUM_ARGS_P ())
|
|
|
|
|
{
|
|
|
|
|
numargs = -1;
|
|
|
|
|
puts_filtered (" args: ");
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
else
|
2003-06-09 19:35:59 +02:00
|
|
|
|
{
|
|
|
|
|
numargs = FRAME_NUM_ARGS (fi);
|
|
|
|
|
gdb_assert (numargs >= 0);
|
|
|
|
|
if (numargs == 0)
|
|
|
|
|
puts_filtered (" no args.");
|
|
|
|
|
else if (numargs == 1)
|
|
|
|
|
puts_filtered (" 1 arg: ");
|
|
|
|
|
else
|
|
|
|
|
printf_filtered (" %d args: ", numargs);
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
print_frame_args (func, fi, numargs, gdb_stdout);
|
|
|
|
|
puts_filtered ("\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
/* Address of the local variables for this frame, or 0. */
|
2003-04-01 21:11:01 +02:00
|
|
|
|
CORE_ADDR arg_list = get_frame_locals_address (fi);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (arg_list == 0)
|
|
|
|
|
printf_filtered (" Locals at unknown address,");
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf_filtered (" Locals at ");
|
|
|
|
|
print_address_numeric (arg_list, 1, gdb_stdout);
|
|
|
|
|
printf_filtered (",");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-06-01 22:44:21 +02:00
|
|
|
|
/* Print as much information as possible on the location of all the
|
|
|
|
|
registers. */
|
|
|
|
|
{
|
|
|
|
|
enum lval_type lval;
|
|
|
|
|
int optimized;
|
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
int realnum;
|
|
|
|
|
int count;
|
|
|
|
|
int i;
|
|
|
|
|
int need_nl = 1;
|
|
|
|
|
|
|
|
|
|
/* The sp is special; what's displayed isn't the save address, but
|
|
|
|
|
the value of the previous frame's sp. This is a legacy thing,
|
|
|
|
|
at one stage the frame cached the previous frame's SP instead
|
|
|
|
|
of its address, hence it was easiest to just display the cached
|
|
|
|
|
value. */
|
|
|
|
|
if (SP_REGNUM >= 0)
|
|
|
|
|
{
|
|
|
|
|
/* Find out the location of the saved stack pointer with out
|
|
|
|
|
actually evaluating it. */
|
|
|
|
|
frame_register_unwind (fi, SP_REGNUM, &optimized, &lval, &addr,
|
|
|
|
|
&realnum, NULL);
|
|
|
|
|
if (!optimized && lval == not_lval)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-05-08 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh: Delete references to MAX_REGISTER_RAW_SIZE.
* gdbarch.h: Re-generate.
* defs.h (MAX_REGISTER_RAW_SIZE): Delete macro.
(legacy_max_register_raw_size): Delete declaration.
* regcache.c (legacy_max_register_raw_size): Delete function.
* valops.c: Replace MAX_REGISTER_RAW_SIZE with MAX_REGISTER_SIZE.
* target.c, stack.c, sparc-tdep.c, sh-tdep.c: Update.
* rs6000-tdep.c, rs6000-nat.c, remote.c, remote-sim.c: Update.
* remote-rdp.c, remote-array.c, regcache.c: Update.
* ppc-linux-nat.c, monitor.c, mn10300-tdep.c: Update.
* mips-tdep.c, mips-linux-tdep.c, m68klinux-nat.c: Update.
* infptrace.c, ia64-tdep.c, i386-tdep.c, frame.c: Update.
* findvar.c, dwarf2cfi.c: Update.
Index: tui/ChangeLog
2003-05-08 Andrew Cagney <cagney@redhat.com>
* tuiRegs.c: Use MAX_REGISTER_SIZE instead of
MAX_REGISTER_RAW_SIZE.
Index: mi/ChangeLog
2003-05-08 Andrew Cagney <cagney@redhat.com>
* mi-main.c (register_changed_p): Use MAX_REGISTER_SIZE instead of
MAX_REGISTER_RAW_SIZE.
2003-05-08 22:52:49 +02:00
|
|
|
|
char value[MAX_REGISTER_SIZE];
|
2002-06-01 22:44:21 +02:00
|
|
|
|
CORE_ADDR sp;
|
|
|
|
|
frame_register_unwind (fi, SP_REGNUM, &optimized, &lval, &addr,
|
|
|
|
|
&realnum, value);
|
2003-05-22 20:37:05 +02:00
|
|
|
|
/* NOTE: cagney/2003-05-22: This is assuming that the
|
|
|
|
|
stack pointer was packed as an unsigned integer. That
|
|
|
|
|
may or may not be valid. */
|
2004-08-02 Andrew Cagney <cagney@gnu.org>
Replace DEPRECATED_REGISTER_RAW_SIZE with register_size.
* rs6000-tdep.c (rs6000_push_dummy_call)
(rs6000_extract_return_value): Use register_size.
* xstormy16-tdep.c (xstormy16_get_saved_register)
(xstormy16_extract_return_value): Ditto.
* valops.c (value_assign): Ditto.
* v850ice.c (v850ice_fetch_registers, v850ice_store_registers):
* v850-tdep.c (v850_extract_return_value): Ditto.
* tracepoint.c (collect_symbol): Ditto.
* target.c (debug_print_register): Ditto.
* stack.c (frame_info): Ditto.
* rs6000-nat.c (ARCH64, fetch_register, store_register): Ditto.
* rom68k-rom.c (rom68k_supply_one_register): Ditto.
* remote.c (struct packet_reg, remote_wait, remote_async_wait)
(store_register_using_P): Ditto.
* remote-vxmips.c (vx_read_register, vx_write_register): Ditto.
* remote-sim.c (gdbsim_fetch_register, gdbsim_store_register): Ditto.
* remote-mips.c (mips_wait, mips_fetch_registers): Ditto.
* remote-e7000.c (fetch_regs_from_dump, sub2_from_pc): Ditto.
* regcache.c (deprecated_read_register_bytes)
(deprecated_write_register_bytes, read_register)
(write_register): Ditto.
* ppc-linux-nat.c (fetch_altivec_register, fetch_register)
(supply_vrregset, store_altivec_register, fill_vrregset): Ditto.
* monitor.c (monitor_supply_register, monitor_fetch_register)
(monitor_store_register): Ditto.
* mn10300-tdep.c (mn10300_pop_frame_regular)
(mn10300_print_register): Ditto.
* mipsv4-nat.c (fill_fpregset): Ditto.
* mips-linux-tdep.c (supply_32bit_reg, fill_fpregset)
(mips64_fill_fpregset): Ditto.
* mi/mi-main.c (register_changed_p, get_register)
(mi_cmd_data_write_register_values): Ditto.
* lynx-nat.c (fetch_inferior_registers, store_inferior_registers):
* irix5-nat.c (fill_gregset, fetch_core_registers):
* infrun.c (write_inferior_status_register): Ditto.
* infptrace.c (fetch_register, store_register): Ditto.
* infcmd.c (default_print_registers_info): Ditto.
* ia64-linux-nat.c (COPY_REG, fill_fpregset): Ditto.
* ia64-aix-nat.c (COPY_REG, fill_gregset): Ditto.
* i386gnu-nat.c (gnu_store_registers, fill): Ditto.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Ditto.
* hppah-nat.c (store_inferior_registers, fetch_register):
* findvar.c (value_from_register): Ditto.
* dve3900-rom.c (fetch_bitmapped_register):
* cris-tdep.c (cris_gdbarch_init): Ditto.
* alpha-tdep.h: Ditto.
* aix-thread.c (pd_enable, fill_sprs64, fill_sprs32): Ditto.
2004-08-03 02:57:27 +02:00
|
|
|
|
sp = extract_unsigned_integer (value, register_size (current_gdbarch, SP_REGNUM));
|
2002-06-01 22:44:21 +02:00
|
|
|
|
printf_filtered (" Previous frame's sp is ");
|
|
|
|
|
print_address_numeric (sp, 1, gdb_stdout);
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
need_nl = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2002-06-01 22:44:21 +02:00
|
|
|
|
else if (!optimized && lval == lval_memory)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered (" Previous frame's sp at ");
|
|
|
|
|
print_address_numeric (addr, 1, gdb_stdout);
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
need_nl = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (!optimized && lval == lval_register)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered (" Previous frame's sp in %s\n",
|
|
|
|
|
REGISTER_NAME (realnum));
|
|
|
|
|
need_nl = 0;
|
|
|
|
|
}
|
|
|
|
|
/* else keep quiet. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
count = 0;
|
|
|
|
|
numregs = NUM_REGS + NUM_PSEUDO_REGS;
|
|
|
|
|
for (i = 0; i < numregs; i++)
|
2003-09-25 18:12:32 +02:00
|
|
|
|
if (i != SP_REGNUM
|
|
|
|
|
&& gdbarch_register_reggroup_p (current_gdbarch, i, all_reggroup))
|
2002-06-01 22:44:21 +02:00
|
|
|
|
{
|
|
|
|
|
/* Find out the location of the saved register without
|
|
|
|
|
fetching the corresponding value. */
|
|
|
|
|
frame_register_unwind (fi, i, &optimized, &lval, &addr, &realnum,
|
|
|
|
|
NULL);
|
|
|
|
|
/* For moment, only display registers that were saved on the
|
|
|
|
|
stack. */
|
|
|
|
|
if (!optimized && lval == lval_memory)
|
|
|
|
|
{
|
|
|
|
|
if (count == 0)
|
|
|
|
|
puts_filtered (" Saved registers:\n ");
|
|
|
|
|
else
|
|
|
|
|
puts_filtered (",");
|
|
|
|
|
wrap_here (" ");
|
|
|
|
|
printf_filtered (" %s at ", REGISTER_NAME (i));
|
|
|
|
|
print_address_numeric (addr, 1, gdb_stdout);
|
|
|
|
|
count++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (count || need_nl)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
puts_filtered ("\n");
|
2002-06-01 22:44:21 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print briefly all stack frames or just the innermost COUNT frames. */
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void backtrace_command_1 (char *count_exp, int show_locals,
|
|
|
|
|
int from_tty);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
backtrace_command_1 (char *count_exp, int show_locals, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct frame_info *fi;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
int count;
|
|
|
|
|
int i;
|
|
|
|
|
struct frame_info *trailing;
|
|
|
|
|
int trailing_level;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (!target_has_stack)
|
|
|
|
|
error ("No stack.");
|
|
|
|
|
|
|
|
|
|
/* The following code must do two things. First, it must
|
|
|
|
|
set the variable TRAILING to the frame from which we should start
|
|
|
|
|
printing. Second, it must set the variable count to the number
|
|
|
|
|
of frames which we should print, or -1 if all of them. */
|
|
|
|
|
trailing = get_current_frame ();
|
2000-02-29 08:17:15 +01:00
|
|
|
|
|
|
|
|
|
/* The target can be in a state where there is no valid frames
|
|
|
|
|
(e.g., just connected). */
|
|
|
|
|
if (trailing == NULL)
|
|
|
|
|
error ("No stack.");
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
trailing_level = 0;
|
|
|
|
|
if (count_exp)
|
|
|
|
|
{
|
2000-10-30 16:32:51 +01:00
|
|
|
|
count = parse_and_eval_long (count_exp);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (count < 0)
|
|
|
|
|
{
|
|
|
|
|
struct frame_info *current;
|
|
|
|
|
|
|
|
|
|
count = -count;
|
|
|
|
|
|
|
|
|
|
current = trailing;
|
|
|
|
|
while (current && count--)
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
current = get_prev_frame (current);
|
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Will stop when CURRENT reaches the top of the stack. TRAILING
|
|
|
|
|
will be COUNT below it. */
|
|
|
|
|
while (current)
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
trailing = get_prev_frame (trailing);
|
|
|
|
|
current = get_prev_frame (current);
|
|
|
|
|
trailing_level++;
|
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
count = -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
count = -1;
|
|
|
|
|
|
|
|
|
|
if (info_verbose)
|
|
|
|
|
{
|
|
|
|
|
struct partial_symtab *ps;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Read in symbols for all of the frames. Need to do this in
|
1999-07-07 22:19:36 +02:00
|
|
|
|
a separate pass so that "Reading in symbols for xxx" messages
|
|
|
|
|
don't screw up the appearance of the backtrace. Also
|
|
|
|
|
if people have strong opinions against reading symbols for
|
|
|
|
|
backtrace this may have to be an option. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
i = count;
|
|
|
|
|
for (fi = trailing;
|
|
|
|
|
fi != NULL && i--;
|
|
|
|
|
fi = get_prev_frame (fi))
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
2003-07-11 17:31:43 +02:00
|
|
|
|
ps = find_pc_psymtab (get_frame_address_in_block (fi));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (ps)
|
|
|
|
|
PSYMTAB_TO_SYMTAB (ps); /* Force syms to come in */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0, fi = trailing;
|
|
|
|
|
fi && count--;
|
|
|
|
|
i++, fi = get_prev_frame (fi))
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
|
|
|
|
|
/* Don't use print_stack_frame; if an error() occurs it probably
|
1999-07-07 22:19:36 +02:00
|
|
|
|
means further attempts to backtrace would fail (on the other
|
|
|
|
|
hand, perhaps the code does or could be fixed to make sure
|
|
|
|
|
the frame->prev field gets set to NULL in that case). */
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_frame_info (fi, 1, LOCATION, 1);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (show_locals)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
print_frame_local_vars (fi, 1, gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we've stopped before the end, mention that. */
|
|
|
|
|
if (fi && from_tty)
|
|
|
|
|
printf_filtered ("(More stack frames follow...)\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
backtrace_command (char *arg, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct cleanup *old_chain = (struct cleanup *) NULL;
|
|
|
|
|
char **argv = (char **) NULL;
|
|
|
|
|
int argIndicatingFullTrace = (-1), totArgLen = 0, argc = 0;
|
|
|
|
|
char *argPtr = arg;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
if (arg != (char *) NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
argv = buildargv (arg);
|
1999-04-26 20:34:20 +02:00
|
|
|
|
old_chain = make_cleanup_freeargv (argv);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
argc = 0;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
for (i = 0; (argv[i] != (char *) NULL); i++)
|
|
|
|
|
{
|
2000-02-08 05:39:02 +01:00
|
|
|
|
unsigned int j;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
|
|
for (j = 0; (j < strlen (argv[i])); j++)
|
|
|
|
|
argv[i][j] = tolower (argv[i][j]);
|
|
|
|
|
|
|
|
|
|
if (argIndicatingFullTrace < 0 && subset_compare (argv[i], "full"))
|
|
|
|
|
argIndicatingFullTrace = argc;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
argc++;
|
|
|
|
|
totArgLen += strlen (argv[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
totArgLen += argc;
|
|
|
|
|
if (argIndicatingFullTrace >= 0)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
{
|
|
|
|
|
if (totArgLen > 0)
|
|
|
|
|
{
|
|
|
|
|
argPtr = (char *) xmalloc (totArgLen + 1);
|
|
|
|
|
if (!argPtr)
|
|
|
|
|
nomem (0);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
memset (argPtr, 0, totArgLen + 1);
|
|
|
|
|
for (i = 0; (i < (argc + 1)); i++)
|
|
|
|
|
{
|
|
|
|
|
if (i != argIndicatingFullTrace)
|
|
|
|
|
{
|
|
|
|
|
strcat (argPtr, argv[i]);
|
|
|
|
|
strcat (argPtr, " ");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
argPtr = (char *) NULL;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
backtrace_command_1 (argPtr, (argIndicatingFullTrace >= 0), from_tty);
|
|
|
|
|
|
|
|
|
|
if (argIndicatingFullTrace >= 0 && totArgLen > 0)
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (argPtr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (old_chain)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
do_cleanups (old_chain);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void backtrace_full_command (char *arg, int from_tty);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
backtrace_full_command (char *arg, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
backtrace_command_1 (arg, 1, from_tty);
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* Print the local variables of a block B active in FRAME.
|
|
|
|
|
Return 1 if any variables were printed; 0 otherwise. */
|
|
|
|
|
|
|
|
|
|
static int
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
print_block_frame_locals (struct block *b, struct frame_info *fi,
|
|
|
|
|
int num_tabs, struct ui_file *stream)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
struct dict_iterator iter;
|
|
|
|
|
int j;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
int values_printed = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
ALL_BLOCK_SYMBOLS (b, iter, sym)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (SYMBOL_CLASS (sym))
|
|
|
|
|
{
|
|
|
|
|
case LOC_LOCAL:
|
|
|
|
|
case LOC_REGISTER:
|
|
|
|
|
case LOC_STATIC:
|
|
|
|
|
case LOC_BASEREG:
|
Based on a patch from Daniel Berlin (dberlin@dberlin.org).
* symtab.h: Add opaque declarations of struct axs_value and
struct agent_expr.
(enum address_class): Add LOC_COMPUTED and LOC_COMPUTED_ARG.
(struct location_funcs): New type.
(struct symbol): Add "loc" to aux_value.
(SYMBOL_LOCATION_BATON, SYMBOL_LOCATION_FUNCS): New macros.
* dwarf2read.c: Include "dwarf2expr.h".
(dwarf2_symbol_mark_computed): New function.
(read_func_scope): Use it.
(var_decode_location): New function.
(new_symbol): Use it.
* dwarf2expr.c, dwarf2expr.h, dwarf2loc.c, dwarf2loc.h: New files.
* Makefile.in (SFILES): Add dwarf2loc.c and dwarf2expr.c.
(dwarf2expr_h, dwarf2loc_h): New variables.
(COMMON_OBS): Add dwarf2expr.o and dwarf2loc.o.
(dwarf2expr.o, dwarf2loc.o): New rules.
(dwarf2read.o): Add $(dwarf2expr_h) and $(dwarf2loc_h).
* buildsym.c (finish_block): Handle LOC_COMPUTED and
LOC_COMPUTED_ARG.
* findvar.c (symbol_read_needs_frame, read_var_value): Likewise.
* m2-exp.y (yylex): Likewise.
* printcmd.c (address_info, print_frame_args): Likewise.
* stack.c (print_block_frame_locals, print_frame_arg_vars): Likewise.
* symmisc.c (print_symbol, print_partial_symbols): Likewise.
* ada-lang.c (ada_resolve_subexp, symtab_for_sym)
(ada_add_block_symbols, fill_in_ada_prototype): Likewise.
* symtab.c (lookup_block_symbol): Likewise.
2003-02-21 16:24:18 +01:00
|
|
|
|
case LOC_COMPUTED:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
values_printed = 1;
|
|
|
|
|
for (j = 0; j < num_tabs; j++)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
fputs_filtered ("\t", stream);
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
fputs_filtered (SYMBOL_PRINT_NAME (sym), stream);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
fputs_filtered (" = ", stream);
|
|
|
|
|
print_variable_value (sym, fi, stream);
|
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
/* Ignore symbols which are not locals. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return values_printed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Same, but print labels. */
|
|
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
|
print_block_frame_labels (struct block *b, int *have_default,
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
struct ui_file *stream)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
struct dict_iterator iter;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct symbol *sym;
|
|
|
|
|
int values_printed = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
ALL_BLOCK_SYMBOLS (b, iter, sym)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2004-05-01 23:11:16 +02:00
|
|
|
|
if (strcmp (DEPRECATED_SYMBOL_NAME (sym), "default") == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (*have_default)
|
|
|
|
|
continue;
|
|
|
|
|
*have_default = 1;
|
|
|
|
|
}
|
|
|
|
|
if (SYMBOL_CLASS (sym) == LOC_LABEL)
|
|
|
|
|
{
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
sal = find_pc_line (SYMBOL_VALUE_ADDRESS (sym), 0);
|
|
|
|
|
values_printed = 1;
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
fputs_filtered (SYMBOL_PRINT_NAME (sym), stream);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (addressprint)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, " ");
|
|
|
|
|
print_address_numeric (SYMBOL_VALUE_ADDRESS (sym), 1, stream);
|
|
|
|
|
}
|
|
|
|
|
fprintf_filtered (stream, " in file %s, line %d\n",
|
|
|
|
|
sal.symtab->filename, sal.line);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return values_printed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print on STREAM all the local variables in frame FRAME,
|
|
|
|
|
including all the blocks active in that frame
|
|
|
|
|
at its current pc.
|
|
|
|
|
|
|
|
|
|
Returns 1 if the job was done,
|
|
|
|
|
or 0 if nothing was printed because we have no info
|
|
|
|
|
on the function running in FRAME. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
print_frame_local_vars (struct frame_info *fi, int num_tabs,
|
|
|
|
|
struct ui_file *stream)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct block *block = get_frame_block (fi, 0);
|
|
|
|
|
int values_printed = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (block == 0)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "No symbol table info available.\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
while (block != 0)
|
|
|
|
|
{
|
|
|
|
|
if (print_block_frame_locals (block, fi, num_tabs, stream))
|
|
|
|
|
values_printed = 1;
|
|
|
|
|
/* After handling the function's top-level block, stop.
|
1999-07-07 22:19:36 +02:00
|
|
|
|
Don't continue to its superblock, the block of
|
|
|
|
|
per-file symbols. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (BLOCK_FUNCTION (block))
|
|
|
|
|
break;
|
|
|
|
|
block = BLOCK_SUPERBLOCK (block);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!values_printed)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "No locals.\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Same, but print labels. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
print_frame_label_vars (struct frame_info *fi, int this_level_only,
|
|
|
|
|
struct ui_file *stream)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct blockvector *bl;
|
|
|
|
|
struct block *block = get_frame_block (fi, 0);
|
|
|
|
|
int values_printed = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int index, have_default = 0;
|
|
|
|
|
char *blocks_printed;
|
2002-12-09 04:30:44 +01:00
|
|
|
|
CORE_ADDR pc = get_frame_pc (fi);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (block == 0)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "No symbol table info available.\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bl = blockvector_for_pc (BLOCK_END (block) - 4, &index);
|
|
|
|
|
blocks_printed = (char *) alloca (BLOCKVECTOR_NBLOCKS (bl) * sizeof (char));
|
|
|
|
|
memset (blocks_printed, 0, BLOCKVECTOR_NBLOCKS (bl) * sizeof (char));
|
|
|
|
|
|
|
|
|
|
while (block != 0)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR end = BLOCK_END (block) - 4;
|
|
|
|
|
int last_index;
|
|
|
|
|
|
|
|
|
|
if (bl != blockvector_for_pc (end, &index))
|
|
|
|
|
error ("blockvector blotch");
|
|
|
|
|
if (BLOCKVECTOR_BLOCK (bl, index) != block)
|
|
|
|
|
error ("blockvector botch");
|
|
|
|
|
last_index = BLOCKVECTOR_NBLOCKS (bl);
|
|
|
|
|
index += 1;
|
|
|
|
|
|
|
|
|
|
/* Don't print out blocks that have gone by. */
|
|
|
|
|
while (index < last_index
|
|
|
|
|
&& BLOCK_END (BLOCKVECTOR_BLOCK (bl, index)) < pc)
|
|
|
|
|
index++;
|
|
|
|
|
|
|
|
|
|
while (index < last_index
|
|
|
|
|
&& BLOCK_END (BLOCKVECTOR_BLOCK (bl, index)) < end)
|
|
|
|
|
{
|
|
|
|
|
if (blocks_printed[index] == 0)
|
|
|
|
|
{
|
|
|
|
|
if (print_block_frame_labels (BLOCKVECTOR_BLOCK (bl, index), &have_default, stream))
|
|
|
|
|
values_printed = 1;
|
|
|
|
|
blocks_printed[index] = 1;
|
|
|
|
|
}
|
|
|
|
|
index++;
|
|
|
|
|
}
|
|
|
|
|
if (have_default)
|
|
|
|
|
return;
|
|
|
|
|
if (values_printed && this_level_only)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* After handling the function's top-level block, stop.
|
1999-07-07 22:19:36 +02:00
|
|
|
|
Don't continue to its superblock, the block of
|
|
|
|
|
per-file symbols. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (BLOCK_FUNCTION (block))
|
|
|
|
|
break;
|
|
|
|
|
block = BLOCK_SUPERBLOCK (block);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!values_printed && !this_level_only)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "No catches.\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
locals_info (char *args, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (!deprecated_selected_frame)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("No frame selected.");
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
print_frame_local_vars (deprecated_selected_frame, 0, gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
catch_info (char *ignore, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
struct symtab_and_line *sal;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Check for target support for exception handling */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
sal = target_enable_exception_callback (EX_EVENT_CATCH, 1);
|
|
|
|
|
if (sal)
|
|
|
|
|
{
|
|
|
|
|
/* Currently not handling this */
|
|
|
|
|
/* Ideally, here we should interact with the C++ runtime
|
|
|
|
|
system to find the list of active handlers, etc. */
|
|
|
|
|
fprintf_filtered (gdb_stdout, "Info catch not supported with this target/compiler combination.\n");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
/* Assume g++ compiled code -- old v 4.16 behaviour */
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (!deprecated_selected_frame)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
error ("No frame selected.");
|
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
print_frame_label_vars (deprecated_selected_frame, 0, gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
print_frame_arg_vars (struct frame_info *fi,
|
|
|
|
|
struct ui_file *stream)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct symbol *func = get_frame_function (fi);
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct block *b;
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
struct dict_iterator iter;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct symbol *sym, *sym2;
|
|
|
|
|
int values_printed = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (func == 0)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "No symbol table info available.\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
b = SYMBOL_BLOCK_VALUE (func);
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
ALL_BLOCK_SYMBOLS (b, iter, sym)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
switch (SYMBOL_CLASS (sym))
|
|
|
|
|
{
|
|
|
|
|
case LOC_ARG:
|
|
|
|
|
case LOC_LOCAL_ARG:
|
|
|
|
|
case LOC_REF_ARG:
|
|
|
|
|
case LOC_REGPARM:
|
|
|
|
|
case LOC_REGPARM_ADDR:
|
|
|
|
|
case LOC_BASEREG_ARG:
|
Based on a patch from Daniel Berlin (dberlin@dberlin.org).
* symtab.h: Add opaque declarations of struct axs_value and
struct agent_expr.
(enum address_class): Add LOC_COMPUTED and LOC_COMPUTED_ARG.
(struct location_funcs): New type.
(struct symbol): Add "loc" to aux_value.
(SYMBOL_LOCATION_BATON, SYMBOL_LOCATION_FUNCS): New macros.
* dwarf2read.c: Include "dwarf2expr.h".
(dwarf2_symbol_mark_computed): New function.
(read_func_scope): Use it.
(var_decode_location): New function.
(new_symbol): Use it.
* dwarf2expr.c, dwarf2expr.h, dwarf2loc.c, dwarf2loc.h: New files.
* Makefile.in (SFILES): Add dwarf2loc.c and dwarf2expr.c.
(dwarf2expr_h, dwarf2loc_h): New variables.
(COMMON_OBS): Add dwarf2expr.o and dwarf2loc.o.
(dwarf2expr.o, dwarf2loc.o): New rules.
(dwarf2read.o): Add $(dwarf2expr_h) and $(dwarf2loc_h).
* buildsym.c (finish_block): Handle LOC_COMPUTED and
LOC_COMPUTED_ARG.
* findvar.c (symbol_read_needs_frame, read_var_value): Likewise.
* m2-exp.y (yylex): Likewise.
* printcmd.c (address_info, print_frame_args): Likewise.
* stack.c (print_block_frame_locals, print_frame_arg_vars): Likewise.
* symmisc.c (print_symbol, print_partial_symbols): Likewise.
* ada-lang.c (ada_resolve_subexp, symtab_for_sym)
(ada_add_block_symbols, fill_in_ada_prototype): Likewise.
* symtab.c (lookup_block_symbol): Likewise.
2003-02-21 16:24:18 +01:00
|
|
|
|
case LOC_COMPUTED_ARG:
|
1999-04-16 03:35:26 +02:00
|
|
|
|
values_printed = 1;
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 18:17:25 +01:00
|
|
|
|
fputs_filtered (SYMBOL_PRINT_NAME (sym), stream);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
fputs_filtered (" = ", stream);
|
|
|
|
|
|
|
|
|
|
/* We have to look up the symbol because arguments can have
|
|
|
|
|
two entries (one a parameter, one a local) and the one we
|
|
|
|
|
want is the local, which lookup_symbol will find for us.
|
|
|
|
|
This includes gcc1 (not gcc2) on the sparc when passing a
|
|
|
|
|
small structure and gcc2 when the argument type is float
|
|
|
|
|
and it is passed as a double and converted to float by
|
|
|
|
|
the prologue (in the latter case the type of the LOC_ARG
|
|
|
|
|
symbol is double and the type of the LOC_LOCAL symbol is
|
|
|
|
|
float). There are also LOC_ARG/LOC_REGISTER pairs which
|
|
|
|
|
are not combined in symbol-reading. */
|
|
|
|
|
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 22:36:23 +01:00
|
|
|
|
sym2 = lookup_symbol (DEPRECATED_SYMBOL_NAME (sym),
|
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
|
|
|
|
b, VAR_DOMAIN, (int *) NULL, (struct symtab **) NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
print_variable_value (sym2, fi, stream);
|
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
/* Don't worry about things which aren't arguments. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!values_printed)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "No arguments.\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
args_info (char *ignore, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (!deprecated_selected_frame)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("No frame selected.");
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
print_frame_arg_vars (deprecated_selected_frame, gdb_stdout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
args_plus_locals_info (char *ignore, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
args_info (ignore, from_tty);
|
|
|
|
|
locals_info (ignore, from_tty);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2002-05-05 03:15:13 +02:00
|
|
|
|
/* Select frame FI. Also print the stack frame and show the source if
|
|
|
|
|
this is the tui version. */
|
2002-05-05 04:24:38 +02:00
|
|
|
|
static void
|
|
|
|
|
select_and_print_frame (struct frame_info *fi)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-05-05 03:15:13 +02:00
|
|
|
|
select_frame (fi);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (fi)
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_stack_frame (fi, 1, SRC_AND_LOC);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the symbol-block in which the selected frame is executing.
|
gdb/ChangeLog:
* stack.c (get_selected_block): Add new argument `addr_in_block',
used to return the exact code address we used to select the block,
not just the block.
* blockframe.c (get_frame_block, get_current_block): Same.
* frame.h (get_frame_block, get_current_block,
get_selected_block): Update declarations.
* linespec.c, stack.c, blockframe.c, breakpoint.c, findvar.c,
linespec.c, varobj.c, printcmd.c, symtab.c: Callers changed.
gdb/mi/ChangeLog:
* mi-cmd-stack.c (list_args_or_locals): Pass new arg to
get_frame_block. (See entry in gdb/ChangeLog.)
2002-04-06 00:04:43 +02:00
|
|
|
|
Can return zero under various legitimate circumstances.
|
|
|
|
|
|
|
|
|
|
If ADDR_IN_BLOCK is non-zero, set *ADDR_IN_BLOCK to the relevant
|
|
|
|
|
code address within the block returned. We use this to decide
|
|
|
|
|
which macros are in scope. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
struct block *
|
gdb/ChangeLog:
* stack.c (get_selected_block): Add new argument `addr_in_block',
used to return the exact code address we used to select the block,
not just the block.
* blockframe.c (get_frame_block, get_current_block): Same.
* frame.h (get_frame_block, get_current_block,
get_selected_block): Update declarations.
* linespec.c, stack.c, blockframe.c, breakpoint.c, findvar.c,
linespec.c, varobj.c, printcmd.c, symtab.c: Callers changed.
gdb/mi/ChangeLog:
* mi-cmd-stack.c (list_args_or_locals): Pass new arg to
get_frame_block. (See entry in gdb/ChangeLog.)
2002-04-06 00:04:43 +02:00
|
|
|
|
get_selected_block (CORE_ADDR *addr_in_block)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (!target_has_stack)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2002-11-29 01:15:48 +01:00
|
|
|
|
/* NOTE: cagney/2002-11-28: Why go to all this effort to not create
|
2004-07-10 03:17:53 +02:00
|
|
|
|
a selected/current frame? Perhaps this function is called,
|
2002-11-29 01:15:48 +01:00
|
|
|
|
indirectly, by WFI in "infrun.c" where avoiding the creation of
|
|
|
|
|
an inner most frame is very important (it slows down single
|
|
|
|
|
step). I suspect, though that this was true in the deep dark
|
|
|
|
|
past but is no longer the case. A mindless look at all the
|
|
|
|
|
callers tends to support this theory. I think we should be able
|
|
|
|
|
to assume that there is always a selcted frame. */
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
/* gdb_assert (deprecated_selected_frame != NULL); So, do you feel
|
|
|
|
|
lucky? */
|
|
|
|
|
if (!deprecated_selected_frame)
|
2002-11-29 01:15:48 +01:00
|
|
|
|
{
|
|
|
|
|
CORE_ADDR pc = read_pc ();
|
|
|
|
|
if (addr_in_block != NULL)
|
|
|
|
|
*addr_in_block = pc;
|
|
|
|
|
return block_for_pc (pc);
|
|
|
|
|
}
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
return get_frame_block (deprecated_selected_frame, addr_in_block);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find a frame a certain number of levels away from FRAME.
|
|
|
|
|
LEVEL_OFFSET_PTR points to an int containing the number of levels.
|
|
|
|
|
Positive means go to earlier frames (up); negative, the reverse.
|
|
|
|
|
The int that contains the number of levels is counted toward
|
|
|
|
|
zero as the frames for those levels are found.
|
|
|
|
|
If the top or bottom frame is reached, that frame is returned,
|
|
|
|
|
but the final value of *LEVEL_OFFSET_PTR is nonzero and indicates
|
|
|
|
|
how much farther the original request asked to go. */
|
|
|
|
|
|
|
|
|
|
struct frame_info *
|
2003-09-16 Andrew Cagney <cagney@redhat.com>
* buildsym.c: Remove more occurances of "register".
* coffread.c, dbxread.c, dcache.c, dwarf2read.c: Ditto.
* environ.c, eval.c, f-valprint.c, findvar.c: Ditto.
* gdbtypes.c, gnu-v2-abi.c, h8300-tdep.c, hppa-tdep.c: Ditto.
* infcmd.c, mdebugread.c, minsyms.c, mips-tdep.c: Ditto.
* printcmd.c, remote-vx.c, sh-stub.c, sh-tdep.c: Ditto.
* sh64-tdep.c, source.c, stabsread.c, stack.c: Ditto.
* standalone.c, symfile.c, symmisc.c, symtab.c: Ditto.
* utils.c, valops.c, values.c, xcoffread.c: Ditto.
2003-09-16 20:56:35 +02:00
|
|
|
|
find_relative_frame (struct frame_info *frame,
|
|
|
|
|
int *level_offset_ptr)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct frame_info *prev;
|
|
|
|
|
struct frame_info *frame1;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Going up is simple: just do get_prev_frame enough times
|
|
|
|
|
or until initial frame is reached. */
|
|
|
|
|
while (*level_offset_ptr > 0)
|
|
|
|
|
{
|
|
|
|
|
prev = get_prev_frame (frame);
|
|
|
|
|
if (prev == 0)
|
|
|
|
|
break;
|
|
|
|
|
(*level_offset_ptr)--;
|
|
|
|
|
frame = prev;
|
|
|
|
|
}
|
|
|
|
|
/* Going down is just as simple. */
|
|
|
|
|
if (*level_offset_ptr < 0)
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
while (*level_offset_ptr < 0)
|
|
|
|
|
{
|
|
|
|
|
frame1 = get_next_frame (frame);
|
|
|
|
|
if (!frame1)
|
|
|
|
|
break;
|
|
|
|
|
frame = frame1;
|
|
|
|
|
(*level_offset_ptr)++;
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
return frame;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The "select_frame" command. With no arg, NOP.
|
|
|
|
|
With arg LEVEL_EXP, select the frame at level LEVEL if it is a
|
|
|
|
|
valid level. Otherwise, treat level_exp as an address expression
|
|
|
|
|
and select it. See parse_frame_specification for more info on proper
|
|
|
|
|
frame expressions. */
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
select_frame_command (char *level_exp, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-08-28 19:27:44 +02:00
|
|
|
|
struct frame_info *frame;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (!target_has_stack)
|
|
|
|
|
error ("No stack.");
|
|
|
|
|
|
|
|
|
|
frame = parse_frame_specification (level_exp);
|
|
|
|
|
|
2002-05-05 03:15:13 +02:00
|
|
|
|
select_frame (frame);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The "frame" command. With no arg, print selected frame briefly.
|
|
|
|
|
With arg, behaves like select_frame and then prints the selected
|
|
|
|
|
frame. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
frame_command (char *level_exp, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
select_frame_command (level_exp, from_tty);
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The XDB Compatibility command to print the current frame. */
|
|
|
|
|
|
1999-04-26 20:34:20 +02:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
current_frame_command (char *level_exp, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (target_has_stack == 0 || deprecated_selected_frame == 0)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
error ("No stack.");
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
|
1999-04-26 20:34:20 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
/* Select the frame up one or COUNT stack levels
|
|
|
|
|
from the previously selected frame, and print it briefly. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
up_silently_base (char *count_exp)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct frame_info *fi;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int count = 1, count1;
|
|
|
|
|
if (count_exp)
|
2000-10-30 16:32:51 +01:00
|
|
|
|
count = parse_and_eval_long (count_exp);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
count1 = count;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (target_has_stack == 0 || deprecated_selected_frame == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("No stack.");
|
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
fi = find_relative_frame (deprecated_selected_frame, &count1);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (count1 != 0 && count_exp == 0)
|
|
|
|
|
error ("Initial frame selected; you cannot go up.");
|
2002-05-05 03:15:13 +02:00
|
|
|
|
select_frame (fi);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
up_silently_command (char *count_exp, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
up_silently_base (count_exp);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
up_command (char *count_exp, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
up_silently_base (count_exp);
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Select the frame down one or COUNT stack levels
|
|
|
|
|
from the previously selected frame, and print it briefly. */
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
down_silently_base (char *count_exp)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct frame_info *frame;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
int count = -1, count1;
|
|
|
|
|
if (count_exp)
|
2000-10-30 16:32:51 +01:00
|
|
|
|
count = -parse_and_eval_long (count_exp);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
count1 = count;
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (target_has_stack == 0 || deprecated_selected_frame == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("No stack.");
|
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
frame = find_relative_frame (deprecated_selected_frame, &count1);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (count1 != 0 && count_exp == 0)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
/* We only do this if count_exp is not specified. That way "down"
|
1999-07-07 22:19:36 +02:00
|
|
|
|
means to really go down (and let me know if that is
|
|
|
|
|
impossible), but "down 9999" can be used to mean go all the way
|
|
|
|
|
down without getting an error. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
error ("Bottom (i.e., innermost) frame selected; you cannot go down.");
|
|
|
|
|
}
|
|
|
|
|
|
2002-05-05 03:15:13 +02:00
|
|
|
|
select_frame (frame);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
down_silently_command (char *count_exp, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
down_silently_base (count_exp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
down_command (char *count_exp, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
down_silently_base (count_exp);
|
2004-04-28 Andrew Cagney <cagney@redhat.com>
* stack.c (print_stack_frame_stub): Delete declaration.
(struct print_stack_frame_args, print_stack_frame)
(print_frame_info, print_frame): Replace "source" with print what.
Replace "print" with "print_level". Replace "args" with
"print_args".
* frame.h (show_and_print_stack_frame, print_stack_frame)
(print_frame_info): Update declarations.
* stack.c (select_and_print_frame, frame_command)
(current_frame_command, up_command, down_command): Update calls -
use get_selected_frame, pass "enum print_what" for source, do not
call frame_relative_level.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Ditto.
* remote-rdp.c (remote_rdp_open): Ditto.
* remote-mips.c (common_open): Ditto.
* remote-e7000.c (e7000_start_remote): Ditto.
* ocd.c (ocd_start_remote): Ditto.
* mi/mi-main.c (mi_cmd_exec_return): Ditto.
* infrun.c (normal_stop): Ditto.
* inflow.c (kill_command): Ditto.
* infcmd.c (finish_command): Ditto.
* corelow.c (core_open): Ditto.
* tracepoint.c (finish_tfind_command): Ditto.
* thread.c (info_threads_command, info_threads_command)
(restore_current_thread, do_captured_thread_select): Ditto.
* ada-tasks.c (task_command): Ditto.
2004-04-28 18:36:25 +02:00
|
|
|
|
print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-02-03 05:14:45 +01:00
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
return_command (char *retval_exp, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct symbol *thisfun;
|
2001-11-10 22:34:56 +01:00
|
|
|
|
struct value *return_value = NULL;
|
2003-10-24 00:36:14 +02:00
|
|
|
|
const char *query_prefix = "";
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* FIXME: cagney/2003-10-20: Perform a minimal existance test on the
|
|
|
|
|
target. If that fails, error out. For the moment don't rely on
|
|
|
|
|
get_selected_frame as it's error message is the the singularly
|
|
|
|
|
obscure "No registers". */
|
|
|
|
|
if (!target_has_registers)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
error ("No selected frame.");
|
2003-10-24 00:36:14 +02:00
|
|
|
|
thisfun = get_frame_function (get_selected_frame ());
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* Compute the return value. If the computation triggers an error,
|
|
|
|
|
let it bail. If the return type can't be handled, set
|
|
|
|
|
RETURN_VALUE to NULL, and QUERY_PREFIX to an informational
|
|
|
|
|
message. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (retval_exp)
|
|
|
|
|
{
|
|
|
|
|
struct type *return_type = NULL;
|
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* Compute the return value. Should the computation fail, this
|
|
|
|
|
call throws an error. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return_value = parse_and_eval (retval_exp);
|
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* Cast return value to the return type of the function. Should
|
|
|
|
|
the cast fail, this call throws an error. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (thisfun != NULL)
|
|
|
|
|
return_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (thisfun));
|
|
|
|
|
if (return_type == NULL)
|
|
|
|
|
return_type = builtin_type_int;
|
2004-04-25 13:28:35 +02:00
|
|
|
|
CHECK_TYPEDEF (return_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
return_value = value_cast (return_type, return_value);
|
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* Make sure the value is fully evaluated. It may live in the
|
|
|
|
|
stack frame we're about to pop. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (VALUE_LAZY (return_value))
|
|
|
|
|
value_fetch_lazy (return_value);
|
|
|
|
|
|
2003-11-19 17:27:56 +01:00
|
|
|
|
if (TYPE_CODE (return_type) == TYPE_CODE_VOID)
|
|
|
|
|
/* If the return-type is "void", don't try to find the
|
|
|
|
|
return-value's location. However, do still evaluate the
|
|
|
|
|
return expression so that, even when the expression result
|
|
|
|
|
is discarded, side effects such as "return i++" still
|
|
|
|
|
occure. */
|
|
|
|
|
return_value = NULL;
|
2004-01-26 21:52:13 +01:00
|
|
|
|
/* FIXME: cagney/2004-01-17: If the architecture implements both
|
|
|
|
|
return_value and extract_returned_value_address, should allow
|
|
|
|
|
"return" to work - don't set return_value to NULL. */
|
2003-11-19 17:27:56 +01:00
|
|
|
|
else if (!gdbarch_return_value_p (current_gdbarch)
|
|
|
|
|
&& (TYPE_CODE (return_type) == TYPE_CODE_STRUCT
|
|
|
|
|
|| TYPE_CODE (return_type) == TYPE_CODE_UNION))
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-11-19 17:27:56 +01:00
|
|
|
|
/* NOTE: cagney/2003-10-20: Compatibility hack for legacy
|
|
|
|
|
code. Old architectures don't expect STORE_RETURN_VALUE
|
|
|
|
|
to be called with with a small struct that needs to be
|
|
|
|
|
stored in registers. Don't start doing it now. */
|
|
|
|
|
query_prefix = "\
|
|
|
|
|
A structure or union return type is not supported by this architecture.\n\
|
|
|
|
|
If you continue, the return value that you specified will be ignored.\n";
|
|
|
|
|
return_value = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
2003-11-19 17:27:56 +01:00
|
|
|
|
else if (using_struct_return (return_type, 0))
|
2003-10-24 00:36:14 +02:00
|
|
|
|
{
|
2003-11-19 17:27:56 +01:00
|
|
|
|
query_prefix = "\
|
|
|
|
|
The location at which to store the function's return value is unknown.\n\
|
|
|
|
|
If you continue, the return value that you specified will be ignored.\n";
|
|
|
|
|
return_value = NULL;
|
2003-10-24 00:36:14 +02:00
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* Does an interactive user really want to do this? Include
|
|
|
|
|
information, such as how well GDB can handle the return value, in
|
|
|
|
|
the query message. */
|
|
|
|
|
if (from_tty)
|
|
|
|
|
{
|
|
|
|
|
int confirmed;
|
|
|
|
|
if (thisfun == NULL)
|
|
|
|
|
confirmed = query ("%sMake selected stack frame return now? ",
|
|
|
|
|
query_prefix);
|
|
|
|
|
else
|
|
|
|
|
confirmed = query ("%sMake %s return now? ", query_prefix,
|
|
|
|
|
SYMBOL_PRINT_NAME (thisfun));
|
|
|
|
|
if (!confirmed)
|
|
|
|
|
error ("Not confirmed");
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* NOTE: cagney/2003-01-18: Is this silly? Rather than pop each
|
|
|
|
|
frame in turn, should this code just go straight to the relevant
|
|
|
|
|
frame and pop that? */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* First discard all frames inner-to the selected frame (making the
|
|
|
|
|
selected frame current). */
|
|
|
|
|
{
|
|
|
|
|
struct frame_id selected_id = get_frame_id (get_selected_frame ());
|
|
|
|
|
while (!frame_id_eq (selected_id, get_frame_id (get_current_frame ())))
|
|
|
|
|
{
|
|
|
|
|
if (frame_id_inner (selected_id, get_frame_id (get_current_frame ())))
|
|
|
|
|
/* Caught in the safety net, oops! We've gone way past the
|
|
|
|
|
selected frame. */
|
|
|
|
|
error ("Problem while popping stack frames (corrupt stack?)");
|
|
|
|
|
frame_pop (get_current_frame ());
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* Second discard the selected frame (which is now also the current
|
|
|
|
|
frame). */
|
2003-01-19 18:39:16 +01:00
|
|
|
|
frame_pop (get_current_frame ());
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* Store RETURN_VAUE in the just-returned register set. */
|
|
|
|
|
if (return_value != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct type *return_type = VALUE_TYPE (return_value);
|
2004-06-20 20:10:14 +02:00
|
|
|
|
gdb_assert (gdbarch_return_value (current_gdbarch, return_type,
|
|
|
|
|
NULL, NULL, NULL)
|
|
|
|
|
== RETURN_VALUE_REGISTER_CONVENTION);
|
|
|
|
|
gdbarch_return_value (current_gdbarch, return_type,
|
|
|
|
|
current_regcache, NULL /*read*/,
|
|
|
|
|
VALUE_CONTENTS (return_value) /*write*/);
|
2003-10-24 00:36:14 +02:00
|
|
|
|
}
|
2000-11-06 21:25:36 +01:00
|
|
|
|
|
2003-10-24 00:36:14 +02:00
|
|
|
|
/* If we are at the end of a call dummy now, pop the dummy frame
|
|
|
|
|
too. */
|
2003-10-31 23:38:22 +01:00
|
|
|
|
if (get_frame_type (get_current_frame ()) == DUMMY_FRAME)
|
|
|
|
|
frame_pop (get_current_frame ());
|
2000-11-06 21:25:36 +01:00
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
|
/* If interactive, print the frame that is now current. */
|
|
|
|
|
if (from_tty)
|
|
|
|
|
frame_command ("0", 1);
|
|
|
|
|
else
|
|
|
|
|
select_frame_command ("0", 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sets the scope to input function name, provided that the
|
|
|
|
|
function is within the current stack frame */
|
|
|
|
|
|
|
|
|
|
struct function_bounds
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR low, high;
|
|
|
|
|
};
|
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
|
static void func_command (char *arg, int from_tty);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
func_command (char *arg, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct frame_info *fp;
|
|
|
|
|
int found = 0;
|
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
int i;
|
|
|
|
|
int level = 1;
|
|
|
|
|
struct function_bounds *func_bounds = (struct function_bounds *) NULL;
|
|
|
|
|
|
|
|
|
|
if (arg != (char *) NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
fp = parse_frame_specification ("0");
|
|
|
|
|
sals = decode_line_spec (arg, 1);
|
|
|
|
|
func_bounds = (struct function_bounds *) xmalloc (
|
|
|
|
|
sizeof (struct function_bounds) * sals.nelts);
|
|
|
|
|
for (i = 0; (i < sals.nelts && !found); i++)
|
|
|
|
|
{
|
|
|
|
|
if (sals.sals[i].pc == (CORE_ADDR) 0 ||
|
|
|
|
|
find_pc_partial_function (sals.sals[i].pc,
|
|
|
|
|
(char **) NULL,
|
|
|
|
|
&func_bounds[i].low,
|
|
|
|
|
&func_bounds[i].high) == 0)
|
|
|
|
|
{
|
|
|
|
|
func_bounds[i].low =
|
|
|
|
|
func_bounds[i].high = (CORE_ADDR) NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
for (i = 0; (i < sals.nelts && !found); i++)
|
2002-12-09 04:30:44 +01:00
|
|
|
|
found = (get_frame_pc (fp) >= func_bounds[i].low &&
|
|
|
|
|
get_frame_pc (fp) < func_bounds[i].high);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (!found)
|
|
|
|
|
{
|
|
|
|
|
level = 1;
|
|
|
|
|
fp = find_relative_frame (fp, &level);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (!found && level == 0);
|
|
|
|
|
|
|
|
|
|
if (func_bounds)
|
2000-12-15 02:01:51 +01:00
|
|
|
|
xfree (func_bounds);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (!found)
|
|
|
|
|
printf_filtered ("'%s' not within current stack frame.\n", arg);
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
else if (fp != deprecated_selected_frame)
|
2002-05-05 04:24:38 +02:00
|
|
|
|
select_and_print_frame (fp);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Gets the language of the current frame. */
|
|
|
|
|
|
|
|
|
|
enum language
|
2000-07-30 03:48:28 +02:00
|
|
|
|
get_frame_language (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
|
struct symtab *s;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
enum language flang; /* The language of the current frame */
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
|
if (deprecated_selected_frame)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
2003-12-10 18:40:43 +01:00
|
|
|
|
/* We determine the current frame language by looking up its
|
|
|
|
|
associated symtab. To retrieve this symtab, we use the frame PC.
|
|
|
|
|
However we cannot use the frame pc as is, because it usually points
|
|
|
|
|
to the instruction following the "call", which is sometimes the first
|
|
|
|
|
instruction of another function. So we rely on
|
|
|
|
|
get_frame_address_in_block(), it provides us with a PC which is
|
|
|
|
|
guaranteed to be inside the frame's code block. */
|
|
|
|
|
s = find_pc_symtab (get_frame_address_in_block (deprecated_selected_frame));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
if (s)
|
|
|
|
|
flang = s->language;
|
|
|
|
|
else
|
|
|
|
|
flang = language_unknown;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
flang = language_unknown;
|
|
|
|
|
|
|
|
|
|
return flang;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
|
_initialize_stack (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
#if 0
|
1999-04-16 03:35:26 +02:00
|
|
|
|
backtrace_limit = 30;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
add_com ("return", class_stack, return_command,
|
|
|
|
|
"Make selected stack frame return to its caller.\n\
|
|
|
|
|
Control remains in the debugger, but when you continue\n\
|
|
|
|
|
execution will resume in the frame above the one now selected.\n\
|
|
|
|
|
If an argument is given, it is an expression for the value to return.");
|
|
|
|
|
|
|
|
|
|
add_com ("up", class_stack, up_command,
|
|
|
|
|
"Select and print stack frame that called this one.\n\
|
|
|
|
|
An argument says how many frames up to go.");
|
|
|
|
|
add_com ("up-silently", class_support, up_silently_command,
|
|
|
|
|
"Same as the `up' command, but does not print anything.\n\
|
|
|
|
|
This is useful in command scripts.");
|
|
|
|
|
|
|
|
|
|
add_com ("down", class_stack, down_command,
|
|
|
|
|
"Select and print stack frame called by this one.\n\
|
|
|
|
|
An argument says how many frames down to go.");
|
|
|
|
|
add_com_alias ("do", "down", class_stack, 1);
|
|
|
|
|
add_com_alias ("dow", "down", class_stack, 1);
|
|
|
|
|
add_com ("down-silently", class_support, down_silently_command,
|
|
|
|
|
"Same as the `down' command, but does not print anything.\n\
|
|
|
|
|
This is useful in command scripts.");
|
|
|
|
|
|
|
|
|
|
add_com ("frame", class_stack, frame_command,
|
|
|
|
|
"Select and print a stack frame.\n\
|
|
|
|
|
With no argument, print the selected stack frame. (See also \"info frame\").\n\
|
|
|
|
|
An argument specifies the frame to select.\n\
|
|
|
|
|
It can be a stack frame number or the address of the frame.\n\
|
|
|
|
|
With argument, nothing is printed if input is coming from\n\
|
|
|
|
|
a command file or a user-defined command.");
|
|
|
|
|
|
|
|
|
|
add_com_alias ("f", "frame", class_stack, 1);
|
|
|
|
|
|
|
|
|
|
if (xdb_commands)
|
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
|
add_com ("L", class_stack, current_frame_command,
|
|
|
|
|
"Print the current stack frame.\n");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
add_com_alias ("V", "frame", class_stack, 1);
|
|
|
|
|
}
|
|
|
|
|
add_com ("select-frame", class_stack, select_frame_command,
|
|
|
|
|
"Select a stack frame without printing anything.\n\
|
|
|
|
|
An argument specifies the frame to select.\n\
|
|
|
|
|
It can be a stack frame number or the address of the frame.\n");
|
|
|
|
|
|
|
|
|
|
add_com ("backtrace", class_stack, backtrace_command,
|
|
|
|
|
"Print backtrace of all stack frames, or innermost COUNT frames.\n\
|
|
|
|
|
With a negative argument, print outermost -COUNT frames.\n\
|
|
|
|
|
Use of the 'full' qualifier also prints the values of the local variables.\n");
|
|
|
|
|
add_com_alias ("bt", "backtrace", class_stack, 0);
|
|
|
|
|
if (xdb_commands)
|
|
|
|
|
{
|
|
|
|
|
add_com_alias ("t", "backtrace", class_stack, 0);
|
|
|
|
|
add_com ("T", class_stack, backtrace_full_command,
|
1999-07-07 22:19:36 +02:00
|
|
|
|
"Print backtrace of all stack frames, or innermost COUNT frames \n\
|
1999-04-16 03:35:26 +02:00
|
|
|
|
and the values of the local variables.\n\
|
|
|
|
|
With a negative argument, print outermost -COUNT frames.\n\
|
|
|
|
|
Usage: T <count>\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
add_com_alias ("where", "backtrace", class_alias, 0);
|
|
|
|
|
add_info ("stack", backtrace_command,
|
|
|
|
|
"Backtrace of the stack, or innermost COUNT frames.");
|
|
|
|
|
add_info_alias ("s", "stack", 1);
|
|
|
|
|
add_info ("frame", frame_info,
|
|
|
|
|
"All about selected stack frame, or frame at ADDR.");
|
|
|
|
|
add_info_alias ("f", "frame", 1);
|
|
|
|
|
add_info ("locals", locals_info,
|
|
|
|
|
"Local variables of current stack frame.");
|
|
|
|
|
add_info ("args", args_info,
|
|
|
|
|
"Argument variables of current stack frame.");
|
|
|
|
|
if (xdb_commands)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
add_com ("l", class_info, args_plus_locals_info,
|
|
|
|
|
"Argument and local variables of current stack frame.");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
if (dbx_commands)
|
1999-07-07 22:19:36 +02:00
|
|
|
|
add_com ("func", class_stack, func_command,
|
|
|
|
|
"Select the stack frame that contains <func>.\nUsage: func <name>\n");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
add_info ("catch", catch_info,
|
|
|
|
|
"Exceptions that can be caught in the current stack frame.");
|
|
|
|
|
|
|
|
|
|
#if 0
|
1999-07-07 22:19:36 +02:00
|
|
|
|
add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command,
|
|
|
|
|
"Specify maximum number of frames for \"backtrace\" to print by default.",
|
1999-04-16 03:35:26 +02:00
|
|
|
|
&setlist);
|
|
|
|
|
add_info ("backtrace-limit", backtrace_limit_info,
|
1999-07-07 22:19:36 +02:00
|
|
|
|
"The maximum number of frames for \"backtrace\" to print by default.");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
#endif
|
|
|
|
|
}
|