/* Print and select stack frames for GDB, the GNU debugger.
- Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
This file is part of GDB.
-GDB is free software; you can redistribute it and/or modify
+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 1, or (at your option)
-any later version.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
-GDB is distributed in the hope that it will be useful,
+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 GDB; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <stdio.h>
#include "defs.h"
#include "param.h"
+#include "language.h"
#include "symtab.h"
#include "frame.h"
+#include "gdbcmd.h"
+#include "value.h"
+#include "gdbcore.h"
+#include "target.h"
+#include "breakpoint.h"
+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 */
+extern char *reg_names[]; /* Names of registers */
/* Thie "selected" stack frame is used by default for local and arg access.
May be zero, for no selected frame. */
int frame_file_full_name = 0;
-static void select_calling_frame ();
-
void print_frame_info ();
\f
/* Print a stack frame briefly. FRAME should be the frame id
If SOURCE is 1, print the source line as well.
If SOURCE is -1, print ONLY the source line. */
-static void
+void
print_stack_frame (frame, level, source)
FRAME frame;
int level;
print_frame_info (fi, level, source, 1);
}
-/* Flag which will indicate when the frame has been changed
- by and "up" or "down" command. */
-static int frame_changed;
-
void
print_frame_info (fi, level, source, args)
struct frame_info *fi;
struct symbol *func;
register char *funname = 0;
int numargs;
+
+#if 0 /* Symbol reading is fast enough now */
struct partial_symtab *pst;
/* Don't give very much information if we haven't readin the
fname = "??";
printf_filtered ("#%-2d ", level);
- printf_filtered ("0x%x in ", fi->pc);
+ if (addressprint)
+ printf_filtered ("%s in ", local_hex_string(fi->pc));
- printf_filtered ("%s (...) (...)\n", fname);
+ fputs_demangled (fname, stdout, -1);
+ fputs_filtered (" (...)\n", stdout);
return;
}
+#endif
sal = find_pc_line (fi->pc, fi->next_frame);
func = find_pc_function (fi->pc);
funname = misc_function_vector[misc_index].name;
}
- if (frame_changed || source >= 0 || !sal.symtab)
+ if (source >= 0 || !sal.symtab)
{
if (level >= 0)
printf_filtered ("#%-2d ", level);
- else if (frame_changed)
- printf ("#%-2d ", 0);
- if (fi->pc != sal.pc || !sal.symtab)
- printf_filtered ("0x%x in ", fi->pc);
- printf_filtered ("%s (", funname ? funname : "??");
+ if (addressprint)
+ if (fi->pc != sal.pc || !sal.symtab)
+ printf_filtered ("%s in ", local_hex_string(fi->pc));
+ fputs_demangled (funname ? funname : "??", stdout, -1);
+ wrap_here (" ");
+ fputs_filtered (" (", stdout);
if (args)
{
FRAME_NUM_ARGS (numargs, fi);
print_frame_args (func, fi, numargs, stdout);
}
printf_filtered (")");
- if (sal.symtab)
- printf_filtered (" (%s line %d)", sal.symtab->filename, sal.line);
+ if (sal.symtab && sal.symtab->filename)
+ {
+ wrap_here (" ");
+ printf_filtered (" at %s:%d", sal.symtab->filename, sal.line);
+ }
printf_filtered ("\n");
}
- if ((frame_changed || source != 0) && sal.symtab)
+ if ((source != 0) && sal.symtab)
{
int done = 0;
int mid_statement = source < 0 && fi->pc != sal.pc;
done = identify_source_line (sal.symtab, sal.line, mid_statement);
if (!done)
{
- if (mid_statement)
- printf_filtered ("0x%x\t", fi->pc);
- print_source_lines (sal.symtab, sal.line, sal.line + 1, 1);
+ if (addressprint && mid_statement)
+ printf_filtered ("%s\t", local_hex_string(fi->pc));
+ print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
}
- current_source_line = max (sal.line - 5, 1);
+ current_source_line = max (sal.line - lines_to_list/2, 1);
}
- frame_changed = 0;
if (source != 0)
set_default_breakpoint (1, fi->pc, sal.symtab, sal.line);
fflush (stdout);
}
-/* Call here to print info on selected frame, after a trap. */
-
-void
-print_sel_frame (just_source)
- int just_source;
-{
- print_stack_frame (selected_frame, -1, just_source ? -1 : 1);
-}
-
-/* Print info on the selected frame, including level number
- but not source. */
-
-void
-print_selected_frame ()
-{
- print_stack_frame (selected_frame, selected_frame_level, 0);
-}
-
void flush_cached_frames ();
#ifdef FRAME_SPECIFICATION_DYADIC
/*
* 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 *addr_string, *p;
struct cleanup *tmp_cleanup;
- struct frame_info *fci;
while (*frame_exp == ' ') frame_exp++;
for (p = frame_exp; *p && *p != ' '; p++)
switch (numargs)
{
case 0:
+ if (selected_frame == NULL)
+ error ("No selected frame.");
return selected_frame;
/* NOTREACHED */
case 1:
/* NOTREACHED */
}
+/* FRAME_ARGS_ADDRESS_CORRECT is just like FRAME_ARGS_ADDRESS except
+ that if it is unsure about the answer, it returns 0
+ instead of guessing (this happens on the VAX and i960, for example).
+
+ On most machines, we never have to guess about the args address,
+ so FRAME_ARGS_ADDRESS{,_CORRECT} are the same. */
+#if !defined (FRAME_ARGS_ADDRESS_CORRECT)
+#define FRAME_ARGS_ADDRESS_CORRECT FRAME_ARGS_ADDRESS
+#endif
+
/* Print verbosely the selected frame or the frame at address ADDR.
This means absolutely all information in the frame is printed. */
struct frame_saved_regs fsr;
struct symtab_and_line sal;
struct symbol *func;
+ struct symtab *s;
FRAME calling_frame;
int i, count;
char *funname = 0;
- int numargs;
- if (!(have_inferior_p () || have_core_file_p ()))
+ if (!target_has_stack)
error ("No inferior or core file.");
frame = parse_frame_specification (addr_exp);
error ("Invalid frame specified.");
fi = get_frame_info (frame);
- get_frame_saved_regs (fi, &fsr);
sal = find_pc_line (fi->pc, fi->next_frame);
func = get_frame_function (frame);
+ s = find_pc_symtab(fi->pc);
if (func)
funname = SYMBOL_NAME (func);
else
}
calling_frame = get_prev_frame (frame);
- if (!addr_exp && selected_frame_level >= 0)
- printf ("Stack level %d, frame at 0x%x:\n pc = 0x%x",
- selected_frame_level, FRAME_FP(frame), fi->pc);
- else
- printf ("Stack frame at 0x%x:\n pc = 0x%x",
- FRAME_FP(frame), fi->pc);
-
+ if (!addr_exp && selected_frame_level >= 0) {
+ printf_filtered ("Stack level %d, frame at %s:\n",
+ selected_frame_level,
+ local_hex_string(FRAME_FP(frame)));
+ } else {
+ printf_filtered ("Stack frame at %s:\n",
+ local_hex_string(FRAME_FP(frame)));
+ }
+ printf_filtered (" %s = %s",
+ reg_names[PC_REGNUM],
+ local_hex_string(fi->pc));
+
+ wrap_here (" ");
if (funname)
- printf (" in %s", funname);
+ {
+ printf_filtered (" in ");
+ fputs_demangled (funname, stdout, 1);
+ }
+ wrap_here (" ");
if (sal.symtab)
- printf (" (%s line %d)", sal.symtab->filename, sal.line);
- printf ("; saved pc 0x%x\n", FRAME_SAVED_PC (frame));
+ printf_filtered (" (%s:%d)", sal.symtab->filename, sal.line);
+ puts_filtered ("; ");
+ wrap_here (" ");
+ printf_filtered ("saved %s %s\n", reg_names[PC_REGNUM],
+ local_hex_string(FRAME_SAVED_PC (frame)));
if (calling_frame)
- printf (" called by frame at 0x%x", FRAME_FP (calling_frame));
+ printf_filtered (" called by frame at %s",
+ local_hex_string(FRAME_FP (calling_frame)));
if (fi->next_frame && calling_frame)
- printf (",");
+ puts_filtered (",");
+ wrap_here (" ");
if (fi->next_frame)
- printf (" caller of frame at 0x%x", fi->next_frame);
+ printf_filtered (" caller of frame at %s", local_hex_string(fi->next_frame));
if (fi->next_frame || calling_frame)
- printf ("\n");
- printf (" Arglist at 0x%x,", FRAME_ARGS_ADDRESS (fi));
- FRAME_NUM_ARGS (i, fi);
- if (i < 0)
- printf (" args: ");
- else if (i == 0)
- printf (" no args.");
- else if (i == 1)
- printf (" 1 arg: ");
- else
- printf (" %d args: ", i);
+ puts_filtered ("\n");
+ if (s)
+ printf_filtered(" source language %s.\n", language_str(s->language));
+
+ {
+ /* Address of the argument list for this frame, or 0. */
+ CORE_ADDR arg_list = FRAME_ARGS_ADDRESS_CORRECT (fi);
+ /* 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 %s,", local_hex_string(arg_list));
+
+ FRAME_NUM_ARGS (numargs, fi);
+ if (numargs < 0)
+ puts_filtered (" args: ");
+ else if (numargs == 0)
+ puts_filtered (" no args.");
+ else if (numargs == 1)
+ puts_filtered (" 1 arg: ");
+ else
+ printf_filtered (" %d args: ", numargs);
+ print_frame_args (func, fi, numargs, stdout);
+ puts_filtered ("\n");
+ }
+ }
- FRAME_NUM_ARGS (numargs, fi);
- print_frame_args (func, fi, numargs, stdout);
- printf ("\n");
+#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 (" Previous frame's sp is 0x%x\n", fsr.regs[SP_REGNUM]);
+ printf_filtered (" Previous frame's sp is %s\n",
+ local_hex_string(fsr.regs[SP_REGNUM]));
count = 0;
for (i = 0; i < NUM_REGS; i++)
if (fsr.regs[i] && i != SP_REGNUM)
{
- if (count % 4 != 0)
- printf (", ");
+ if (count == 0)
+ puts_filtered (" Saved registers:\n ");
else
- {
- if (count == 0)
- printf (" Saved registers:");
- printf ("\n ");
- }
- printf ("%s at 0x%x", reg_names[i], fsr.regs[i]);
+ puts_filtered (",");
+ wrap_here (" ");
+ printf_filtered (" %s at %s", reg_names[i],
+ local_hex_string(fsr.regs[i]));
count++;
}
if (count)
- printf ("\n");
+ puts_filtered ("\n");
+#endif /* Have FRAME_FIND_SAVED_REGS. */
}
#if 0
/* Print briefly all stack frames or just the innermost COUNT frames. */
static void
-backtrace_command (count_exp)
+backtrace_command (count_exp, from_tty)
char *count_exp;
+ int from_tty;
{
struct frame_info *fi;
register int count;
register FRAME trailing;
register int trailing_level;
+ 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
current = trailing;
while (current && count--)
- current = get_prev_frame (current);
+ {
+ QUIT;
+ current = get_prev_frame (current);
+ }
/* 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++;
else
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. */
+ i = count;
+ for (frame = trailing;
+ frame != NULL && i--;
+ frame = get_prev_frame (frame))
+ {
+ QUIT;
+ fi = get_frame_info (frame);
+ ps = find_pc_psymtab (fi->pc);
+ if (ps)
+ (void) PSYMTAB_TO_SYMTAB (ps); /* Force syms to come in */
+ }
+ }
+
for (i = 0, frame = trailing;
frame && count--;
i++, frame = get_prev_frame (frame))
}
/* If we've stopped before the end, mention that. */
- if (frame)
+ if (frame && from_tty)
printf_filtered ("(More stack frames follow...)\n");
}
\f
|| SYMBOL_CLASS (sym) == LOC_STATIC)
{
values_printed = 1;
- fputs_filtered (SYMBOL_NAME (sym), stream);
+ fprint_symbol (stream, SYMBOL_NAME (sym));
fputs_filtered (" = ", stream);
print_variable_value (sym, frame, stream);
fprintf_filtered (stream, "\n");
- fflush (stream);
+ }
+ }
+ return values_printed;
+}
+
+/* Same, but print labels. */
+
+static int
+print_block_frame_labels (b, have_default, stream)
+ struct block *b;
+ int *have_default;
+ register 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++)
+ {
+ sym = BLOCK_SYM (b, i);
+ if (! strcmp (SYMBOL_NAME (sym), "default"))
+ {
+ 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;
+ fputs_demangled (SYMBOL_NAME (sym), stream, 1);
+ if (addressprint)
+ fprintf_filtered (stream, " %s",
+ local_hex_string(SYMBOL_VALUE_ADDRESS (sym)));
+ fprintf_filtered (stream, " in file %s, line %d\n",
+ sal.symtab->filename, sal.line);
}
}
return values_printed;
or 0 if nothing was printed because we have no info
on the function running in FRAME. */
-static int
+static void
print_frame_local_vars (frame, stream)
register FRAME frame;
register FILE *stream;
if (block == 0)
{
fprintf_filtered (stream, "No symbol table info available.\n");
- fflush (stream);
- return 0;
+ return;
}
while (block != 0)
if (!values_printed)
{
fprintf_filtered (stream, "No locals.\n");
- fflush (stream);
}
-
- return 1;
}
+/* Same, but print labels. */
+
static void
-locals_info ()
+print_frame_label_vars (frame, this_level_only, stream)
+ register FRAME frame;
+ int this_level_only;
+ register FILE *stream;
{
- if (!have_inferior_p () && !have_core_file_p ())
- error ("No inferior or core file.");
+ extern struct blockvector *blockvector_for_pc ();
+ register struct blockvector *bl;
+ register struct block *block = get_frame_block (frame);
+ 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;
+ 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));
+ bzero (blocks_printed, 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.
+ Don't continue to its superblock, the block of
+ per-file symbols. */
+ if (BLOCK_FUNCTION (block))
+ break;
+ block = BLOCK_SUPERBLOCK (block);
+ }
+
+ if (!values_printed && !this_level_only)
+ {
+ fprintf_filtered (stream, "No catches.\n");
+ }
+}
+
+/* ARGSUSED */
+static void
+locals_info (args, from_tty)
+ char *args;
+ int from_tty;
+{
+ if (!selected_frame)
+ error ("No frame selected.");
print_frame_local_vars (selected_frame, stdout);
}
-static int
+static void
+catch_info ()
+{
+ if (!selected_frame)
+ error ("No frame selected.");
+ print_frame_label_vars (selected_frame, 0, stdout);
+}
+
+static void
print_frame_arg_vars (frame, stream)
register FRAME frame;
register FILE *stream;
register struct block *b;
int nsyms;
register int i;
- register struct symbol *sym;
+ register struct symbol *sym, *sym2;
register int values_printed = 0;
if (func == 0)
{
fprintf_filtered (stream, "No symbol table info available.\n");
- fflush (stream);
- return 0;
+ return;
}
b = SYMBOL_BLOCK_VALUE (func);
{
sym = BLOCK_SYM (b, i);
if (SYMBOL_CLASS (sym) == LOC_ARG
+ || SYMBOL_CLASS (sym) == LOC_LOCAL_ARG
|| SYMBOL_CLASS (sym) == LOC_REF_ARG
|| SYMBOL_CLASS (sym) == LOC_REGPARM)
{
values_printed = 1;
- fputs_filtered (SYMBOL_NAME (sym), stream);
+ fprint_symbol (stream, SYMBOL_NAME (sym));
fputs_filtered (" = ", stream);
- print_variable_value (sym, frame, stream);
+ /* We have to look up the symbol because arguments often have
+ two entries (one a parameter, one a register) and the one
+ we want is the register, which lookup_symbol will find for
+ us. */
+ sym2 = lookup_symbol (SYMBOL_NAME (sym),
+ b, VAR_NAMESPACE, (int *)NULL, (struct symtab **)NULL);
+ print_variable_value (sym2, frame, stream);
fprintf_filtered (stream, "\n");
- fflush (stream);
}
}
if (!values_printed)
{
fprintf_filtered (stream, "No arguments.\n");
- fflush (stream);
}
-
- return 1;
}
static void
args_info ()
{
- if (!have_inferior_p () && !have_core_file_p ())
- error ("No inferior or core file.");
+ if (!selected_frame)
+ error ("No frame selected.");
print_frame_arg_vars (selected_frame, stdout);
}
\f
FRAME frame;
int level;
{
+ register struct symtab *s;
+
selected_frame = frame;
selected_frame_level = level;
- /* Ensure that symbols for this frame are readin. */
+
+ /* 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)
- find_pc_symtab (get_frame_info (frame)->pc);
+ {
+ 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);
+ }
+ }
}
-/* Store the selected frame and its level into *FRAMEP and *LEVELP. */
+/* 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;
{
- *frameaddrp = FRAME_FP (selected_frame);
+ *frameaddrp = selected_frame ? FRAME_FP (selected_frame) : NULL;
*levelp = selected_frame_level;
}
struct block *
get_selected_block ()
{
- if (!have_inferior_p () && !have_core_file_p ())
+ if (!target_has_stack)
return 0;
if (!selected_frame)
register int* level_offset_ptr;
{
register FRAME prev;
- register FRAME frame1, frame2;
+ register FRAME frame1;
/* Going up is simple: just do get_prev_frame enough times
or until initial frame is reached. */
(*level_offset_ptr)--;
frame = prev;
}
- /* Going down could be done by iterating get_frame_info to
- find the next frame, but that would be quadratic
- since get_frame_info must scan all the way from the current frame.
- The following algorithm is linear. */
+ /* Going down is just as simple. */
if (*level_offset_ptr < 0)
{
- /* First put frame1 at innermost frame
- and frame2 N levels up from there. */
- frame1 = get_current_frame ();
- frame2 = frame1;
- while (*level_offset_ptr < 0 && frame2 != frame)
- {
- frame2 = get_prev_frame (frame2);
- (*level_offset_ptr) ++;
- }
- /* Then slide frame1 and frame2 up in synchrony
- and when frame2 reaches our starting point
- frame1 must be N levels down from there. */
- while (frame2 != frame)
- {
- frame1 = get_prev_frame (frame1);
- frame2 = get_prev_frame (frame2);
- }
- return frame1;
+ while (*level_offset_ptr < 0) {
+ frame1 = get_next_frame (frame);
+ if (!frame1)
+ break;
+ frame = frame1;
+ (*level_offset_ptr)++;
+ }
}
return frame;
}
-/* The "frame" command. With no arg, print selected frame briefly.
+/* 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 print it. See parse_frame_specification for more info on proper
+ and select it. See parse_frame_specification for more info on proper
frame expressions. */
+/* ARGSUSED */
static void
-frame_command (level_exp, from_tty)
+select_frame_command (level_exp, from_tty)
char *level_exp;
int from_tty;
{
register FRAME frame, frame1;
unsigned int level = 0;
- if (!have_inferior_p () && ! have_core_file_p ())
- error ("No inferior or core file.");
+ if (!target_has_stack)
+ error ("No stack.");
frame = parse_frame_specification (level_exp);
- for (frame1 = get_prev_frame (0);
- frame1 && frame1 != frame;
- frame1 = get_prev_frame (frame1))
- level++;
+ /* 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;
- frame_changed = level;
select_frame (frame, level);
+}
- if (!from_tty)
- return;
+/* 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;
+{
+ select_frame_command (level_exp, from_tty);
print_stack_frame (selected_frame, selected_frame_level, 1);
}
/* Select the frame up one or COUNT stack levels
from the previously selected frame, and print it briefly. */
+/* ARGSUSED */
static void
-up_command (count_exp)
+up_silently_command (count_exp, from_tty)
char *count_exp;
+ int from_tty;
{
register FRAME frame;
int count = 1, count1;
count = parse_and_eval_address (count_exp);
count1 = count;
- if (!have_inferior_p () && !have_core_file_p ())
- error ("No inferior or core file.");
+ if (!target_has_stack)
+ error ("No stack.");
frame = find_relative_frame (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);
+}
+static void
+up_command (count_exp, from_tty)
+ char *count_exp;
+ int from_tty;
+{
+ up_silently_command (count_exp, from_tty);
print_stack_frame (selected_frame, selected_frame_level, 1);
- frame_changed++;
}
/* Select the frame down one or COUNT stack levels
from the previously selected frame, and print it briefly. */
+/* ARGSUSED */
static void
-down_command (count_exp)
+down_silently_command (count_exp, from_tty)
char *count_exp;
+ int from_tty;
{
register FRAME frame;
int count = -1, count1;
count = - parse_and_eval_address (count_exp);
count1 = count;
+ if (!target_has_stack)
+ error ("No stack.");
+
frame = find_relative_frame (selected_frame, &count1);
if (count1 != 0 && count_exp == 0)
error ("Bottom (i.e., innermost) frame selected; you cannot go down.");
select_frame (frame, selected_frame_level + count - count1);
+}
+
+static void
+down_command (count_exp, from_tty)
+ char *count_exp;
+ int from_tty;
+{
+ down_silently_command (count_exp, from_tty);
print_stack_frame (selected_frame, selected_frame_level, 1);
- frame_changed--;
}
\f
static void
char *retval_exp;
int from_tty;
{
- struct symbol *thisfun = get_frame_function (selected_frame);
- FRAME_ADDR selected_frame_addr = FRAME_FP (selected_frame);
+ struct symbol *thisfun;
+ FRAME_ADDR selected_frame_addr;
+ CORE_ADDR selected_frame_pc;
+ FRAME frame;
+
+ if (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;
/* If interactive, require confirmation. */
/* Do the real work. Pop until the specified frame is current. We
use this method because the selected_frame is not valid after
- a POP_FRAME. Note that this will not work if the selected frame
- shares it's fp with another frame. */
+ 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 (get_current_frame()))
+ while ( selected_frame_addr != FRAME_FP (frame = get_current_frame())
+ || selected_frame_pc != (get_frame_info (frame))->pc )
POP_FRAME;
/* Then pop that frame. */
if (from_tty)
frame_command ("0", 1);
}
-\f
-extern struct cmd_list_element *setlist;
+/* Gets the language of the current frame. */
+enum language
+get_frame_language()
+{
+ 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;
+ else
+ flang = language_unknown;
+ }
+ else
+ flang = language_unknown;
+
+ return flang;
+}
+\f
void
_initialize_stack ()
{
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 ("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\
add_com_alias ("f", "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.");
"Local variables of current stack frame.");
add_info ("args", args_info,
"Argument variables of current stack frame.");
+ 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,
"The maximum number of frames for \"backtrace\" to print by default.");
#endif
}
-
projects / deliverable / binutils-gdb.git / blobdiff