/* Print and select stack frames for GDB, the GNU debugger.
- Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
-This file is part of GDB.
+ Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
+ 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
+ Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This file is part of GDB.
-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.
+ 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.
-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., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <ctype.h>
#include "defs.h"
+#include "gdb_string.h"
#include "value.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "gdbcmd.h"
#include "gdbcore.h"
#include "target.h"
+#include "source.h"
#include "breakpoint.h"
#include "demangle.h"
#include "inferior.h"
+#include "annotate.h"
+#include "ui-out.h"
-static void
-return_command PARAMS ((char *, int));
+/* Prototypes for exported functions. */
-static void
-down_command PARAMS ((char *, int));
+void args_info (char *, int);
-static void
-down_silently_command PARAMS ((char *, int));
+void locals_info (char *, int);
-static void
-up_command PARAMS ((char *, int));
+void (*selected_frame_level_changed_hook) (int);
-static void
-up_silently_command PARAMS ((char *, int));
+void _initialize_stack (void);
-static void
-frame_command PARAMS ((char *, int));
+void return_command (char *, int);
-static void
-select_frame_command PARAMS ((char *, int));
+/* Prototypes for local functions. */
-static void
-args_info PARAMS ((char *, int));
+static void down_command (char *, int);
-static void
-print_frame_arg_vars PARAMS ((FRAME, GDB_FILE *));
+static void down_silently_base (char *);
-static void
-catch_info PARAMS ((char *, int));
+static void down_silently_command (char *, int);
-static void
-locals_info PARAMS ((char *, int));
+static void up_command (char *, int);
-static void
-print_frame_label_vars PARAMS ((FRAME, int, GDB_FILE *));
+static void up_silently_base (char *);
-static void
-print_frame_local_vars PARAMS ((FRAME, GDB_FILE *));
+static void up_silently_command (char *, int);
-static int
-print_block_frame_labels PARAMS ((struct block *, int *, GDB_FILE *));
+void frame_command (char *, int);
-static int
-print_block_frame_locals PARAMS ((struct block *, FRAME, GDB_FILE *));
+static void current_frame_command (char *, int);
-static void
-backtrace_command PARAMS ((char *, int));
+static void select_frame_command (char *, int);
-static FRAME
-parse_frame_specification PARAMS ((char *));
+static void print_frame_arg_vars (struct frame_info *, struct ui_file *);
-static void
-frame_info PARAMS ((char *, int));
+static void catch_info (char *, int);
+static void args_plus_locals_info (char *, int);
-extern int addressprint; /* Print addresses, or stay symbolic only? */
-extern int info_verbose; /* Verbosity of symbol reading msgs */
-extern int lines_to_list; /* # of lines "list" command shows by default */
+static void print_frame_label_vars (struct frame_info *, int,
+ struct ui_file *);
-/* The "selected" stack frame is used by default for local and arg access.
- May be zero, for no selected frame. */
+static void print_frame_local_vars (struct frame_info *, int,
+ struct ui_file *);
-FRAME selected_frame;
+static int print_block_frame_labels (struct block *, int *,
+ struct ui_file *);
-/* Level of the selected frame:
- 0 for innermost, 1 for its caller, ...
- or -1 for frame specified by address with no defined level. */
+static int print_block_frame_locals (struct block *,
+ struct frame_info *,
+ int,
+ struct ui_file *);
-int selected_frame_level;
+static void print_frame (struct frame_info *fi,
+ int level,
+ int source,
+ int args,
+ struct symtab_and_line sal);
+
+static void backtrace_command (char *, int);
+
+struct frame_info *parse_frame_specification (char *);
+
+static void frame_info (char *, int);
+
+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
cases and in a slightly different syntax. */
int annotation_level = 0;
-
\f
-struct print_stack_frame_args {
- struct frame_info *fi;
- int level;
- int source;
- int args;
-};
-static int print_stack_frame_stub PARAMS ((char *));
-
-/* Pass the args the way catch_errors wants them. */
+struct print_stack_frame_args
+ {
+ struct frame_info *fi;
+ int level;
+ int source;
+ int args;
+ };
+
+/* Show or print the frame arguments.
+ Pass the args the way catch_errors wants them. */
+static int print_stack_frame_stub (void *args);
static int
-print_stack_frame_stub (args)
- char *args;
+print_stack_frame_stub (void *args)
{
- struct print_stack_frame_args *p = (struct print_stack_frame_args *)args;
+ struct print_stack_frame_args *p = (struct print_stack_frame_args *) args;
+
print_frame_info (p->fi, p->level, p->source, p->args);
return 0;
}
-/* Print a stack frame briefly. FRAME should be the frame id
+/* Show or print a stack frame briefly. FRAME_INFI should be the frame info
and LEVEL should be its level in the stack (or -1 for level not defined).
This prints the level, the function executing, the arguments,
and the file name and line number.
If SOURCE is -1, print ONLY the source line. */
void
-print_stack_frame (frame, level, source)
- FRAME frame;
- int level;
- int source;
+print_stack_frame (struct frame_info *fi, int level, int source)
{
struct print_stack_frame_args args;
- args.fi = get_frame_info (frame);
+ args.fi = fi;
args.level = level;
args.source = source;
args.args = 1;
- catch_errors (print_stack_frame_stub, (char *)&args, "", RETURN_MASK_ERROR);
-}
+ catch_errors (print_stack_frame_stub, (char *) &args, "", RETURN_MASK_ALL);
+}
-struct print_args_args {
+struct print_args_args
+{
struct symbol *func;
struct frame_info *fi;
+ struct ui_file *stream;
};
-static int print_args_stub PARAMS ((char *));
+static int print_args_stub (void *);
/* Pass the args the way catch_errors wants them. */
+
static int
-print_args_stub (args)
- char *args;
+print_args_stub (void *args)
{
int numargs;
- struct print_args_args *p = (struct print_args_args *)args;
- FRAME_NUM_ARGS (numargs, (p->fi));
- print_frame_args (p->func, p->fi, numargs, gdb_stdout);
+ struct print_args_args *p = (struct print_args_args *) args;
+
+ numargs = FRAME_NUM_ARGS (p->fi);
+ print_frame_args (p->func, p->fi, numargs, p->stream);
return 0;
}
+/* Print information about a frame for frame "fi" at level "level".
+ 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. */
+
void
-print_frame_info (fi, level, source, args)
- struct frame_info *fi;
- register int level;
- int source;
- int args;
+print_frame_info (struct frame_info *fi, int level, int source, int args)
{
struct symtab_and_line sal;
- struct symbol *func;
- register char *funname = 0;
- enum language funlang = language_unknown;
- char buf[MAX_REGISTER_RAW_SIZE];
- CORE_ADDR sp;
+ int source_print;
+ int location_print;
-#if 0
- /* On the 68k, this spends too much time in m68k_find_saved_regs. */
-
- /* Get the value of SP_REGNUM relative to the frame. */
- get_saved_register (buf, (int *)NULL, (CORE_ADDR *)NULL,
- FRAME_INFO_ID (fi), SP_REGNUM, (enum lval_type *)NULL);
- sp = extract_address (buf, REGISTER_RAW_SIZE (SP_REGNUM));
-
- /* This is not a perfect test, because if a function alloca's some
- memory, puts some code there, and then jumps into it, then the test
- will succeed even though there is no call dummy. Probably best is
- to check for a bp_call_dummy breakpoint. */
- if (PC_IN_CALL_DUMMY (fi->pc, sp, fi->frame))
-#else
- if (frame_in_dummy (fi))
-#endif
+ if (get_frame_type (fi) == DUMMY_FRAME
+ || get_frame_type (fi) == SIGTRAMP_FRAME)
{
+ struct cleanup *uiout_cleanup
+ = make_cleanup_ui_out_tuple_begin_end (uiout, "frame");
+
+ annotate_frame_begin (level == -1 ? 0 : level, get_frame_pc (fi));
+
/* Do this regardless of SOURCE because we don't have any source
- to list for this frame. */
+ to list for this frame. */
if (level >= 0)
- printf_filtered ("#%-2d ", level);
- printf_filtered ("<function called from gdb>\n");
+ {
+ ui_out_text (uiout, "#");
+ ui_out_field_fmt_int (uiout, 2, ui_left, "level", level);
+ }
+ if (ui_out_is_mi_like_p (uiout))
+ {
+ annotate_frame_address ();
+ ui_out_field_core_addr (uiout, "addr", fi->pc);
+ annotate_frame_address_end ();
+ }
+
+ 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");
+ annotate_frame_end ();
+
+ do_cleanups (uiout_cleanup);
return;
}
- if (fi->signal_handler_caller)
+
+ /* If fi is not the innermost frame, that normally means that fi->pc
+ 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. */
+ find_frame_sal (fi, &sal);
+
+ location_print = (source == LOCATION
+ || source == LOC_AND_ADDRESS
+ || source == SRC_AND_LOC);
+
+ if (location_print || !sal.symtab)
+ print_frame (fi, level, source, args, sal);
+
+ source_print = (source == SRC_LINE || source == SRC_AND_LOC);
+
+ if (sal.symtab)
+ set_current_source_symtab_and_line (&sal);
+
+ if (source_print && sal.symtab)
{
- /* Do this regardless of SOURCE because we don't have any source
- to list for this frame. */
- if (level >= 0)
- printf_filtered ("#%-2d ", level);
- printf_filtered ("<signal handler called>\n");
- return;
+ struct symtab_and_line cursal;
+ int done = 0;
+ int mid_statement = (source == SRC_LINE) && (get_frame_pc (fi) != sal.pc);
+
+ if (annotation_level)
+ done = identify_source_line (sal.symtab, sal.line, mid_statement,
+ get_frame_pc (fi));
+ if (!done)
+ {
+ if (print_frame_info_listing_hook)
+ print_frame_info_listing_hook (sal.symtab, sal.line, sal.line + 1, 0);
+ else
+ {
+ /* 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)
+ {
+ ui_out_field_core_addr (uiout, "addr", get_frame_pc (fi));
+ ui_out_text (uiout, "\t");
+ }
+
+ print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
+ }
+ }
+ /* Make sure we have at least a default source file */
+ set_default_source_symtab_and_line ();
+ cursal = get_current_source_symtab_and_line ();
+ cursal.line = max (sal.line - get_lines_to_list () / 2, 1);
+ set_current_source_symtab_and_line (&cursal);
}
- /* If fi is not the innermost frame, that normally means that fi->pc
- 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 signal_handler_caller 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. */
- sal =
- find_pc_line (fi->pc,
- fi->next != NULL
- && !fi->next->signal_handler_caller
- && !frame_in_dummy (fi->next));
-
- func = find_pc_function (fi->pc);
+ if (source != 0)
+ set_default_breakpoint (1, get_frame_pc (fi), sal.symtab, sal.line);
+
+ annotate_frame_end ();
+
+ gdb_flush (gdb_stdout);
+}
+
+static void
+print_frame (struct frame_info *fi,
+ int level,
+ int source,
+ int args,
+ struct symtab_and_line sal)
+{
+ struct symbol *func;
+ register char *funname = 0;
+ enum language funlang = language_unknown;
+ struct ui_stream *stb;
+ struct cleanup *old_chain;
+ struct cleanup *list_chain;
+
+ stb = ui_out_stream_new (uiout);
+ old_chain = make_cleanup_ui_out_stream_delete (stb);
+
+ func = find_pc_function (frame_address_in_block (fi));
if (func)
{
/* In certain pathological cases, the symtabs give the wrong
- 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). */
-
- struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (fi->pc);
+ 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). */
+
+ struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (frame_address_in_block (fi));
if (msymbol != NULL
- && (SYMBOL_VALUE_ADDRESS (msymbol)
+ && (SYMBOL_VALUE_ADDRESS (msymbol)
> BLOCK_START (SYMBOL_BLOCK_VALUE (func))))
{
#if 0
}
else
{
+ /* I'd like to use SYMBOL_SOURCE_NAME() here, to display 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. (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.) */
+ char *demangled;
funname = SYMBOL_NAME (func);
funlang = SYMBOL_LANGUAGE (func);
+ if (funlang == language_cplus)
+ {
+ demangled = cplus_demangle (funname, DMGL_ANSI);
+ if (demangled == NULL)
+ /* 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. */
+ funname = SYMBOL_SOURCE_NAME (func);
+ }
}
}
else
{
- register struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (fi->pc);
+ struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (frame_address_in_block (fi));
if (msymbol != NULL)
{
funname = SYMBOL_NAME (msymbol);
}
}
- if (source >= 0 || !sal.symtab)
- {
- if (level >= 0)
- printf_filtered ("#%-2d ", level);
- if (addressprint)
- if (fi->pc != sal.pc || !sal.symtab)
- {
- print_address_numeric (fi->pc, 1, gdb_stdout);
- printf_filtered (" in ");
- }
- fprintf_symbol_filtered (gdb_stdout, funname ? funname : "??", funlang,
- DMGL_ANSI);
- wrap_here (" ");
- fputs_filtered (" (", gdb_stdout);
- if (args)
- {
- struct print_args_args args;
- args.fi = fi;
- args.func = func;
- catch_errors (print_args_stub, (char *)&args, "", RETURN_MASK_ERROR);
- }
- printf_filtered (")");
- if (sal.symtab && sal.symtab->filename)
- {
- wrap_here (" ");
- printf_filtered (" at %s:%d", sal.symtab->filename, sal.line);
- }
+ annotate_frame_begin (level == -1 ? 0 : level, get_frame_pc (fi));
+
+ list_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "frame");
-#ifdef PC_LOAD_SEGMENT
- /* If we couldn't print out function name but if can figure out what
- load segment this pc value is from, at least print out some info
- about its load segment. */
- if (!funname) {
- wrap_here (" ");
- printf_filtered (" from %s", PC_LOAD_SEGMENT (fi->pc));
+ if (level >= 0)
+ {
+ ui_out_text (uiout, "#");
+ ui_out_field_fmt_int (uiout, 2, ui_left, "level", level);
+ }
+ if (addressprint)
+ if (get_frame_pc (fi) != sal.pc
+ || !sal.symtab
+ || source == LOC_AND_ADDRESS)
+ {
+ annotate_frame_address ();
+ ui_out_field_core_addr (uiout, "addr", get_frame_pc (fi));
+ annotate_frame_address_end ();
+ ui_out_text (uiout, " in ");
}
-#endif
- printf_filtered ("\n");
+ annotate_frame_function_name ();
+ fprintf_symbol_filtered (stb->stream, funname ? funname : "??", funlang,
+ DMGL_ANSI);
+ ui_out_field_stream (uiout, "func", stb);
+ ui_out_wrap_hint (uiout, " ");
+ annotate_frame_args ();
+
+ ui_out_text (uiout, " (");
+ if (args)
+ {
+ struct print_args_args args;
+ struct cleanup *args_list_chain;
+ args.fi = fi;
+ args.func = func;
+ args.stream = gdb_stdout;
+ args_list_chain = make_cleanup_ui_out_list_begin_end (uiout, "args");
+ catch_errors (print_args_stub, &args, "", RETURN_MASK_ALL);
+ /* FIXME: args must be a list. If one argument is a string it will
+ have " that will not be properly escaped. */
+ /* Invoke ui_out_tuple_end. */
+ do_cleanups (args_list_chain);
+ QUIT;
+ }
+ ui_out_text (uiout, ")");
+ if (sal.symtab && sal.symtab->filename)
+ {
+ annotate_frame_source_begin ();
+ 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);
+ annotate_frame_source_end ();
}
- if ((source != 0) && sal.symtab)
+#ifdef PC_SOLIB
+ if (!funname || (!sal.symtab || !sal.symtab->filename))
{
- int done = 0;
- int mid_statement = source < 0 && fi->pc != sal.pc;
- if (annotation_level)
- done = identify_source_line (sal.symtab, sal.line, mid_statement,
- fi->pc);
- if (!done)
+ char *lib = PC_SOLIB (get_frame_pc (fi));
+ if (lib)
{
- if (addressprint && mid_statement)
- {
- print_address_numeric (fi->pc, 1, gdb_stdout);
- printf_filtered ("\t");
- }
- print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
+ annotate_frame_where ();
+ ui_out_wrap_hint (uiout, " ");
+ ui_out_text (uiout, " from ");
+ ui_out_field_string (uiout, "from", lib);
}
- current_source_line = max (sal.line - lines_to_list/2, 1);
}
- if (source != 0)
- set_default_breakpoint (1, fi->pc, sal.symtab, sal.line);
+#endif /* PC_SOLIB */
- gdb_flush (gdb_stdout);
+ /* do_cleanups will call ui_out_tuple_end() for us. */
+ do_cleanups (list_chain);
+ ui_out_text (uiout, "\n");
+ do_cleanups (old_chain);
+}
+\f
+/* Show the frame info. If this is the tui, it will be shown in
+ the source display otherwise, nothing is done */
+void
+show_stack_frame (struct frame_info *fi)
+{
}
+\f
+
+/* 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). */
-/*
- * 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).
- */
-static FRAME
-parse_frame_specification (frame_exp)
- char *frame_exp;
+struct frame_info *
+parse_frame_specification (char *frame_exp)
{
int numargs = 0;
#define MAXARGS 4
CORE_ADDR args[MAXARGS];
-
+ int level;
+
if (frame_exp)
{
char *addr_string, *p;
struct cleanup *tmp_cleanup;
- while (*frame_exp == ' ') frame_exp++;
+ while (*frame_exp == ' ')
+ frame_exp++;
while (*frame_exp)
{
if (numargs > MAXARGS)
error ("Too many args in frame specification");
/* Parse an argument. */
- for (p = frame_exp; *p && *p != ' '; p++)
+ for (p = frame_exp; *p && *p != ' '; p++)
;
- addr_string = savestring(frame_exp, p - frame_exp);
+ addr_string = savestring (frame_exp, p - frame_exp);
{
- tmp_cleanup = make_cleanup (free, addr_string);
- args[numargs++] = parse_and_eval_address (addr_string);
+ struct value *vp;
+
+ tmp_cleanup = make_cleanup (xfree, addr_string);
+
+ /* NOTE: we call parse_and_eval and then both
+ value_as_long and value_as_address rather than calling
+ parse_and_eval_long and parse_and_eval_address because
+ of the issue of potential side effects from evaluating
+ the expression. */
+ vp = parse_and_eval (addr_string);
+ if (numargs == 0)
+ level = value_as_long (vp);
+
+ args[numargs++] = value_as_address (vp);
do_cleanups (tmp_cleanup);
}
/* Skip spaces, move to possible next arg. */
- while (*p == ' ') p++;
+ while (*p == ' ')
+ p++;
frame_exp = p;
}
}
switch (numargs)
{
case 0:
- if (selected_frame == NULL)
+ if (deprecated_selected_frame == NULL)
error ("No selected frame.");
- return selected_frame;
+ return deprecated_selected_frame;
/* NOTREACHED */
case 1:
{
- int level = args[0];
- FRAME fid = find_relative_frame (get_current_frame (), &level);
- FRAME tfid;
+ struct frame_info *fid =
+ find_relative_frame (get_current_frame (), &level);
+ struct frame_info *tfid;
if (level == 0)
/* find_relative_frame was successful */
really should be used instead of spaces to delimit; using spaces
normally works in an expression). */
#ifdef SETUP_ARBITRARY_FRAME
- error ("No frame %d", args[0]);
+ error ("No frame %s", paddr_d (args[0]));
#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 ();
- fid && FRAME_FP (fid) != args[0];
+ fid && get_frame_base (fid) != args[0];
fid = get_prev_frame (fid))
;
if (fid)
while ((tfid = get_prev_frame (fid)) &&
- (FRAME_FP (tfid) == args[0]))
+ (get_frame_base (tfid) == args[0]))
fid = tfid;
-
+
/* We couldn't identify the frame as an existing frame, but
perhaps we can create one with a single argument. */
}
- default:
+ default:
#ifdef SETUP_ARBITRARY_FRAME
return SETUP_ARBITRARY_FRAME (numargs, args);
#else
/* Usual case. Do it here rather than have everyone supply
- a SETUP_ARBITRARY_FRAME that does this. */
+ a SETUP_ARBITRARY_FRAME that does this. */
if (numargs == 1)
return create_new_frame (args[0], 0);
error ("Too many args in frame specification");
This means absolutely all information in the frame is printed. */
static void
-frame_info (addr_exp, from_tty)
- char *addr_exp;
- int from_tty;
+frame_info (char *addr_exp, int from_tty)
{
- FRAME frame;
struct frame_info *fi;
- struct frame_saved_regs fsr;
struct symtab_and_line sal;
struct symbol *func;
struct symtab *s;
- FRAME calling_frame;
- int i, count;
+ struct frame_info *calling_frame_info;
+ int i, count, numregs;
char *funname = 0;
enum language funlang = language_unknown;
if (!target_has_stack)
error ("No stack.");
- frame = parse_frame_specification (addr_exp);
- if (!frame)
+ fi = parse_frame_specification (addr_exp);
+ if (fi == NULL)
error ("Invalid frame specified.");
- fi = get_frame_info (frame);
- sal = find_pc_line (fi->pc,
- fi->next != NULL
- && !fi->next->signal_handler_caller
- && !frame_in_dummy (fi->next));
- func = get_frame_function (frame);
- s = find_pc_symtab(fi->pc);
+ find_frame_sal (fi, &sal);
+ func = get_frame_function (fi);
+ /* FIXME: cagney/2002-11-28: Why bother? Won't sal.symtab contain
+ the same value. */
+ s = find_pc_symtab (get_frame_pc (fi));
if (func)
{
+ /* I'd like to use SYMBOL_SOURCE_NAME() here, to display
+ * 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.)
+ */
+ char *demangled;
funname = SYMBOL_NAME (func);
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)
+ funname = SYMBOL_SOURCE_NAME (func);
+ }
}
else
{
- register struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (fi->pc);
+ register struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
if (msymbol != NULL)
{
funname = SYMBOL_NAME (msymbol);
funlang = SYMBOL_LANGUAGE (msymbol);
}
}
- calling_frame = get_prev_frame (frame);
+ calling_frame_info = get_prev_frame (fi);
- if (!addr_exp && selected_frame_level >= 0)
+ if (!addr_exp && frame_relative_level (deprecated_selected_frame) >= 0)
{
- printf_filtered ("Stack level %d, frame at ", selected_frame_level);
- print_address_numeric (FRAME_FP(frame), 1, gdb_stdout);
+ printf_filtered ("Stack level %d, frame at ",
+ frame_relative_level (deprecated_selected_frame));
+ print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
printf_filtered (":\n");
}
else
{
printf_filtered ("Stack frame at ");
- print_address_numeric (FRAME_FP(frame), 1, gdb_stdout);
+ print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
printf_filtered (":\n");
}
- printf_filtered (" %s = ",
- reg_names[PC_REGNUM]);
- print_address_numeric (fi->pc, 1, gdb_stdout);
+ printf_filtered (" %s = ", REGISTER_NAME (PC_REGNUM));
+ print_address_numeric (get_frame_pc (fi), 1, gdb_stdout);
wrap_here (" ");
if (funname)
printf_filtered (" (%s:%d)", sal.symtab->filename, sal.line);
puts_filtered ("; ");
wrap_here (" ");
- printf_filtered ("saved %s ", reg_names[PC_REGNUM]);
- print_address_numeric (FRAME_SAVED_PC (frame), 1, gdb_stdout);
+ printf_filtered ("saved %s ", REGISTER_NAME (PC_REGNUM));
+ print_address_numeric (frame_pc_unwind (fi), 1, gdb_stdout);
printf_filtered ("\n");
{
- int frameless = 0;
-#ifdef FRAMELESS_FUNCTION_INVOCATION
- FRAMELESS_FUNCTION_INVOCATION (fi, frameless);
-#endif
+ int frameless;
+ frameless = FRAMELESS_FUNCTION_INVOCATION (fi);
if (frameless)
printf_filtered (" (FRAMELESS),");
}
- if (calling_frame)
+ if (calling_frame_info)
{
printf_filtered (" called by frame at ");
- print_address_numeric (FRAME_FP (calling_frame), 1, gdb_stdout);
+ print_address_numeric (get_frame_base (calling_frame_info),
+ 1, gdb_stdout);
}
- if (fi->next && calling_frame)
+ if (get_next_frame (fi) && calling_frame_info)
puts_filtered (",");
wrap_here (" ");
- if (fi->next)
+ if (get_next_frame (fi))
{
printf_filtered (" caller of frame at ");
- print_address_numeric (fi->next->frame, 1, gdb_stdout);
+ print_address_numeric (get_frame_base (get_next_frame (fi)), 1,
+ gdb_stdout);
}
- if (fi->next || calling_frame)
+ if (get_next_frame (fi) || calling_frame_info)
puts_filtered ("\n");
if (s)
- printf_filtered (" source language %s.\n", language_str (s->language));
+ printf_filtered (" source language %s.\n",
+ language_str (s->language));
#ifdef PRINT_EXTRA_FRAME_INFO
PRINT_EXTRA_FRAME_INFO (fi);
print_address_numeric (arg_list, 1, gdb_stdout);
printf_filtered (",");
- FRAME_NUM_ARGS (numargs, fi);
+ numargs = FRAME_NUM_ARGS (fi);
if (numargs < 0)
puts_filtered (" args: ");
else if (numargs == 0)
}
}
-#if defined (FRAME_FIND_SAVED_REGS)
- get_frame_saved_regs (fi, &fsr);
- /* The sp is special; what's returned isn't the save address, but
- actually the value of the previous frame's sp. */
- printf_filtered (" Previous frame's sp is ");
- print_address_numeric (fsr.regs[SP_REGNUM], 1, gdb_stdout);
- printf_filtered ("\n");
- count = 0;
- for (i = 0; i < NUM_REGS; i++)
- if (fsr.regs[i] && i != SP_REGNUM)
+ if (FRAME_INIT_SAVED_REGS_P ()
+ && get_frame_saved_regs (fi) == NULL)
+ FRAME_INIT_SAVED_REGS (fi);
+ /* 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)
{
- if (count == 0)
- puts_filtered (" Saved registers:\n ");
- else
- puts_filtered (",");
- wrap_here (" ");
- printf_filtered (" %s at ", reg_names[i]);
- print_address_numeric (fsr.regs[i], 1, gdb_stdout);
- count++;
+ /* 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)
+ {
+ void *value = alloca (MAX_REGISTER_RAW_SIZE);
+ CORE_ADDR sp;
+ frame_register_unwind (fi, SP_REGNUM, &optimized, &lval, &addr,
+ &realnum, value);
+ sp = extract_address (value, REGISTER_RAW_SIZE (SP_REGNUM));
+ printf_filtered (" Previous frame's sp is ");
+ print_address_numeric (sp, 1, gdb_stdout);
+ printf_filtered ("\n");
+ need_nl = 0;
+ }
+ 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. */
}
- if (count)
- puts_filtered ("\n");
-#else /* Have FRAME_FIND_SAVED_REGS. */
- puts_filtered ("\n");
-#endif /* Have FRAME_FIND_SAVED_REGS. */
+
+ count = 0;
+ numregs = NUM_REGS + NUM_PSEUDO_REGS;
+ for (i = 0; i < numregs; i++)
+ if (i != SP_REGNUM)
+ {
+ /* 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)
+ puts_filtered ("\n");
+ }
}
#if 0
static int backtrace_limit;
static void
-set_backtrace_limit_command (count_exp, from_tty)
- char *count_exp;
- int from_tty;
+set_backtrace_limit_command (char *count_exp, int from_tty)
{
- int count = parse_and_eval_address (count_exp);
+ int count = parse_and_eval_long (count_exp);
if (count < 0)
error ("Negative argument not meaningful as backtrace limit.");
}
static void
-backtrace_limit_info (arg, from_tty)
- char *arg;
- int from_tty;
+backtrace_limit_info (char *arg, int from_tty)
{
if (arg)
error ("\"Info backtrace-limit\" takes no arguments.");
/* Print briefly all stack frames or just the innermost COUNT frames. */
+static void backtrace_command_1 (char *count_exp, int show_locals,
+ int from_tty);
static void
-backtrace_command (count_exp, from_tty)
- char *count_exp;
- int from_tty;
+backtrace_command_1 (char *count_exp, int show_locals, int from_tty)
{
struct frame_info *fi;
register int count;
- register FRAME frame;
register int i;
- register FRAME trailing;
+ register struct frame_info *trailing;
register int trailing_level;
if (!target_has_stack)
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 ();
+
+ /* The target can be in a state where there is no valid frames
+ (e.g., just connected). */
+ if (trailing == NULL)
+ error ("No stack.");
+
trailing_level = 0;
if (count_exp)
{
- count = parse_and_eval_address (count_exp);
+ count = parse_and_eval_long (count_exp);
if (count < 0)
{
- FRAME current;
+ struct frame_info *current;
count = -count;
QUIT;
current = get_prev_frame (current);
}
-
+
/* Will stop when CURRENT reaches the top of the stack. TRAILING
will be COUNT below it. */
while (current)
current = get_prev_frame (current);
trailing_level++;
}
-
+
count = -1;
}
}
if (info_verbose)
{
struct partial_symtab *ps;
-
+
/* Read in symbols for all of the frames. Need to do this in
- 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. */
+ 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. */
i = count;
- for (frame = trailing;
- frame != NULL && i--;
- frame = get_prev_frame (frame))
+ for (fi = trailing;
+ fi != NULL && i--;
+ fi = get_prev_frame (fi))
{
QUIT;
- fi = get_frame_info (frame);
- ps = find_pc_psymtab (fi->pc);
+ ps = find_pc_psymtab (frame_address_in_block (fi));
if (ps)
PSYMTAB_TO_SYMTAB (ps); /* Force syms to come in */
}
}
- for (i = 0, frame = trailing;
- frame && count--;
- i++, frame = get_prev_frame (frame))
+ for (i = 0, fi = trailing;
+ fi && count--;
+ i++, fi = get_prev_frame (fi))
{
QUIT;
- fi = get_frame_info (frame);
/* Don't use print_stack_frame; if an error() occurs it probably
- 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). */
+ 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). */
print_frame_info (fi, trailing_level + i, 0, 1);
+ if (show_locals)
+ print_frame_local_vars (fi, 1, gdb_stdout);
}
/* If we've stopped before the end, mention that. */
- if (frame && from_tty)
+ if (fi && from_tty)
printf_filtered ("(More stack frames follow...)\n");
}
+
+static void
+backtrace_command (char *arg, int from_tty)
+{
+ struct cleanup *old_chain = (struct cleanup *) NULL;
+ char **argv = (char **) NULL;
+ int argIndicatingFullTrace = (-1), totArgLen = 0, argc = 0;
+ char *argPtr = arg;
+
+ if (arg != (char *) NULL)
+ {
+ int i;
+
+ argv = buildargv (arg);
+ old_chain = make_cleanup_freeargv (argv);
+ argc = 0;
+ for (i = 0; (argv[i] != (char *) NULL); i++)
+ {
+ unsigned int j;
+
+ 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]);
+ }
+ }
+ totArgLen += argc;
+ if (argIndicatingFullTrace >= 0)
+ {
+ 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;
+ }
+ }
+
+ backtrace_command_1 (argPtr, (argIndicatingFullTrace >= 0), from_tty);
+
+ if (argIndicatingFullTrace >= 0 && totArgLen > 0)
+ xfree (argPtr);
+
+ if (old_chain)
+ do_cleanups (old_chain);
+}
+
+static void backtrace_full_command (char *arg, int from_tty);
+static void
+backtrace_full_command (char *arg, int from_tty)
+{
+ backtrace_command_1 (arg, 1, from_tty);
+}
\f
+
/* Print the local variables of a block B active in FRAME.
Return 1 if any variables were printed; 0 otherwise. */
static int
-print_block_frame_locals (b, frame, stream)
- struct block *b;
- register FRAME frame;
- register GDB_FILE *stream;
+print_block_frame_locals (struct block *b, register struct frame_info *fi,
+ int num_tabs, register struct ui_file *stream)
{
- int nsyms;
- register int i;
+ register int i, j;
register struct symbol *sym;
register int values_printed = 0;
- nsyms = BLOCK_NSYMS (b);
-
- for (i = 0; i < nsyms; i++)
+ ALL_BLOCK_SYMBOLS (b, i, sym)
{
- sym = BLOCK_SYM (b, i);
switch (SYMBOL_CLASS (sym))
{
case LOC_LOCAL:
case LOC_STATIC:
case LOC_BASEREG:
values_printed = 1;
+ for (j = 0; j < num_tabs; j++)
+ fputs_filtered ("\t", stream);
fputs_filtered (SYMBOL_SOURCE_NAME (sym), stream);
fputs_filtered (" = ", stream);
- print_variable_value (sym, frame, stream);
+ print_variable_value (sym, fi, stream);
fprintf_filtered (stream, "\n");
break;
/* Same, but print labels. */
static int
-print_block_frame_labels (b, have_default, stream)
- struct block *b;
- int *have_default;
- register GDB_FILE *stream;
+print_block_frame_labels (struct block *b, int *have_default,
+ register struct ui_file *stream)
{
- int nsyms;
register int i;
register struct symbol *sym;
register int values_printed = 0;
- nsyms = BLOCK_NSYMS (b);
-
- for (i = 0; i < nsyms; i++)
+ ALL_BLOCK_SYMBOLS (b, i, sym)
{
- sym = BLOCK_SYM (b, i);
if (STREQ (SYMBOL_NAME (sym), "default"))
{
if (*have_default)
on the function running in FRAME. */
static void
-print_frame_local_vars (frame, stream)
- register FRAME frame;
- register GDB_FILE *stream;
+print_frame_local_vars (register struct frame_info *fi, register int num_tabs,
+ register struct ui_file *stream)
{
- register struct block *block = get_frame_block (frame);
+ register struct block *block = get_frame_block (fi, 0);
register int values_printed = 0;
if (block == 0)
fprintf_filtered (stream, "No symbol table info available.\n");
return;
}
-
+
while (block != 0)
{
- if (print_block_frame_locals (block, frame, stream))
+ if (print_block_frame_locals (block, fi, num_tabs, stream))
values_printed = 1;
/* After handling the function's top-level block, stop.
- Don't continue to its superblock, the block of
- per-file symbols. */
+ Don't continue to its superblock, the block of
+ per-file symbols. */
if (BLOCK_FUNCTION (block))
break;
block = BLOCK_SUPERBLOCK (block);
/* Same, but print labels. */
static void
-print_frame_label_vars (frame, this_level_only, stream)
- register FRAME frame;
- int this_level_only;
- register GDB_FILE *stream;
+print_frame_label_vars (register struct frame_info *fi, int this_level_only,
+ register struct ui_file *stream)
{
register struct blockvector *bl;
- register struct block *block = get_frame_block (frame);
+ register struct block *block = get_frame_block (fi, 0);
register int values_printed = 0;
int index, have_default = 0;
char *blocks_printed;
- struct frame_info *fi = get_frame_info (frame);
- CORE_ADDR pc = fi->pc;
+ CORE_ADDR pc = get_frame_pc (fi);
if (block == 0)
{
return;
/* After handling the function's top-level block, stop.
- Don't continue to its superblock, the block of
- per-file symbols. */
+ Don't continue to its superblock, the block of
+ per-file symbols. */
if (BLOCK_FUNCTION (block))
break;
block = BLOCK_SUPERBLOCK (block);
}
/* ARGSUSED */
-static void
-locals_info (args, from_tty)
- char *args;
- int from_tty;
+void
+locals_info (char *args, int from_tty)
{
- if (!selected_frame)
+ if (!deprecated_selected_frame)
error ("No frame selected.");
- print_frame_local_vars (selected_frame, gdb_stdout);
+ print_frame_local_vars (deprecated_selected_frame, 0, gdb_stdout);
}
static void
-catch_info (ignore, from_tty)
- char *ignore;
- int from_tty;
+catch_info (char *ignore, int from_tty)
{
- if (!selected_frame)
- error ("No frame selected.");
- print_frame_label_vars (selected_frame, 0, gdb_stdout);
+ struct symtab_and_line *sal;
+
+ /* Check for target support for exception handling */
+ 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");
+#if 0
+ if (!deprecated_selected_frame)
+ error ("No frame selected.");
+#endif
+ }
+ else
+ {
+ /* Assume g++ compiled code -- old v 4.16 behaviour */
+ if (!deprecated_selected_frame)
+ error ("No frame selected.");
+
+ print_frame_label_vars (deprecated_selected_frame, 0, gdb_stdout);
+ }
}
static void
-print_frame_arg_vars (frame, stream)
- register FRAME frame;
- register GDB_FILE *stream;
+print_frame_arg_vars (register struct frame_info *fi,
+ register struct ui_file *stream)
{
- struct symbol *func = get_frame_function (frame);
+ struct symbol *func = get_frame_function (fi);
register struct block *b;
- int nsyms;
register int i;
register struct symbol *sym, *sym2;
register int values_printed = 0;
}
b = SYMBOL_BLOCK_VALUE (func);
- nsyms = BLOCK_NSYMS (b);
-
- for (i = 0; i < nsyms; i++)
+ ALL_BLOCK_SYMBOLS (b, i, sym)
{
- sym = BLOCK_SYM (b, i);
switch (SYMBOL_CLASS (sym))
{
case LOC_ARG:
are not combined in symbol-reading. */
sym2 = lookup_symbol (SYMBOL_NAME (sym),
- b, VAR_NAMESPACE, (int *)NULL, (struct symtab **)NULL);
- print_variable_value (sym2, frame, stream);
+ b, VAR_NAMESPACE, (int *) NULL, (struct symtab **) NULL);
+ print_variable_value (sym2, fi, stream);
fprintf_filtered (stream, "\n");
break;
break;
}
}
-
if (!values_printed)
{
fprintf_filtered (stream, "No arguments.\n");
}
}
-static void
-args_info (ignore, from_tty)
- char *ignore;
- int from_tty;
+void
+args_info (char *ignore, int from_tty)
{
- if (!selected_frame)
+ if (!deprecated_selected_frame)
error ("No frame selected.");
- print_frame_arg_vars (selected_frame, gdb_stdout);
+ print_frame_arg_vars (deprecated_selected_frame, gdb_stdout);
}
-\f
-/* Select frame FRAME, and note that its stack level is LEVEL.
- LEVEL may be -1 if an actual level number is not known. */
-void
-select_frame (frame, level)
- FRAME frame;
- int level;
-{
- register struct symtab *s;
- selected_frame = frame;
- selected_frame_level = level;
-
- /* Ensure that symbols for this frame are read in. Also, determine the
- source language of this frame, and switch to it if desired. */
- if (frame)
- {
- s = find_pc_symtab (get_frame_info (frame)->pc);
- if (s
- && s->language != current_language->la_language
- && s->language != language_unknown
- && language_mode == language_mode_auto) {
- set_language(s->language);
- }
- }
+static void
+args_plus_locals_info (char *ignore, int from_tty)
+{
+ args_info (ignore, from_tty);
+ locals_info (ignore, from_tty);
}
+\f
-/* Store the selected frame and its level into *FRAMEP and *LEVELP.
- If there is no selected frame, *FRAMEP is set to NULL. */
-
-void
-record_selected_frame (frameaddrp, levelp)
- FRAME_ADDR *frameaddrp;
- int *levelp;
+/* Select frame FI. Also print the stack frame and show the source if
+ this is the tui version. */
+static void
+select_and_print_frame (struct frame_info *fi)
{
- *frameaddrp = selected_frame ? FRAME_FP (selected_frame) : 0;
- *levelp = selected_frame_level;
+ select_frame (fi);
+ if (fi)
+ {
+ print_stack_frame (fi, frame_relative_level (fi), 1);
+ }
}
-
+\f
/* Return the symbol-block in which the selected frame is executing.
- Can return zero under various legitimate circumstances. */
+ 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. */
struct block *
-get_selected_block ()
+get_selected_block (CORE_ADDR *addr_in_block)
{
if (!target_has_stack)
return 0;
- if (!selected_frame)
- return get_current_block ();
- return get_frame_block (selected_frame);
+ /* NOTE: cagney/2002-11-28: Why go to all this effort to not create
+ a selected/current frame? Perhaphs this function is called,
+ 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. */
+ /* gdb_assert (deprecated_selected_frame != NULL); So, do you feel
+ lucky? */
+ if (!deprecated_selected_frame)
+ {
+ CORE_ADDR pc = read_pc ();
+ if (addr_in_block != NULL)
+ *addr_in_block = pc;
+ return block_for_pc (pc);
+ }
+ return get_frame_block (deprecated_selected_frame, addr_in_block);
}
/* Find a frame a certain number of levels away from FRAME.
but the final value of *LEVEL_OFFSET_PTR is nonzero and indicates
how much farther the original request asked to go. */
-FRAME
-find_relative_frame (frame, level_offset_ptr)
- register FRAME frame;
- register int* level_offset_ptr;
+struct frame_info *
+find_relative_frame (register struct frame_info *frame,
+ register int *level_offset_ptr)
{
- register FRAME prev;
- register FRAME frame1;
+ register struct frame_info *prev;
+ register struct frame_info *frame1;
/* Going up is simple: just do get_prev_frame enough times
or until initial frame is reached. */
/* Going down is just as simple. */
if (*level_offset_ptr < 0)
{
- while (*level_offset_ptr < 0) {
- frame1 = get_next_frame (frame);
- if (!frame1)
- break;
- frame = frame1;
- (*level_offset_ptr)++;
- }
+ while (*level_offset_ptr < 0)
+ {
+ frame1 = get_next_frame (frame);
+ if (!frame1)
+ break;
+ frame = frame1;
+ (*level_offset_ptr)++;
+ }
}
return frame;
}
frame expressions. */
/* ARGSUSED */
+void
+select_frame_command_wrapper (char *level_exp, int from_tty)
+{
+ select_frame_command (level_exp, from_tty);
+}
+
static void
-select_frame_command (level_exp, from_tty)
- char *level_exp;
- int from_tty;
+select_frame_command (char *level_exp, int from_tty)
{
- register FRAME frame, frame1;
- unsigned int level = 0;
+ struct frame_info *frame;
+ int level = frame_relative_level (deprecated_selected_frame);
if (!target_has_stack)
error ("No stack.");
frame = parse_frame_specification (level_exp);
- /* Try to figure out what level this frame is. But if there is
- no current stack, don't error out -- let the user set one. */
- frame1 = 0;
- if (get_current_frame()) {
- for (frame1 = get_prev_frame (0);
- frame1 && frame1 != frame;
- frame1 = get_prev_frame (frame1))
- level++;
- }
-
- if (!frame1)
- level = 0;
-
- select_frame (frame, level);
+ select_frame (frame);
+ if (level != frame_relative_level (deprecated_selected_frame))
+ selected_frame_level_changed_event (frame_relative_level (deprecated_selected_frame));
}
/* The "frame" command. With no arg, print selected frame briefly.
With arg, behaves like select_frame and then prints the selected
frame. */
-static void
-frame_command (level_exp, from_tty)
- char *level_exp;
- int from_tty;
+void
+frame_command (char *level_exp, int from_tty)
{
select_frame_command (level_exp, from_tty);
- print_stack_frame (selected_frame, selected_frame_level, 1);
+ print_stack_frame (deprecated_selected_frame,
+ frame_relative_level (deprecated_selected_frame), 1);
+}
+
+/* The XDB Compatibility command to print the current frame. */
+
+static void
+current_frame_command (char *level_exp, int from_tty)
+{
+ if (target_has_stack == 0 || deprecated_selected_frame == 0)
+ error ("No stack.");
+ print_stack_frame (deprecated_selected_frame,
+ frame_relative_level (deprecated_selected_frame), 1);
}
/* Select the frame up one or COUNT stack levels
/* ARGSUSED */
static void
-up_silently_command (count_exp, from_tty)
- char *count_exp;
- int from_tty;
+up_silently_base (char *count_exp)
{
- register FRAME frame;
+ register struct frame_info *fi;
int count = 1, count1;
if (count_exp)
- count = parse_and_eval_address (count_exp);
+ count = parse_and_eval_long (count_exp);
count1 = count;
-
- if (target_has_stack == 0 || selected_frame == 0)
+
+ if (target_has_stack == 0 || deprecated_selected_frame == 0)
error ("No stack.");
- frame = find_relative_frame (selected_frame, &count1);
+ fi = find_relative_frame (deprecated_selected_frame, &count1);
if (count1 != 0 && count_exp == 0)
error ("Initial frame selected; you cannot go up.");
- select_frame (frame, selected_frame_level + count - count1);
+ select_frame (fi);
+ selected_frame_level_changed_event (frame_relative_level (deprecated_selected_frame));
+}
+
+static void
+up_silently_command (char *count_exp, int from_tty)
+{
+ up_silently_base (count_exp);
}
static void
-up_command (count_exp, from_tty)
- char *count_exp;
- int from_tty;
+up_command (char *count_exp, int from_tty)
{
- up_silently_command (count_exp, from_tty);
- print_stack_frame (selected_frame, selected_frame_level, 1);
+ up_silently_base (count_exp);
+ print_stack_frame (deprecated_selected_frame,
+ frame_relative_level (deprecated_selected_frame), 1);
}
/* Select the frame down one or COUNT stack levels
/* ARGSUSED */
static void
-down_silently_command (count_exp, from_tty)
- char *count_exp;
- int from_tty;
+down_silently_base (char *count_exp)
{
- register FRAME frame;
+ register struct frame_info *frame;
int count = -1, count1;
if (count_exp)
- count = - parse_and_eval_address (count_exp);
+ count = -parse_and_eval_long (count_exp);
count1 = count;
-
- if (target_has_stack == 0 || selected_frame == 0)
+
+ if (target_has_stack == 0 || deprecated_selected_frame == 0)
error ("No stack.");
- frame = find_relative_frame (selected_frame, &count1);
+ frame = find_relative_frame (deprecated_selected_frame, &count1);
if (count1 != 0 && count_exp == 0)
{
/* We only do this if count_exp is not specified. That way "down"
- 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. */
+ 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. */
error ("Bottom (i.e., innermost) frame selected; you cannot go down.");
}
- select_frame (frame, selected_frame_level + count - count1);
+ select_frame (frame);
+ selected_frame_level_changed_event (frame_relative_level (deprecated_selected_frame));
}
+/* ARGSUSED */
+static void
+down_silently_command (char *count_exp, int from_tty)
+{
+ down_silently_base (count_exp);
+}
static void
-down_command (count_exp, from_tty)
- char *count_exp;
- int from_tty;
+down_command (char *count_exp, int from_tty)
{
- down_silently_command (count_exp, from_tty);
- print_stack_frame (selected_frame, selected_frame_level, 1);
+ down_silently_base (count_exp);
+ print_stack_frame (deprecated_selected_frame,
+ frame_relative_level (deprecated_selected_frame), 1);
}
\f
-static void
-return_command (retval_exp, from_tty)
- char *retval_exp;
- int from_tty;
+void
+return_command (char *retval_exp, int from_tty)
{
struct symbol *thisfun;
- FRAME_ADDR selected_frame_addr;
+ CORE_ADDR selected_frame_addr;
CORE_ADDR selected_frame_pc;
- FRAME frame;
- value_ptr return_value = NULL;
+ struct frame_info *frame;
+ struct value *return_value = NULL;
- if (selected_frame == NULL)
+ if (deprecated_selected_frame == NULL)
error ("No selected frame.");
- thisfun = get_frame_function (selected_frame);
- selected_frame_addr = FRAME_FP (selected_frame);
- selected_frame_pc = (get_frame_info (selected_frame))->pc;
+ thisfun = get_frame_function (deprecated_selected_frame);
+ selected_frame_addr = get_frame_base (deprecated_selected_frame);
+ selected_frame_pc = get_frame_pc (deprecated_selected_frame);
/* Compute the return value (if any -- possibly getting errors here). */
if (retval_exp)
{
+ struct type *return_type = NULL;
+
return_value = parse_and_eval (retval_exp);
+ /* Cast return value to the return type of the function. */
+ if (thisfun != NULL)
+ return_type = TYPE_TARGET_TYPE (SYMBOL_TYPE (thisfun));
+ if (return_type == NULL)
+ return_type = builtin_type_int;
+ return_value = value_cast (return_type, return_value);
+
/* Make sure we have fully evaluated it, since
- it might live in the stack frame we're about to pop. */
+ it might live in the stack frame we're about to pop. */
if (VALUE_LAZY (return_value))
value_fetch_lazy (return_value);
}
/* NOTREACHED */
}
}
- else
- if (!query ("Make selected stack frame return now? "))
- error ("Not confirmed.");
+ else if (!query ("Make selected stack frame return now? "))
+ error ("Not confirmed.");
}
+ /* FIXME: cagney/2003-01-18: Rather than pop each frame in turn,
+ this code should just go straight to the relevant frame and pop
+ that. */
+
/* Do the real work. Pop until the specified frame is current. We
- use this method because the selected_frame is not valid after
+ use this method because the deprecated_selected_frame is not valid after
a POP_FRAME. The pc comparison makes this work even if the
selected frame shares its fp with another frame. */
- while ( selected_frame_addr != FRAME_FP (frame = get_current_frame())
- || selected_frame_pc != (get_frame_info (frame))->pc )
- POP_FRAME;
+ while (selected_frame_addr != get_frame_base (frame = get_current_frame ())
+ || selected_frame_pc != get_frame_pc (frame))
+ frame_pop (get_current_frame ());
/* Then pop that frame. */
- POP_FRAME;
+ frame_pop (get_current_frame ());
/* Compute the return value (if any) and store in the place
for return values. */
if (retval_exp)
set_return_value (return_value);
+ /* If we are at the end of a call dummy now, pop the dummy frame too. */
+
+ /* FIXME: cagney/2003-01-18: This is silly. Instead of popping all
+ the frames except the dummy, and then, as an afterthought,
+ popping the dummy frame, this code should just pop through to the
+ dummy frame. */
+
+ if (CALL_DUMMY_HAS_COMPLETED (read_pc(), read_sp (),
+ get_frame_base (get_current_frame ())))
+ frame_pop (get_current_frame ());
+
/* 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;
+};
+
+static void func_command (char *arg, int from_tty);
+static void
+func_command (char *arg, int from_tty)
+{
+ 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++)
+ found = (get_frame_pc (fp) >= func_bounds[i].low &&
+ get_frame_pc (fp) < func_bounds[i].high);
+ if (!found)
+ {
+ level = 1;
+ fp = find_relative_frame (fp, &level);
+ }
+ }
+ while (!found && level == 0);
+
+ if (func_bounds)
+ xfree (func_bounds);
+
+ if (!found)
+ printf_filtered ("'%s' not within current stack frame.\n", arg);
+ else if (fp != deprecated_selected_frame)
+ select_and_print_frame (fp);
}
-/* Gets the language of the current frame. */
+/* Gets the language of the current frame. */
+
enum language
-get_frame_language()
+get_frame_language (void)
{
- register struct symtab *s;
- FRAME fr;
- enum language flang; /* The language of the current frame */
-
- fr = get_frame_info(selected_frame);
- if(fr)
- {
- s = find_pc_symtab(fr->pc);
- if(s)
- flang = s->language;
+ register struct symtab *s;
+ enum language flang; /* The language of the current frame */
+
+ if (deprecated_selected_frame)
+ {
+ s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
+ if (s)
+ flang = s->language;
else
- flang = language_unknown;
- }
- else
- flang = language_unknown;
+ flang = language_unknown;
+ }
+ else
+ flang = language_unknown;
- return flang;
+ return flang;
}
\f
void
-_initialize_stack ()
+_initialize_stack (void)
{
-#if 0
+#if 0
backtrace_limit = 30;
#endif
add_com_alias ("f", "frame", class_stack, 1);
+ if (xdb_commands)
+ {
+ add_com ("L", class_stack, current_frame_command,
+ "Print the current stack frame.\n");
+ 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\
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.");
+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,
+ "Print backtrace of all stack frames, or innermost COUNT frames \n\
+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.");
"Local variables of current stack frame.");
add_info ("args", args_info,
"Argument variables of current stack frame.");
+ if (xdb_commands)
+ add_com ("l", class_info, args_plus_locals_info,
+ "Argument and local variables of current stack frame.");
+
+ if (dbx_commands)
+ add_com ("func", class_stack, func_command,
+ "Select the stack frame that contains <func>.\nUsage: func <name>\n");
+
add_info ("catch", catch_info,
"Exceptions that can be caught in the current stack frame.");
#if 0
- add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command,
- "Specify maximum number of frames for \"backtrace\" to print by default.",
+ add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command,
+ "Specify maximum number of frames for \"backtrace\" to print by default.",
&setlist);
add_info ("backtrace-limit", backtrace_limit_info,
- "The maximum number of frames for \"backtrace\" to print by default.");
+ "The maximum number of frames for \"backtrace\" to print by default.");
#endif
}