X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fstack.c;h=6e3acc7e40288996c8087609818c1df5c743be67;hb=20249ae4551ae7b2193caed73d9ce8d594f38754;hp=8af34f34059f16c1fcc538b69cf9b5b020c71e3b;hpb=f9acce4a4f411e78ebca90995c598ed231b104a3;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/stack.c b/gdb/stack.c index 8af34f3405..6e3acc7e40 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1,6 +1,6 @@ /* Print and select stack frames for GDB, the GNU debugger. - Copyright (C) 1986-2015 Free Software Foundation, Inc. + Copyright (C) 1986-2016 Free Software Foundation, Inc. This file is part of GDB. @@ -48,7 +48,7 @@ #include "cli/cli-utils.h" #include "objfiles.h" -#include +#include "safe-ctype.h" #include "symfile.h" #include "extension.h" @@ -1273,15 +1273,13 @@ print_frame (struct frame_info *frame, int print_level, } -/* Read a frame specification in whatever the appropriate format is - from FRAME_EXP. Call error(), printing MESSAGE, if the - specification is in any way invalid (so this function never returns - NULL). When SEPECTED_P is non-NULL set its target to indicate that - the default selected frame was used. */ +/* Read a frame specification in whatever the appropriate format is from + FRAME_EXP. Call error() if the specification is in any way invalid (so + this function never returns NULL). When SEPECTED_P is non-NULL set its + target to indicate that the default selected frame was used. */ static struct frame_info * -parse_frame_specification_1 (const char *frame_exp, const char *message, - int *selected_frame_p) +parse_frame_specification (const char *frame_exp, int *selected_frame_p) { int numargs; struct value *args[4]; @@ -1305,7 +1303,7 @@ parse_frame_specification_1 (const char *frame_exp, const char *message, /* Parse the argument, extract it, save it. */ for (p = frame_exp; - *p && !isspace (*p); + *p && !ISSPACE (*p); p++); addr_string = savestring (frame_exp, p - frame_exp); frame_exp = p; @@ -1330,7 +1328,7 @@ parse_frame_specification_1 (const char *frame_exp, const char *message, { if (selected_frame_p != NULL) (*selected_frame_p) = 1; - return get_selected_frame (message); + return get_selected_frame (_("No stack.")); } /* None of the remaining use the selected frame. */ @@ -1401,12 +1399,6 @@ parse_frame_specification_1 (const char *frame_exp, const char *message, error (_("Too many args in frame specification")); } -static struct frame_info * -parse_frame_specification (char *frame_exp) -{ - return parse_frame_specification_1 (frame_exp, NULL, NULL); -} - /* Print verbosely the selected frame or the frame at address ADDR_EXP. Absolutely all information in the frame is printed. */ @@ -1431,7 +1423,7 @@ frame_info (char *addr_exp, int from_tty) CORE_ADDR caller_pc = 0; int caller_pc_p = 0; - fi = parse_frame_specification_1 (addr_exp, "No stack.", &selected_frame_p); + fi = parse_frame_specification (addr_exp, &selected_frame_p); gdbarch = get_frame_arch (fi); /* Name of the value returned by get_frame_pc(). Per comments, "pc" @@ -1517,27 +1509,32 @@ frame_info (char *addr_exp, int from_tty) wrap_here (" "); printf_filtered ("saved %s = ", pc_regname); - TRY - { - caller_pc = frame_unwind_caller_pc (fi); - caller_pc_p = 1; - } - CATCH (ex, RETURN_MASK_ERROR) + if (!frame_id_p (frame_unwind_caller_id (fi))) + val_print_unavailable (gdb_stdout); + else { - switch (ex.error) + TRY { - case NOT_AVAILABLE_ERROR: - val_print_unavailable (gdb_stdout); - break; - case OPTIMIZED_OUT_ERROR: - val_print_not_saved (gdb_stdout); - break; - default: - fprintf_filtered (gdb_stdout, _(""), ex.message); - break; + caller_pc = frame_unwind_caller_pc (fi); + caller_pc_p = 1; } + CATCH (ex, RETURN_MASK_ERROR) + { + switch (ex.error) + { + case NOT_AVAILABLE_ERROR: + val_print_unavailable (gdb_stdout); + break; + case OPTIMIZED_OUT_ERROR: + val_print_not_saved (gdb_stdout); + break; + default: + fprintf_filtered (gdb_stdout, _(""), ex.message); + break; + } + } + END_CATCH } - END_CATCH if (caller_pc_p) fputs_filtered (paddress (gdbarch, caller_pc), gdb_stdout); @@ -1894,7 +1891,7 @@ backtrace_command (char *arg, int from_tty) unsigned int j; for (j = 0; j < strlen (argv[i]); j++) - argv[i][j] = tolower (argv[i][j]); + argv[i][j] = TOLOWER (argv[i][j]); if (no_filters < 0 && subset_compare (argv[i], "no-filters")) no_filters = argc; @@ -2090,6 +2087,7 @@ print_frame_local_vars (struct frame_info *frame, int num_tabs, struct print_variable_and_value_data cb_data; const struct block *block; CORE_ADDR pc; + struct gdb_exception except = exception_none; if (!get_frame_pc_if_available (frame, &pc)) { @@ -2110,9 +2108,27 @@ print_frame_local_vars (struct frame_info *frame, int num_tabs, cb_data.stream = stream; cb_data.values_printed = 0; - iterate_over_block_local_vars (block, - do_print_variable_and_value, - &cb_data); + /* Temporarily change the selected frame to the given FRAME. + This allows routines that rely on the selected frame instead + of being given a frame as parameter to use the correct frame. */ + select_frame (frame); + + TRY + { + iterate_over_block_local_vars (block, + do_print_variable_and_value, + &cb_data); + } + CATCH (ex, RETURN_MASK_ALL) + { + except = ex; + } + END_CATCH + + /* Restore the selected frame, and then rethrow if there was a problem. */ + select_frame (frame_find_by_id (cb_data.frame_id)); + if (except.reason < 0) + throw_exception (except); /* do_print_variable_and_value invalidates FRAME. */ frame = NULL; @@ -2284,7 +2300,7 @@ find_relative_frame (struct frame_info *frame, int *level_offset_ptr) void select_frame_command (char *level_exp, int from_tty) { - select_frame (parse_frame_specification_1 (level_exp, "No stack.", NULL)); + select_frame (parse_frame_specification (level_exp, NULL)); } /* The "frame" command. With no argument, print the selected frame @@ -2492,11 +2508,10 @@ return_command (char *retval_exp, int from_tty) if (get_frame_type (get_current_frame ()) == DUMMY_FRAME) frame_pop (get_current_frame ()); + select_frame (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); + print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } /* Sets the scope to input function name, provided that the function @@ -2518,10 +2533,10 @@ func_command (char *arg, int from_tty) struct function_bounds *func_bounds = NULL; struct cleanup *cleanups; - if (arg != NULL) + if (arg == NULL) return; - frame = parse_frame_specification ("0"); + frame = get_current_frame (); sals = decode_line_with_current_source (arg, DECODE_LINE_FUNFIRSTLINE); cleanups = make_cleanup (xfree, sals.sals); func_bounds = XNEWVEC (struct function_bounds, sals.nelts);