/* Skipping uninteresting files and functions while stepping.
- Copyright (C) 2011-2012 Free Software Foundation, Inc.
+ Copyright (C) 2011-2016 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
#include "value.h"
#include "valprint.h"
#include "ui-out.h"
-#include "gdb_string.h"
#include "symtab.h"
#include "gdbcmd.h"
#include "command.h"
#include "arch-utils.h"
#include "linespec.h"
#include "objfiles.h"
-#include "exceptions.h"
#include "breakpoint.h" /* for get_sal_arch () */
+#include "source.h"
+#include "filenames.h"
+#include "fnmatch.h"
+#include "gdb_regex.h"
struct skiplist_entry
{
int number;
- /* NULL if this isn't a skiplist entry for an entire file.
+ /* Non-zero if FILE is a glob-style pattern.
+ Otherewise it is the plain file name (possibly with directories). */
+ int file_is_glob;
+
+ /* The name of the file or NULL.
The skiplist entry owns this pointer. */
- char *filename;
+ char *file;
- /* The name of the marked-for-skip function, if this is a skiplist
- entry for a function. Note that this might be non-null even if
- the pc is 0 if the entry is pending a shared library load.
+ /* Non-zero if FUNCTION is a regexp.
+ Otherwise it is a plain function name (possibly with arguments,
+ for C++). */
+ int function_is_regexp;
+ /* The name of the function or NULL.
The skiplist entry owns this pointer. */
- char *function_name;
+ char *function;
- /* 0 if this is a skiplist entry for an entire file, or if this
- entry will be on a function, pending a shared library load. */
- CORE_ADDR pc;
+ /* If this is a function regexp, the compiled form. */
+ regex_t compiled_function_regexp;
- /* Architecture we used to create the skiplist entry. May be null
- if the entry is pending a shared library load. */
- struct gdbarch *gdbarch;
+ /* Non-zero if the function regexp has been compiled. */
+ int compiled_function_regexp_is_valid;
int enabled;
- int pending;
struct skiplist_entry *next;
};
-static void skip_function_command (char *arg, int from_tty);
-static void skip_file_command (char *arg, int from_tty);
-static void skip_info (char *arg, int from_tty);
-
static void add_skiplist_entry (struct skiplist_entry *e);
-static void skip_function_pc (CORE_ADDR pc, char *name,
- struct gdbarch *arch,
- int pending);
static struct skiplist_entry *skiplist_entry_chain;
static int skiplist_entry_count;
E ? (TMP = E->next, 1) : 0; \
E = TMP)
+/* Create a skip object. */
+
+static struct skiplist_entry *
+make_skip_entry (int file_is_glob, const char *file,
+ int function_is_regexp, const char *function)
+{
+ struct skiplist_entry *e = XCNEW (struct skiplist_entry);
+
+ gdb_assert (file != NULL || function != NULL);
+ if (file_is_glob)
+ gdb_assert (file != NULL);
+ if (function_is_regexp)
+ gdb_assert (function != NULL);
+
+ if (file != NULL)
+ e->file = xstrdup (file);
+ if (function != NULL)
+ e->function = xstrdup (function);
+ e->file_is_glob = file_is_glob;
+ e->function_is_regexp = function_is_regexp;
+ e->enabled = 1;
+
+ return e;
+}
+
+/* Free a skiplist entry. */
+
+static void
+free_skiplist_entry (struct skiplist_entry *e)
+{
+ xfree (e->file);
+ xfree (e->function);
+ if (e->function_is_regexp && e->compiled_function_regexp_is_valid)
+ regfree (&e->compiled_function_regexp);
+ xfree (e);
+}
+
+/* Wrapper to free_skiplist_entry for use as a cleanup. */
+
+static void
+free_skiplist_entry_cleanup (void *e)
+{
+ free_skiplist_entry ((struct skiplist_entry *) e);
+}
+
+/* Create a cleanup to free skiplist entry E. */
+
+static struct cleanup *
+make_free_skiplist_entry_cleanup (struct skiplist_entry *e)
+{
+ return make_cleanup (free_skiplist_entry_cleanup, e);
+}
+
static void
skip_file_command (char *arg, int from_tty)
{
- struct skiplist_entry *e;
struct symtab *symtab;
- int pending = 0;
- char *filename = 0;
+ const char *filename = NULL;
/* If no argument was given, try to default to the last
displayed codepoint. */
- if (arg == 0)
+ if (arg == NULL)
{
symtab = get_last_displayed_symtab ();
- if (symtab == 0)
+ if (symtab == NULL)
error (_("No default file now."));
- else
- filename = symtab->filename;
+
+ /* It is not a typo, symtab_to_filename_for_display woule be needlessly
+ ambiguous. */
+ filename = symtab_to_fullname (symtab);
}
else
- {
- symtab = lookup_symtab (arg);
- if (symtab == 0)
- {
- fprintf_filtered (gdb_stderr, _("No source file named %s.\n"), arg);
- if (!nquery (_("\
-Ignore file pending future shared library load? ")))
- return;
+ filename = arg;
- pending = 1;
- filename = arg;
- }
- else
- filename = symtab->filename;
- }
+ add_skiplist_entry (make_skip_entry (0, filename, 0, NULL));
- e = XZALLOC (struct skiplist_entry);
- e->filename = xstrdup (filename);
- e->enabled = 1;
- e->pending = pending;
- if (symtab != 0)
- e->gdbarch = get_objfile_arch (symtab->objfile);
+ printf_filtered (_("File %s will be skipped when stepping.\n"), filename);
+}
- add_skiplist_entry (e);
+/* Create a skiplist entry for the given function NAME and add it to the
+ list. */
- printf_filtered (_("File %s will be skipped when stepping.\n"), filename);
+static void
+skip_function (const char *name)
+{
+ add_skiplist_entry (make_skip_entry (0, NULL, 0, name));
+
+ printf_filtered (_("Function %s will be skipped when stepping.\n"), name);
}
static void
skip_function_command (char *arg, int from_tty)
{
- CORE_ADDR func_pc;
- char *name = NULL;
-
/* Default to the current function if no argument is given. */
- if (arg == 0)
+ if (arg == NULL)
{
+ const char *name = NULL;
CORE_ADDR pc;
+
if (!last_displayed_sal_is_valid ())
error (_("No default function now."));
pc = get_last_displayed_addr ();
- if (!find_pc_partial_function (pc, &name, &func_pc, 0))
+ if (!find_pc_partial_function (pc, &name, NULL, NULL))
{
error (_("No function found containing current program point %s."),
paddress (get_current_arch (), pc));
}
- skip_function_pc (func_pc, name, get_current_arch (), 0);
+ skip_function (name);
+ return;
}
- else
+
+ skip_function (arg);
+}
+
+/* Compile the regexp in E.
+ An error is thrown if there's an error.
+ MESSAGE is used as a prefix of the error message. */
+
+static void
+compile_skip_regexp (struct skiplist_entry *e, const char *message)
+{
+ int code;
+ int flags = REG_NOSUB;
+
+#ifdef REG_EXTENDED
+ flags |= REG_EXTENDED;
+#endif
+
+ gdb_assert (e->function_is_regexp && e->function != NULL);
+
+ code = regcomp (&e->compiled_function_regexp, e->function, flags);
+ if (code != 0)
{
- /* Decode arg. We set funfirstline=1 so decode_line_1 will give us the
- first line of the function specified, if it can, and so that we'll
- reject variable names and the like. */
+ char *err = get_regcomp_error (code, &e->compiled_function_regexp);
- int i;
- int pending = 0;
- char *orig_arg = arg; /* decode_line_1 modifies the arg pointer. */
- volatile struct gdb_exception decode_exception;
- struct symtabs_and_lines sals = { 0 };
+ make_cleanup (xfree, err);
+ error (_("%s: %s"), message, err);
+ }
+ e->compiled_function_regexp_is_valid = 1;
+}
- TRY_CATCH (decode_exception, RETURN_MASK_ERROR)
- {
- sals = decode_line_1 (&arg, DECODE_LINE_FUNFIRSTLINE, 0, 0);
- }
+/* Process "skip ..." that does not match "skip file" or "skip function". */
- if (decode_exception.reason < 0)
- {
- if (decode_exception.error != NOT_FOUND_ERROR)
- throw_exception (decode_exception);
+static void
+skip_command (char *arg, int from_tty)
+{
+ const char *file = NULL;
+ const char *gfile = NULL;
+ const char *function = NULL;
+ const char *rfunction = NULL;
+ char **argv;
+ struct cleanup *cleanups;
+ struct skiplist_entry *e;
+ int i;
- fprintf_filtered (gdb_stderr,
- _("No function found named %s.\n"), orig_arg);
+ if (arg == NULL)
+ {
+ skip_function_command (arg, from_tty);
+ return;
+ }
- if (nquery (_("\
-Ignore function pending future shared library load? ")))
- {
- /* Add the pending skiplist entry. */
- skip_function_pc (0, orig_arg, 0, 1);
- }
+ argv = buildargv (arg);
+ cleanups = make_cleanup_freeargv (argv);
+ for (i = 0; argv[i] != NULL; ++i)
+ {
+ const char *p = argv[i];
+ const char *value = argv[i + 1];
+
+ if (strcmp (p, "-fi") == 0
+ || strcmp (p, "-file") == 0)
+ {
+ if (value == NULL)
+ error (_("Missing value for %s option."), p);
+ file = value;
+ ++i;
+ }
+ else if (strcmp (p, "-gfi") == 0
+ || strcmp (p, "-gfile") == 0)
+ {
+ if (value == NULL)
+ error (_("Missing value for %s option."), p);
+ gfile = value;
+ ++i;
+ }
+ else if (strcmp (p, "-fu") == 0
+ || strcmp (p, "-function") == 0)
+ {
+ if (value == NULL)
+ error (_("Missing value for %s option."), p);
+ function = value;
+ ++i;
+ }
+ else if (strcmp (p, "-rfu") == 0
+ || strcmp (p, "-rfunction") == 0)
+ {
+ if (value == NULL)
+ error (_("Missing value for %s option."), p);
+ rfunction = value;
+ ++i;
+ }
+ else if (*p == '-')
+ error (_("Invalid skip option: %s"), p);
+ else if (i == 0)
+ {
+ /* Assume the user entered "skip FUNCTION-NAME".
+ FUNCTION-NAME may be `foo (int)', and therefore we pass the
+ complete original arg to skip_function command as if the user
+ typed "skip function arg". */
+ do_cleanups (cleanups);
+ skip_function_command (arg, from_tty);
return;
}
+ else
+ error (_("Invalid argument: %s"), p);
+ }
+
+ if (file != NULL && gfile != NULL)
+ error (_("Cannot specify both -file and -gfile."));
+
+ if (function != NULL && rfunction != NULL)
+ error (_("Cannot specify both -function and -rfunction."));
- if (sals.nelts > 1)
- error (_("Specify just one function at a time."));
- if (strlen (arg) != 0)
- error (_("Junk at end of arguments."));
+ /* This shouldn't happen as "skip" by itself gets punted to
+ skip_function_command. */
+ gdb_assert (file != NULL || gfile != NULL
+ || function != NULL || rfunction != NULL);
+
+ e = make_skip_entry (gfile != NULL, file ? file : gfile,
+ rfunction != NULL, function ? function : rfunction);
+ if (rfunction != NULL)
+ {
+ struct cleanup *rf_cleanups = make_free_skiplist_entry_cleanup (e);
+
+ compile_skip_regexp (e, _("regexp"));
+ discard_cleanups (rf_cleanups);
+ }
+ add_skiplist_entry (e);
- /* The pc decode_line_1 gives us is the first line of the function,
- but we actually want the line before that. The call to
- find_pc_partial_function gets us the value we actually want. */
+ /* I18N concerns drive some of the choices here (we can't piece together
+ the output too much). OTOH we want to keep this simple. Therefore the
+ only polish we add to the output is to append "(s)" to "File" or
+ "Function" if they're a glob/regexp. */
+ {
+ const char *file_to_print = file != NULL ? file : gfile;
+ const char *function_to_print = function != NULL ? function : rfunction;
+ const char *file_text = gfile != NULL ? _("File(s)") : _("File");
+ const char *lower_file_text = gfile != NULL ? _("file(s)") : _("file");
+ const char *function_text
+ = rfunction != NULL ? _("Function(s)") : _("Function");
+
+ if (function_to_print == NULL)
{
- struct symtab_and_line sal = sals.sals[0];
- CORE_ADDR pc = sal.pc;
- CORE_ADDR func_start = 0;
- struct gdbarch *arch = get_sal_arch (sal);
-
- if (!find_pc_partial_function (pc, &name, &func_start, 0))
- {
- error (_("No function found containing program point %s."),
- paddress (arch, pc));
- }
-
- skip_function_pc (func_start, name, arch, 0);
+ printf_filtered (_("%s %s will be skipped when stepping.\n"),
+ file_text, file_to_print);
}
- }
+ else if (file_to_print == NULL)
+ {
+ printf_filtered (_("%s %s will be skipped when stepping.\n"),
+ function_text, function_to_print);
+ }
+ else
+ {
+ printf_filtered (_("%s %s in %s %s will be skipped"
+ " when stepping.\n"),
+ function_text, function_to_print,
+ lower_file_text, file_to_print);
+ }
+ }
+
+ do_cleanups (cleanups);
}
static void
{
struct skiplist_entry *e;
int num_printable_entries = 0;
- int address_width = 10;
struct value_print_options opts;
struct cleanup *tbl_chain;
/* Count the number of rows in the table and see if we need space for a
64-bit address anywhere. */
ALL_SKIPLIST_ENTRIES (e)
- if (arg == 0 || number_is_in_list (arg, e->number))
- {
- num_printable_entries++;
- if (e->gdbarch && gdbarch_addr_bit (e->gdbarch) > 32)
- address_width = 18;
- }
+ if (arg == NULL || number_is_in_list (arg, e->number))
+ num_printable_entries++;
if (num_printable_entries == 0)
{
- if (arg == 0)
+ if (arg == NULL)
ui_out_message (current_uiout, 0, _("\
Not skipping any files or functions.\n"));
else
return;
}
- if (opts.addressprint)
- tbl_chain = make_cleanup_ui_out_table_begin_end (current_uiout, 5,
- num_printable_entries,
- "SkiplistTable");
- else
- tbl_chain
- = make_cleanup_ui_out_table_begin_end (current_uiout, 4,
- num_printable_entries,
- "SkiplistTable");
-
- ui_out_table_header (current_uiout, 7, ui_left, "number", "Num"); /* 1 */
- ui_out_table_header (current_uiout, 14, ui_left, "type", "Type"); /* 2 */
- ui_out_table_header (current_uiout, 3, ui_left, "enabled", "Enb"); /* 3 */
- if (opts.addressprint)
- {
- ui_out_table_header (current_uiout, address_width, ui_left,
- "addr", "Address"); /* 4 */
- }
- ui_out_table_header (current_uiout, 40, ui_noalign, "what", "What"); /* 5 */
+ tbl_chain = make_cleanup_ui_out_table_begin_end (current_uiout, 6,
+ num_printable_entries,
+ "SkiplistTable");
+
+ ui_out_table_header (current_uiout, 5, ui_left, "number", "Num"); /* 1 */
+ ui_out_table_header (current_uiout, 3, ui_left, "enabled", "Enb"); /* 2 */
+ ui_out_table_header (current_uiout, 4, ui_right, "regexp", "Glob"); /* 3 */
+ ui_out_table_header (current_uiout, 20, ui_left, "file", "File"); /* 4 */
+ ui_out_table_header (current_uiout, 2, ui_right, "regexp", "RE"); /* 5 */
+ ui_out_table_header (current_uiout, 40, ui_noalign,
+ "function", "Function"); /* 6 */
ui_out_table_body (current_uiout);
ALL_SKIPLIST_ENTRIES (e)
struct cleanup *entry_chain;
QUIT;
- if (arg != 0 && !number_is_in_list (arg, e->number))
+ if (arg != NULL && !number_is_in_list (arg, e->number))
continue;
entry_chain = make_cleanup_ui_out_tuple_begin_end (current_uiout,
"blklst-entry");
- ui_out_field_int (current_uiout, "number", e->number); /* 1 */
+ ui_out_field_int (current_uiout, "number", e->number); /* 1 */
- if (e->function_name != 0)
- ui_out_field_string (current_uiout, "type", "function"); /* 2 */
- else if (e->filename != 0)
- ui_out_field_string (current_uiout, "type", "file"); /* 2 */
+ if (e->enabled)
+ ui_out_field_string (current_uiout, "enabled", "y"); /* 2 */
else
- internal_error (__FILE__, __LINE__, _("\
-Skiplist entry should have either a filename or a function name."));
+ ui_out_field_string (current_uiout, "enabled", "n"); /* 2 */
- if (e->enabled)
- ui_out_field_string (current_uiout, "enabled", "y"); /* 3 */
+ if (e->file_is_glob)
+ ui_out_field_string (current_uiout, "regexp", "y"); /* 3 */
else
- ui_out_field_string (current_uiout, "enabled", "n"); /* 3 */
+ ui_out_field_string (current_uiout, "regexp", "n"); /* 3 */
- if (opts.addressprint)
- {
- if (e->pc != 0)
- ui_out_field_core_addr (current_uiout, "addr",
- e->gdbarch, e->pc); /* 4 */
- else
- ui_out_field_string (current_uiout, "addr", ""); /* 4 */
- }
+ ui_out_field_string (current_uiout, "file",
+ e->file ? e->file : "<none>"); /* 4 */
+ if (e->function_is_regexp)
+ ui_out_field_string (current_uiout, "regexp", "y"); /* 5 */
+ else
+ ui_out_field_string (current_uiout, "regexp", "n"); /* 5 */
- if (!e->pending && e->function_name != 0)
- {
- struct symbol *sym;
-
- gdb_assert (e->pc != 0);
- sym = find_pc_function (e->pc);
- if (sym)
- ui_out_field_fmt (current_uiout, "what", "%s at %s:%d",
- sym->ginfo.name,
- sym->symtab->filename,
- sym->line);
- else
- ui_out_field_string (current_uiout, "what", "?");
- }
- else if (e->pending && e->function_name != 0)
- {
- ui_out_field_fmt (current_uiout, "what", "%s (PENDING)",
- e->function_name);
- }
- else if (!e->pending && e->filename != 0)
- ui_out_field_string (current_uiout, "what", e->filename);
- else if (e->pending && e->filename != 0)
- ui_out_field_fmt (current_uiout, "what", "%s (PENDING)",
- e->filename);
+ ui_out_field_string (current_uiout, "function",
+ e->function ? e->function : "<none>"); /* 6 */
ui_out_text (current_uiout, "\n");
do_cleanups (entry_chain);
int found = 0;
ALL_SKIPLIST_ENTRIES (e)
- if (arg == 0 || number_is_in_list (arg, e->number))
+ if (arg == NULL || number_is_in_list (arg, e->number))
{
e->enabled = 1;
found = 1;
int found = 0;
ALL_SKIPLIST_ENTRIES (e)
- if (arg == 0 || number_is_in_list (arg, e->number))
+ if (arg == NULL || number_is_in_list (arg, e->number))
{
e->enabled = 0;
found = 1;
b_prev = 0;
ALL_SKIPLIST_ENTRIES_SAFE (e, temp)
- if (arg == 0 || number_is_in_list (arg, e->number))
+ if (arg == NULL || number_is_in_list (arg, e->number))
{
- if (b_prev != 0)
+ if (b_prev != NULL)
b_prev->next = e->next;
else
skiplist_entry_chain = e->next;
- xfree (e->function_name);
- xfree (e->filename);
- xfree (e);
+ free_skiplist_entry (e);
found = 1;
}
else
error (_("No skiplist entries found with number %s."), arg);
}
-/* Create a skiplist entry for the given pc corresponding to the given
- function name and add it to the list. */
-
-static void
-skip_function_pc (CORE_ADDR pc, char *name, struct gdbarch *arch,
- int pending)
-{
- struct skiplist_entry *e = XZALLOC (struct skiplist_entry);
-
- e->pc = pc;
- e->gdbarch = arch;
- e->enabled = 1;
- e->pending = pending;
- e->function_name = xstrdup (name);
-
- add_skiplist_entry (e);
-
- if (!pending)
- printf_filtered (_("Function %s at %s will be skipped when stepping.\n"),
- name, paddress (get_current_arch (), pc));
- else
- printf_filtered (_("Function %s will be skipped when stepping, "
- "pending shared library load.\n"),
- name);
-}
-
/* Add the given skiplist entry to our list, and set the entry's number. */
static void
skiplist entries will be in numerical order. */
e1 = skiplist_entry_chain;
- if (e1 == 0)
+ if (e1 == NULL)
skiplist_entry_chain = e;
else
{
}
}
-/* Does the given pc correspond to the beginning of a skipped function? */
+/* Return non-zero if we're stopped at a file to be skipped. */
-int
-function_pc_is_marked_for_skip (CORE_ADDR pc)
+static int
+skip_file_p (struct skiplist_entry *e,
+ const struct symtab_and_line *function_sal)
{
- int searched_for_sal = 0;
- struct symtab_and_line sal;
- char *filename = NULL;
- struct skiplist_entry *e;
+ gdb_assert (e->file != NULL && !e->file_is_glob);
- ALL_SKIPLIST_ENTRIES (e)
- {
- if (!e->enabled || e->pending)
- continue;
+ if (function_sal->symtab == NULL)
+ return 0;
- /* Does the pc we're stepping into match e's stored pc? */
- if (e->pc != 0 && pc == e->pc)
- return 1;
+ /* Check first sole SYMTAB->FILENAME. It may not be a substring of
+ symtab_to_fullname as it may contain "./" etc. */
+ if (compare_filenames_for_search (function_sal->symtab->filename, e->file))
+ return 1;
- if (e->filename != 0)
- {
- /* Get the filename corresponding to this pc, if we haven't
- * yet. */
- if (!searched_for_sal)
- {
- sal = find_pc_line (pc, 0);
- if (sal.symtab != 0)
- filename = sal.symtab->filename;
- searched_for_sal = 1;
- }
- if (filename != 0 && strcmp (filename, e->filename) == 0)
- return 1;
- }
- }
+ /* Before we invoke realpath, which can get expensive when many
+ files are involved, do a quick comparison of the basenames. */
+ if (!basenames_may_differ
+ && filename_cmp (lbasename (function_sal->symtab->filename),
+ lbasename (e->file)) != 0)
+ return 0;
+
+ /* Note: symtab_to_fullname caches its result, thus we don't have to. */
+ {
+ const char *fullname = symtab_to_fullname (function_sal->symtab);
+
+ if (compare_filenames_for_search (fullname, e->file))
+ return 1;
+ }
return 0;
}
-/* Re-set the skip list after symbols have been re-loaded. */
-void
-skip_re_set (void)
+/* Return non-zero if we're stopped at a globbed file to be skipped. */
+
+static int
+skip_gfile_p (struct skiplist_entry *e,
+ const struct symtab_and_line *function_sal)
+{
+ gdb_assert (e->file != NULL && e->file_is_glob);
+
+ if (function_sal->symtab == NULL)
+ return 0;
+
+ /* Check first sole SYMTAB->FILENAME. It may not be a substring of
+ symtab_to_fullname as it may contain "./" etc. */
+ if (gdb_filename_fnmatch (e->file, function_sal->symtab->filename,
+ FNM_FILE_NAME | FNM_NOESCAPE) == 0)
+ return 1;
+
+ /* Before we invoke symtab_to_fullname, which is expensive, do a quick
+ comparison of the basenames.
+ Note that we assume that lbasename works with glob-style patterns.
+ If the basename of the glob pattern is something like "*.c" then this
+ isn't much of a win. Oh well. */
+ if (!basenames_may_differ
+ && gdb_filename_fnmatch (lbasename (e->file),
+ lbasename (function_sal->symtab->filename),
+ FNM_FILE_NAME | FNM_NOESCAPE) != 0)
+ return 0;
+
+ /* Note: symtab_to_fullname caches its result, thus we don't have to. */
+ {
+ const char *fullname = symtab_to_fullname (function_sal->symtab);
+
+ if (compare_glob_filenames_for_search (fullname, e->file))
+ return 1;
+ }
+
+ return 0;
+}
+
+/* Return non-zero if we're stopped at a function to be skipped. */
+
+static int
+skip_function_p (struct skiplist_entry *e, const char *function_name)
+{
+ gdb_assert (e->function != NULL && !e->function_is_regexp);
+ return strcmp_iw (function_name, e->function) == 0;
+}
+
+/* Return non-zero if we're stopped at a function regexp to be skipped. */
+
+static int
+skip_rfunction_p (struct skiplist_entry *e, const char *function_name)
+{
+ gdb_assert (e->function != NULL && e->function_is_regexp
+ && e->compiled_function_regexp_is_valid);
+ return (regexec (&e->compiled_function_regexp, function_name, 0, NULL, 0)
+ == 0);
+}
+
+/* See skip.h. */
+
+int
+function_name_is_marked_for_skip (const char *function_name,
+ const struct symtab_and_line *function_sal)
{
struct skiplist_entry *e;
+ if (function_name == NULL)
+ return 0;
+
ALL_SKIPLIST_ENTRIES (e)
{
- if (e->filename != 0)
+ int skip_by_file = 0;
+ int skip_by_function = 0;
+
+ if (!e->enabled)
+ continue;
+
+ if (e->file != NULL)
{
- /* If it's an entry telling us to skip a file, but the entry is
- currently pending a solib load, let's see if we now know
- about the file. */
- struct symtab *symtab = lookup_symtab (e->filename);
- if (symtab != 0)
+ if (e->file_is_glob)
{
- xfree (e->filename);
- e->filename = xstrdup (symtab->filename);
- e->gdbarch = get_objfile_arch (symtab->objfile);
- e->pending = 0;
+ if (skip_gfile_p (e, function_sal))
+ skip_by_file = 1;
}
else
{
- e->pending = 1;
+ if (skip_file_p (e, function_sal))
+ skip_by_file = 1;
}
}
- else if (e->function_name != 0)
- {
- char *func_name = e->function_name;
- struct symtabs_and_lines sals = { 0 };
- volatile struct gdb_exception decode_exception;
-
- TRY_CATCH (decode_exception, RETURN_MASK_ERROR)
- {
- sals = decode_line_1 (&func_name, DECODE_LINE_FUNFIRSTLINE, 0, 0);
- }
-
- if (decode_exception.reason >= 0
- && sals.nelts == 1 && strlen (func_name) == 0)
+ if (e->function != NULL)
+ {
+ if (e->function_is_regexp)
{
- struct symtab_and_line sal = sals.sals[0];
- CORE_ADDR pc = sal.pc;
- CORE_ADDR func_start = 0;
- struct gdbarch *arch = get_sal_arch (sal);
- char *func_name;
-
- if (find_pc_partial_function (pc, &func_name, &func_start, 0))
- {
- e->pending = 0;
- e->function_name = xstrdup (func_name);
- e->pc = func_start;
- e->gdbarch = arch;
- }
+ if (skip_rfunction_p (e, function_name))
+ skip_by_function = 1;
}
else
{
- e->pending = 1;
+ if (skip_function_p (e, function_name))
+ skip_by_function = 1;
}
- }
+ }
+
+ /* If both file and function must match, make sure we don't errantly
+ exit if only one of them match. */
+ if (e->file != NULL && e->function != NULL)
+ {
+ if (skip_by_file && skip_by_function)
+ return 1;
+ }
+ /* Only one of file/function is specified. */
+ else if (skip_by_file || skip_by_function)
+ return 1;
}
+
+ return 0;
}
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern initialize_file_ftype _initialize_step_skip;
+
void
_initialize_step_skip (void)
{
+ static struct cmd_list_element *skiplist = NULL;
struct cmd_list_element *c;
skiplist_entry_chain = 0;
skiplist_entry_count = 0;
- add_prefix_cmd ("skip", class_breakpoint, skip_function_command, _("\
+ add_prefix_cmd ("skip", class_breakpoint, skip_command, _("\
Ignore a function while stepping.\n\
-Usage: skip [FUNCTION NAME]\n\
-If no function name is given, ignore the current function."),
+\n\
+Usage: skip [FUNCTION-NAME]\n\
+ skip [<file-spec>] [<function-spec>]\n\
+If no arguments are given, ignore the current function.\n\
+\n\
+<file-spec> is one of:\n\
+ -fi|-file FILE-NAME\n\
+ -gfi|-gfile GLOB-FILE-PATTERN\n\
+<function-spec> is one of:\n\
+ -fu|-function FUNCTION-NAME\n\
+ -rfu|-rfunction FUNCTION-NAME-REGULAR-EXPRESSION"),
&skiplist, "skip ", 1, &cmdlist);
c = add_cmd ("file", class_breakpoint, skip_file_command, _("\
Ignore a file while stepping.\n\
-Usage: skip file [FILENAME]\n\
+Usage: skip file [FILE-NAME]\n\
If no filename is given, ignore the current file."),
&skiplist);
set_cmd_completer (c, filename_completer);
c = add_cmd ("function", class_breakpoint, skip_function_command, _("\
Ignore a function while stepping.\n\
-Usage: skip function [FUNCTION NAME]\n\
+Usage: skip function [FUNCTION-NAME]\n\
If no function name is given, skip the current function."),
&skiplist);
set_cmd_completer (c, location_completer);
projects / deliverable / binutils-gdb.git / blobdiff