40e084e177
* linespec.c (decode_compound): Remove. (enum offset_relative_sign): New enum. (struct line_offset): New struct. (struct linespec): New struct. (struct linespec_state): Move file_symtabs, user_filename, and user_function into struct linespec. Make result an anonymous struct holding vectors of symbolp and minsym_and_objfile_d. Add language member. (enum ls_token_type): New enum. (linespec_keywords): New array. (struct ls_token): New struct. (struct ls_parser): New struct. (linespec_lexer_lex_number): New function. (linespec_lexer_lex_keyword): New function. (is_ada_operator): New function. (skip_quote_char): New function. (copy_token_string): New function. (is_closing_quote_enclosed): New function. (find_parameter_list_end): New function. (linespec_lexer_lex_string): New function. (linespec_lexer_lex_one): New function. (linespec_lexer_consume_token): New function. (linespec_lexer_peek_token): New function. (cplusplus_error): Remove unused function. (find_methods): Update comment. (find_toplevel_char): Return const. (is_objc_method_format): Remove unused function. (find_toplevel_string): New function. (is_linespec_boundary): Remove. (symbol_not_found_error): New function. (find_method_overload_end): Remove function. (unexpected_linespec_error): New function. (keep_name_info): Remove. (linespec_parse_line_offset): New function. (linespec_parse_basic): New function. (canonicalize_linespec): New function. (decode_line_internal): Remove. (create_sals_line_offset): New function adapted from decode_all_digits. (convert_linespec_to_sals): New function. (parse_linespec): New function. (linespec_parser_new): New function. (linespec_state_destructor): Change parameter type to struct linespec_state *. Add language parameter. Remove freeing of moved members. (linespec_parser_delete): New function. (decode_line_full): Use parse_linespec and linespec_parser_new. (decode_line_1): Likewise. (decode_indirect): Rename to ... (linespec_expression_to_pc): ... this and rewrite to simply find CORE_ADDR, storing this result for later conversion to SALs. (locate_first_half): Remove. (deocde_objc): Add parameter LS. Initialize new struct collect_info members. Handle minimal symbols, too. (decode_compound): Delete. (lookup_prefix_sym): Rewrite. (compare_msymbols): New function. (find_method): Rewrite. Do not call cplusplus_error. (symtabs_from_filename): Rewrite. (collect_function_symbols): Delete. (find_function_symbols): Rewrite without ARGPTR-style processing. (decode_all_digits): Delete. (Rewritten as create_sals_line_offset.) (decode_dollar): Adapted and renamed to ... (linespec_parse_variable): ... this. (find_linespec_symbols): New function. (decode_label): Adapted and renamed to ... (find_label_symbols): ... this. (decode_digits_list_mode): Add and use LS argument. (decode_digits_ordinary): Likewise. (collect_symbols): Do not collect SALs, just symbols and msymbols. If in list mode, allow any symbol class. Otherwise, only permit LOC_BLOCK symbols. (minsym_found): Update comments. (search_minsyms_for_name): Do not convert the matching symbol into a SAL. Simply push the symbol and objfile into the result vector. (decode_variable): Delete. Contents adapted into find_linespec_symbols. * cp-support.c (SKIP_SPACE): Remove. (operator_tokens): Remove unused global. (cp_validate_operator): Remove. * cp-support.h (cp_validate_operator): Remove declaration. * gdb.base/advance.exp: Update error message for "advance malformed" test. * gdb.base/break.exp: Likewise for "breakpoint with trailing garbage" test. * gdb.base/hbreak2.exp: Likewise for "hardware breakpoint with trailing garbage" test. * gdb.base/jump.exp: Likewise for "jump with trailing argument junk" test. * gdb.base/sepdebug.exp: Likewise for "breakpoint with trailng garbage" test. * gdb.base/until.exp: Likewise for "malformed until" test. * gdb.cp/ovldbreak.exp: Create the breakpoint table for "breakpoint info (after setting on all)". * gdb.cp/userdef.exp: Remove quoting for "break A2::operator+" tests. * gdb.cp/cplabel.cc: New file. * gdb.cp/cplabel.exp: New test. * gdb.linespec/ls-errs.c: New file. * gdb.linespec/ls-errs.exp: New test.
89 lines
2.8 KiB
Text
89 lines
2.8 KiB
Text
# Copyright 2003, 2007-2012 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 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
# advance.exp -- Expect script to test 'advance' in gdb
|
|
|
|
set testfile advance
|
|
set srcfile ${testfile}.c
|
|
set binfile ${objdir}/${subdir}/${testfile}
|
|
|
|
remote_exec build "rm -f ${binfile}"
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
|
|
untested advance.exp
|
|
return -1
|
|
}
|
|
|
|
gdb_exit
|
|
gdb_start
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
gdb_load ${binfile}
|
|
|
|
if ![runto_main] then {
|
|
fail "Can't run to main"
|
|
return 0
|
|
}
|
|
|
|
# Verify that "advance <location>" works. (This is really just syntactic
|
|
# sugar for "tbreak <location>; continue".)
|
|
#
|
|
gdb_test "advance [gdb_get_line_number "advance this location"]" \
|
|
"main .* at .*:.*b = 3.*advance this location.*" \
|
|
"advance line number"
|
|
|
|
# Verify that a malformed "advance" is gracefully caught.
|
|
#
|
|
gdb_test "advance [gdb_get_line_number "advance malformed"] then stop" \
|
|
"malformed linespec error: unexpected string, \"then stop\"" \
|
|
"malformed advance"
|
|
|
|
# Verify that "advance <funcname>" works.
|
|
#
|
|
gdb_test "advance func" \
|
|
"func.*at.*x = x \\+ 5." \
|
|
"advance func"
|
|
|
|
# Verify that "advance <funcname>" when funcname is NOT called by the current
|
|
# frame, stops at the end of the current frame.
|
|
#
|
|
# gdb can legitimately stop on either the current line or the next line,
|
|
# depending on whether the machine instruction for 'call' on the current
|
|
# line has more instructions after it or not.
|
|
#
|
|
gdb_test "advance func3" \
|
|
"(in main|).*(func \\(c\\)|marker1 \\(\\)).*stop here after leaving current frame..."\
|
|
"advance function not called by current frame"
|
|
|
|
# break at main again
|
|
#
|
|
gdb_test "break [gdb_get_line_number "break here"]" \
|
|
".*Breakpoint.* at .*" \
|
|
"set breakpoint at call to func3"
|
|
gdb_test "continue" \
|
|
".*Breakpoint ${decimal}, main.*func3.*break here.*" \
|
|
"continue to call to func3 in main"
|
|
|
|
# Verify that "advance <funcname>" when funcname is called as parameter to
|
|
# another function works.
|
|
#
|
|
gdb_test "advance foo" \
|
|
"foo \\(a=5\\).*int b = a \\+ 10;"\
|
|
"advance function called as param"
|
|
|
|
# Verify that we get an error if we use 'advance' w/o argument
|
|
#
|
|
gdb_test "advance" \
|
|
"Argument required \\(a location\\)."\
|
|
"advance with no argument"
|
|
|