From 858174054dbd9970d840c043aeb318f721fcf4fd Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 24 Dec 2012 19:40:05 +0000 Subject: gdb/ * breakpoint.c (breakpoint_re_set): Remove the skip_re_set call. * infrun.c (handle_inferior_event): Rename the called function to function_name_is_marked_for_skip, pass it TMP_SAL. * skip.c (struct skiplist_entry): Update function_name comment. Remove fields pc, gdbarch and pending. (skip_function_pc): Rename this forward declaration to ... (skip_function): ... here. (skip_file_command): Remove variable pending and its use, remove initialization of E fields pending and gdbarch. Do not use SYMTAB filename, use the specified one. (skip_function_command): Remove variable func_pc, do not set it. Update the caller of skip_function. Replace decode_line_1 call by a lookup_symbol call. Remove variables orig_arg, decode_exception and sals. Update the caller of skip_function. (skip_info): Remove variable address_width and its use. Do not print address (PC). Renumber column 5 to 4. (skip_function_pc): Rename to ... (skip_function): ... here and remove its parameters pc, arch and pending. Update the function comment and no longer use those parameters. (function_pc_is_marked_for_skip): Rename to ... (function_name_is_marked_for_skip): ... here, update function comment just to a skip.h reference, replace pc parameter by function_name and function_sal. No longer use E field pending and pc. Remove variables searched_for_sal, sal and filename. Call compare_filenames_for_search instead of just strcmp. (skip_re_set): Remove the function. * skip.h (struct symtab_and_line): New declaration. (function_pc_is_marked_for_skip): Rename to ... (function_name_is_marked_for_skip): ... here, replace pc parameter by function_name and function_sal, update the function comment. gdb/testsuite/ * gdb.base/skip-solib.exp (info skip with pending file): Update the expected output. (info skip with pending file): Remove. (ignoring function in solib, info skip for function multiply): Update the expected output. * gdb.base/skip.ex (skip (main), skip function baz, info skip) (info skip (delete 1), info skip after disabling all) (info skip after enabling all, info skip after disabling 4 2-3) (info skip after enabling 2-3, info skip 2-3) (info skip after deleting 2 3): Update the expected output. * gdb.linespec/base/two/thefile.cc (n): New variable v, split the statement to its initialization and return. * gdb.linespec/skip-two.exp: New file. --- gdb/skip.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gdb/skip.h') diff --git a/gdb/skip.h b/gdb/skip.h index c1f8185..615ee59 100644 --- a/gdb/skip.h +++ b/gdb/skip.h @@ -18,11 +18,11 @@ #if !defined (SKIP_H) #define SKIP_H -/* Returns 1 if the given pc is marked for skip and shouldn't be - stepped into. Otherwise, returns 0. */ -int function_pc_is_marked_for_skip (CORE_ADDR pc); +struct symtab_and_line; -/* Re-set the skip list after symbols have been reloaded. */ -void skip_re_set (void); +/* Returns 1 if the given FUNCTION_NAME is marked for skip and shouldn't be + stepped into. Otherwise, returns 0. */ +int function_name_is_marked_for_skip (const char *function_name, + const struct symtab_and_line *function_sal); #endif /* !defined (SKIP_H) */ -- cgit v1.1