mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
dda83cd783
Many spots incorrectly use only spaces for indentation (for example, there are a lot of spots in ada-lang.c). I've always found it awkward when I needed to edit one of these spots: do I keep the original wrong indentation, or do I fix it? What if the lines around it are also wrong, do I fix them too? I probably don't want to fix them in the same patch, to avoid adding noise to my patch. So I propose to fix as much as possible once and for all (hopefully). One typical counter argument for this is that it makes code archeology more difficult, because git-blame will show this commit as the last change for these lines. My counter counter argument is: when git-blaming, you often need to do "blame the file at the parent commit" anyway, to go past some other refactor that touched the line you are interested in, but is not the change you are looking for. So you already need a somewhat efficient way to do this. Using some interactive tool, rather than plain git-blame, makes this trivial. For example, I use "tig blame <file>", where going back past the commit that changed the currently selected line is one keystroke. It looks like Magit in Emacs does it too (though I've never used it). Web viewers of Github and Gitlab do it too. My point is that it won't really make archeology more difficult. The other typical counter argument is that it will cause conflicts with existing patches. That's true... but it's a one time cost, and those are not conflicts that are difficult to resolve. I have also tried "git rebase --ignore-whitespace", it seems to work well. Although that will re-introduce the faulty indentation, so one needs to take care of fixing the indentation in the patch after that (which is easy). gdb/ChangeLog: * aarch64-linux-tdep.c: Fix indentation. * aarch64-ravenscar-thread.c: Fix indentation. * aarch64-tdep.c: Fix indentation. * aarch64-tdep.h: Fix indentation. * ada-lang.c: Fix indentation. * ada-lang.h: Fix indentation. * ada-tasks.c: Fix indentation. * ada-typeprint.c: Fix indentation. * ada-valprint.c: Fix indentation. * ada-varobj.c: Fix indentation. * addrmap.c: Fix indentation. * addrmap.h: Fix indentation. * agent.c: Fix indentation. * aix-thread.c: Fix indentation. * alpha-bsd-nat.c: Fix indentation. * alpha-linux-tdep.c: Fix indentation. * alpha-mdebug-tdep.c: Fix indentation. * alpha-nbsd-tdep.c: Fix indentation. * alpha-obsd-tdep.c: Fix indentation. * alpha-tdep.c: Fix indentation. * amd64-bsd-nat.c: Fix indentation. * amd64-darwin-tdep.c: Fix indentation. * amd64-linux-nat.c: Fix indentation. * amd64-linux-tdep.c: Fix indentation. * amd64-nat.c: Fix indentation. * amd64-obsd-tdep.c: Fix indentation. * amd64-tdep.c: Fix indentation. * amd64-windows-tdep.c: Fix indentation. * annotate.c: Fix indentation. * arc-tdep.c: Fix indentation. * arch-utils.c: Fix indentation. * arch/arm-get-next-pcs.c: Fix indentation. * arch/arm.c: Fix indentation. * arm-linux-nat.c: Fix indentation. * arm-linux-tdep.c: Fix indentation. * arm-nbsd-tdep.c: Fix indentation. * arm-pikeos-tdep.c: Fix indentation. * arm-tdep.c: Fix indentation. * arm-tdep.h: Fix indentation. * arm-wince-tdep.c: Fix indentation. * auto-load.c: Fix indentation. * auxv.c: Fix indentation. * avr-tdep.c: Fix indentation. * ax-gdb.c: Fix indentation. * ax-general.c: Fix indentation. * bfin-linux-tdep.c: Fix indentation. * block.c: Fix indentation. * block.h: Fix indentation. * blockframe.c: Fix indentation. * bpf-tdep.c: Fix indentation. * break-catch-sig.c: Fix indentation. * break-catch-syscall.c: Fix indentation. * break-catch-throw.c: Fix indentation. * breakpoint.c: Fix indentation. * breakpoint.h: Fix indentation. * bsd-uthread.c: Fix indentation. * btrace.c: Fix indentation. * build-id.c: Fix indentation. * buildsym-legacy.h: Fix indentation. * buildsym.c: Fix indentation. * c-typeprint.c: Fix indentation. * c-valprint.c: Fix indentation. * c-varobj.c: Fix indentation. * charset.c: Fix indentation. * cli/cli-cmds.c: Fix indentation. * cli/cli-decode.c: Fix indentation. * cli/cli-decode.h: Fix indentation. * cli/cli-script.c: Fix indentation. * cli/cli-setshow.c: Fix indentation. * coff-pe-read.c: Fix indentation. * coffread.c: Fix indentation. * compile/compile-cplus-types.c: Fix indentation. * compile/compile-object-load.c: Fix indentation. * compile/compile-object-run.c: Fix indentation. * completer.c: Fix indentation. * corefile.c: Fix indentation. * corelow.c: Fix indentation. * cp-abi.h: Fix indentation. * cp-namespace.c: Fix indentation. * cp-support.c: Fix indentation. * cp-valprint.c: Fix indentation. * cris-linux-tdep.c: Fix indentation. * cris-tdep.c: Fix indentation. * darwin-nat-info.c: Fix indentation. * darwin-nat.c: Fix indentation. * darwin-nat.h: Fix indentation. * dbxread.c: Fix indentation. * dcache.c: Fix indentation. * disasm.c: Fix indentation. * dtrace-probe.c: Fix indentation. * dwarf2/abbrev.c: Fix indentation. * dwarf2/attribute.c: Fix indentation. * dwarf2/expr.c: Fix indentation. * dwarf2/frame.c: Fix indentation. * dwarf2/index-cache.c: Fix indentation. * dwarf2/index-write.c: Fix indentation. * dwarf2/line-header.c: Fix indentation. * dwarf2/loc.c: Fix indentation. * dwarf2/macro.c: Fix indentation. * dwarf2/read.c: Fix indentation. * dwarf2/read.h: Fix indentation. * elfread.c: Fix indentation. * eval.c: Fix indentation. * event-top.c: Fix indentation. * exec.c: Fix indentation. * exec.h: Fix indentation. * expprint.c: Fix indentation. * f-lang.c: Fix indentation. * f-typeprint.c: Fix indentation. * f-valprint.c: Fix indentation. * fbsd-nat.c: Fix indentation. * fbsd-tdep.c: Fix indentation. * findvar.c: Fix indentation. * fork-child.c: Fix indentation. * frame-unwind.c: Fix indentation. * frame-unwind.h: Fix indentation. * frame.c: Fix indentation. * frv-linux-tdep.c: Fix indentation. * frv-tdep.c: Fix indentation. * frv-tdep.h: Fix indentation. * ft32-tdep.c: Fix indentation. * gcore.c: Fix indentation. * gdb_bfd.c: Fix indentation. * gdbarch.sh: Fix indentation. * gdbarch.c: Re-generate * gdbarch.h: Re-generate. * gdbcore.h: Fix indentation. * gdbthread.h: Fix indentation. * gdbtypes.c: Fix indentation. * gdbtypes.h: Fix indentation. * glibc-tdep.c: Fix indentation. * gnu-nat.c: Fix indentation. * gnu-nat.h: Fix indentation. * gnu-v2-abi.c: Fix indentation. * gnu-v3-abi.c: Fix indentation. * go32-nat.c: Fix indentation. * guile/guile-internal.h: Fix indentation. * guile/scm-cmd.c: Fix indentation. * guile/scm-frame.c: Fix indentation. * guile/scm-iterator.c: Fix indentation. * guile/scm-math.c: Fix indentation. * guile/scm-ports.c: Fix indentation. * guile/scm-pretty-print.c: Fix indentation. * guile/scm-value.c: Fix indentation. * h8300-tdep.c: Fix indentation. * hppa-linux-nat.c: Fix indentation. * hppa-linux-tdep.c: Fix indentation. * hppa-nbsd-nat.c: Fix indentation. * hppa-nbsd-tdep.c: Fix indentation. * hppa-obsd-nat.c: Fix indentation. * hppa-tdep.c: Fix indentation. * hppa-tdep.h: Fix indentation. * i386-bsd-nat.c: Fix indentation. * i386-darwin-nat.c: Fix indentation. * i386-darwin-tdep.c: Fix indentation. * i386-dicos-tdep.c: Fix indentation. * i386-gnu-nat.c: Fix indentation. * i386-linux-nat.c: Fix indentation. * i386-linux-tdep.c: Fix indentation. * i386-nto-tdep.c: Fix indentation. * i386-obsd-tdep.c: Fix indentation. * i386-sol2-nat.c: Fix indentation. * i386-tdep.c: Fix indentation. * i386-tdep.h: Fix indentation. * i386-windows-tdep.c: Fix indentation. * i387-tdep.c: Fix indentation. * i387-tdep.h: Fix indentation. * ia64-libunwind-tdep.c: Fix indentation. * ia64-libunwind-tdep.h: Fix indentation. * ia64-linux-nat.c: Fix indentation. * ia64-linux-tdep.c: Fix indentation. * ia64-tdep.c: Fix indentation. * ia64-tdep.h: Fix indentation. * ia64-vms-tdep.c: Fix indentation. * infcall.c: Fix indentation. * infcmd.c: Fix indentation. * inferior.c: Fix indentation. * infrun.c: Fix indentation. * iq2000-tdep.c: Fix indentation. * language.c: Fix indentation. * linespec.c: Fix indentation. * linux-fork.c: Fix indentation. * linux-nat.c: Fix indentation. * linux-tdep.c: Fix indentation. * linux-thread-db.c: Fix indentation. * lm32-tdep.c: Fix indentation. * m2-lang.c: Fix indentation. * m2-typeprint.c: Fix indentation. * m2-valprint.c: Fix indentation. * m32c-tdep.c: Fix indentation. * m32r-linux-tdep.c: Fix indentation. * m32r-tdep.c: Fix indentation. * m68hc11-tdep.c: Fix indentation. * m68k-bsd-nat.c: Fix indentation. * m68k-linux-nat.c: Fix indentation. * m68k-linux-tdep.c: Fix indentation. * m68k-tdep.c: Fix indentation. * machoread.c: Fix indentation. * macrocmd.c: Fix indentation. * macroexp.c: Fix indentation. * macroscope.c: Fix indentation. * macrotab.c: Fix indentation. * macrotab.h: Fix indentation. * main.c: Fix indentation. * mdebugread.c: Fix indentation. * mep-tdep.c: Fix indentation. * mi/mi-cmd-catch.c: Fix indentation. * mi/mi-cmd-disas.c: Fix indentation. * mi/mi-cmd-env.c: Fix indentation. * mi/mi-cmd-stack.c: Fix indentation. * mi/mi-cmd-var.c: Fix indentation. * mi/mi-cmds.c: Fix indentation. * mi/mi-main.c: Fix indentation. * mi/mi-parse.c: Fix indentation. * microblaze-tdep.c: Fix indentation. * minidebug.c: Fix indentation. * minsyms.c: Fix indentation. * mips-linux-nat.c: Fix indentation. * mips-linux-tdep.c: Fix indentation. * mips-nbsd-tdep.c: Fix indentation. * mips-tdep.c: Fix indentation. * mn10300-linux-tdep.c: Fix indentation. * mn10300-tdep.c: Fix indentation. * moxie-tdep.c: Fix indentation. * msp430-tdep.c: Fix indentation. * namespace.h: Fix indentation. * nat/fork-inferior.c: Fix indentation. * nat/gdb_ptrace.h: Fix indentation. * nat/linux-namespaces.c: Fix indentation. * nat/linux-osdata.c: Fix indentation. * nat/netbsd-nat.c: Fix indentation. * nat/x86-dregs.c: Fix indentation. * nbsd-nat.c: Fix indentation. * nbsd-tdep.c: Fix indentation. * nios2-linux-tdep.c: Fix indentation. * nios2-tdep.c: Fix indentation. * nto-procfs.c: Fix indentation. * nto-tdep.c: Fix indentation. * objfiles.c: Fix indentation. * objfiles.h: Fix indentation. * opencl-lang.c: Fix indentation. * or1k-tdep.c: Fix indentation. * osabi.c: Fix indentation. * osabi.h: Fix indentation. * osdata.c: Fix indentation. * p-lang.c: Fix indentation. * p-typeprint.c: Fix indentation. * p-valprint.c: Fix indentation. * parse.c: Fix indentation. * ppc-linux-nat.c: Fix indentation. * ppc-linux-tdep.c: Fix indentation. * ppc-nbsd-nat.c: Fix indentation. * ppc-nbsd-tdep.c: Fix indentation. * ppc-obsd-nat.c: Fix indentation. * ppc-ravenscar-thread.c: Fix indentation. * ppc-sysv-tdep.c: Fix indentation. * ppc64-tdep.c: Fix indentation. * printcmd.c: Fix indentation. * proc-api.c: Fix indentation. * producer.c: Fix indentation. * producer.h: Fix indentation. * prologue-value.c: Fix indentation. * prologue-value.h: Fix indentation. * psymtab.c: Fix indentation. * python/py-arch.c: Fix indentation. * python/py-bpevent.c: Fix indentation. * python/py-event.c: Fix indentation. * python/py-event.h: Fix indentation. * python/py-finishbreakpoint.c: Fix indentation. * python/py-frame.c: Fix indentation. * python/py-framefilter.c: Fix indentation. * python/py-inferior.c: Fix indentation. * python/py-infthread.c: Fix indentation. * python/py-objfile.c: Fix indentation. * python/py-prettyprint.c: Fix indentation. * python/py-registers.c: Fix indentation. * python/py-signalevent.c: Fix indentation. * python/py-stopevent.c: Fix indentation. * python/py-stopevent.h: Fix indentation. * python/py-threadevent.c: Fix indentation. * python/py-tui.c: Fix indentation. * python/py-unwind.c: Fix indentation. * python/py-value.c: Fix indentation. * python/py-xmethods.c: Fix indentation. * python/python-internal.h: Fix indentation. * python/python.c: Fix indentation. * ravenscar-thread.c: Fix indentation. * record-btrace.c: Fix indentation. * record-full.c: Fix indentation. * record.c: Fix indentation. * reggroups.c: Fix indentation. * regset.h: Fix indentation. * remote-fileio.c: Fix indentation. * remote.c: Fix indentation. * reverse.c: Fix indentation. * riscv-linux-tdep.c: Fix indentation. * riscv-ravenscar-thread.c: Fix indentation. * riscv-tdep.c: Fix indentation. * rl78-tdep.c: Fix indentation. * rs6000-aix-tdep.c: Fix indentation. * rs6000-lynx178-tdep.c: Fix indentation. * rs6000-nat.c: Fix indentation. * rs6000-tdep.c: Fix indentation. * rust-lang.c: Fix indentation. * rx-tdep.c: Fix indentation. * s12z-tdep.c: Fix indentation. * s390-linux-tdep.c: Fix indentation. * score-tdep.c: Fix indentation. * ser-base.c: Fix indentation. * ser-mingw.c: Fix indentation. * ser-uds.c: Fix indentation. * ser-unix.c: Fix indentation. * serial.c: Fix indentation. * sh-linux-tdep.c: Fix indentation. * sh-nbsd-tdep.c: Fix indentation. * sh-tdep.c: Fix indentation. * skip.c: Fix indentation. * sol-thread.c: Fix indentation. * solib-aix.c: Fix indentation. * solib-darwin.c: Fix indentation. * solib-frv.c: Fix indentation. * solib-svr4.c: Fix indentation. * solib.c: Fix indentation. * source.c: Fix indentation. * sparc-linux-tdep.c: Fix indentation. * sparc-nbsd-tdep.c: Fix indentation. * sparc-obsd-tdep.c: Fix indentation. * sparc-ravenscar-thread.c: Fix indentation. * sparc-tdep.c: Fix indentation. * sparc64-linux-tdep.c: Fix indentation. * sparc64-nbsd-tdep.c: Fix indentation. * sparc64-obsd-tdep.c: Fix indentation. * sparc64-tdep.c: Fix indentation. * stabsread.c: Fix indentation. * stack.c: Fix indentation. * stap-probe.c: Fix indentation. * stubs/ia64vms-stub.c: Fix indentation. * stubs/m32r-stub.c: Fix indentation. * stubs/m68k-stub.c: Fix indentation. * stubs/sh-stub.c: Fix indentation. * stubs/sparc-stub.c: Fix indentation. * symfile-mem.c: Fix indentation. * symfile.c: Fix indentation. * symfile.h: Fix indentation. * symmisc.c: Fix indentation. * symtab.c: Fix indentation. * symtab.h: Fix indentation. * target-float.c: Fix indentation. * target.c: Fix indentation. * target.h: Fix indentation. * tic6x-tdep.c: Fix indentation. * tilegx-linux-tdep.c: Fix indentation. * tilegx-tdep.c: Fix indentation. * top.c: Fix indentation. * tracefile-tfile.c: Fix indentation. * tracepoint.c: Fix indentation. * tui/tui-disasm.c: Fix indentation. * tui/tui-io.c: Fix indentation. * tui/tui-regs.c: Fix indentation. * tui/tui-stack.c: Fix indentation. * tui/tui-win.c: Fix indentation. * tui/tui-winsource.c: Fix indentation. * tui/tui.c: Fix indentation. * typeprint.c: Fix indentation. * ui-out.h: Fix indentation. * unittests/copy_bitwise-selftests.c: Fix indentation. * unittests/memory-map-selftests.c: Fix indentation. * utils.c: Fix indentation. * v850-tdep.c: Fix indentation. * valarith.c: Fix indentation. * valops.c: Fix indentation. * valprint.c: Fix indentation. * valprint.h: Fix indentation. * value.c: Fix indentation. * value.h: Fix indentation. * varobj.c: Fix indentation. * vax-tdep.c: Fix indentation. * windows-nat.c: Fix indentation. * windows-tdep.c: Fix indentation. * xcoffread.c: Fix indentation. * xml-syscall.c: Fix indentation. * xml-tdesc.c: Fix indentation. * xstormy16-tdep.c: Fix indentation. * xtensa-config.c: Fix indentation. * xtensa-linux-nat.c: Fix indentation. * xtensa-linux-tdep.c: Fix indentation. * xtensa-tdep.c: Fix indentation. gdbserver/ChangeLog: * ax.cc: Fix indentation. * dll.cc: Fix indentation. * inferiors.h: Fix indentation. * linux-low.cc: Fix indentation. * linux-nios2-low.cc: Fix indentation. * linux-ppc-ipa.cc: Fix indentation. * linux-ppc-low.cc: Fix indentation. * linux-x86-low.cc: Fix indentation. * linux-xtensa-low.cc: Fix indentation. * regcache.cc: Fix indentation. * server.cc: Fix indentation. * tracepoint.cc: Fix indentation. gdbsupport/ChangeLog: * common-exceptions.h: Fix indentation. * event-loop.cc: Fix indentation. * fileio.cc: Fix indentation. * filestuff.cc: Fix indentation. * gdb-dlfcn.cc: Fix indentation. * gdb_string_view.h: Fix indentation. * job-control.cc: Fix indentation. * signals.cc: Fix indentation. Change-Id: I4bad7ae6be0fbe14168b8ebafb98ffe14964a695
740 lines
21 KiB
C
740 lines
21 KiB
C
/* Skipping uninteresting files and functions while stepping.
|
|
|
|
Copyright (C) 2011-2020 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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "skip.h"
|
|
#include "value.h"
|
|
#include "valprint.h"
|
|
#include "ui-out.h"
|
|
#include "symtab.h"
|
|
#include "gdbcmd.h"
|
|
#include "command.h"
|
|
#include "completer.h"
|
|
#include "stack.h"
|
|
#include "cli/cli-utils.h"
|
|
#include "arch-utils.h"
|
|
#include "linespec.h"
|
|
#include "objfiles.h"
|
|
#include "breakpoint.h" /* for get_sal_arch () */
|
|
#include "source.h"
|
|
#include "filenames.h"
|
|
#include "fnmatch.h"
|
|
#include "gdb_regex.h"
|
|
#include "gdbsupport/gdb_optional.h"
|
|
#include <list>
|
|
#include "cli/cli-style.h"
|
|
|
|
/* True if we want to print debug printouts related to file/function
|
|
skipping. */
|
|
static bool debug_skip = false;
|
|
|
|
class skiplist_entry
|
|
{
|
|
public:
|
|
/* Create a skiplist_entry object and add it to the chain. */
|
|
static void add_entry (bool file_is_glob,
|
|
std::string &&file,
|
|
bool function_is_regexp,
|
|
std::string &&function);
|
|
|
|
/* Return true if the skip entry has a file or glob-style file
|
|
pattern that matches FUNCTION_SAL. */
|
|
bool skip_file_p (const symtab_and_line &function_sal) const;
|
|
|
|
/* Return true if the skip entry has a function or function regexp
|
|
that matches FUNCTION_NAME. */
|
|
bool skip_function_p (const char *function_name) const;
|
|
|
|
/* Getters. */
|
|
int number () const { return m_number; };
|
|
bool enabled () const { return m_enabled; };
|
|
bool file_is_glob () const { return m_file_is_glob; }
|
|
const std::string &file () const { return m_file; }
|
|
const std::string &function () const { return m_function; }
|
|
bool function_is_regexp () const { return m_function_is_regexp; }
|
|
|
|
/* Setters. */
|
|
void enable () { m_enabled = true; };
|
|
void disable () { m_enabled = false; };
|
|
|
|
/* Disable copy. */
|
|
skiplist_entry (const skiplist_entry &) = delete;
|
|
void operator= (const skiplist_entry &) = delete;
|
|
|
|
private:
|
|
/* Key that grants access to the constructor. */
|
|
struct private_key {};
|
|
public:
|
|
/* Public so we can construct with container::emplace_back. Since
|
|
it requires a private class key, it can't be called from outside.
|
|
Use the add_entry static factory method to construct instead. */
|
|
skiplist_entry (bool file_is_glob, std::string &&file,
|
|
bool function_is_regexp, std::string &&function,
|
|
private_key);
|
|
|
|
private:
|
|
/* Return true if we're stopped at a file to be skipped. */
|
|
bool do_skip_file_p (const symtab_and_line &function_sal) const;
|
|
|
|
/* Return true if we're stopped at a globbed file to be skipped. */
|
|
bool do_skip_gfile_p (const symtab_and_line &function_sal) const;
|
|
|
|
private: /* data */
|
|
int m_number = -1;
|
|
|
|
/* True if FILE is a glob-style pattern.
|
|
Otherwise it is the plain file name (possibly with directories). */
|
|
bool m_file_is_glob;
|
|
|
|
/* The name of the file or empty if no name. */
|
|
std::string m_file;
|
|
|
|
/* True if FUNCTION is a regexp.
|
|
Otherwise it is a plain function name (possibly with arguments,
|
|
for C++). */
|
|
bool m_function_is_regexp;
|
|
|
|
/* The name of the function or empty if no name. */
|
|
std::string m_function;
|
|
|
|
/* If this is a function regexp, the compiled form. */
|
|
gdb::optional<compiled_regex> m_compiled_function_regexp;
|
|
|
|
/* Enabled/disabled state. */
|
|
bool m_enabled = true;
|
|
};
|
|
|
|
static std::list<skiplist_entry> skiplist_entries;
|
|
static int highest_skiplist_entry_num = 0;
|
|
|
|
skiplist_entry::skiplist_entry (bool file_is_glob,
|
|
std::string &&file,
|
|
bool function_is_regexp,
|
|
std::string &&function,
|
|
private_key)
|
|
: m_file_is_glob (file_is_glob),
|
|
m_file (std::move (file)),
|
|
m_function_is_regexp (function_is_regexp),
|
|
m_function (std::move (function))
|
|
{
|
|
gdb_assert (!m_file.empty () || !m_function.empty ());
|
|
|
|
if (m_file_is_glob)
|
|
gdb_assert (!m_file.empty ());
|
|
|
|
if (m_function_is_regexp)
|
|
{
|
|
gdb_assert (!m_function.empty ());
|
|
m_compiled_function_regexp.emplace (m_function.c_str (),
|
|
REG_NOSUB | REG_EXTENDED,
|
|
_("regexp"));
|
|
}
|
|
}
|
|
|
|
void
|
|
skiplist_entry::add_entry (bool file_is_glob, std::string &&file,
|
|
bool function_is_regexp, std::string &&function)
|
|
{
|
|
skiplist_entries.emplace_back (file_is_glob,
|
|
std::move (file),
|
|
function_is_regexp,
|
|
std::move (function),
|
|
private_key {});
|
|
|
|
/* Incremented after push_back, in case push_back throws. */
|
|
skiplist_entries.back ().m_number = ++highest_skiplist_entry_num;
|
|
}
|
|
|
|
static void
|
|
skip_file_command (const char *arg, int from_tty)
|
|
{
|
|
struct symtab *symtab;
|
|
const char *filename = NULL;
|
|
|
|
/* If no argument was given, try to default to the last
|
|
displayed codepoint. */
|
|
if (arg == NULL)
|
|
{
|
|
symtab = get_last_displayed_symtab ();
|
|
if (symtab == NULL)
|
|
error (_("No default file now."));
|
|
|
|
/* It is not a typo, symtab_to_filename_for_display would be needlessly
|
|
ambiguous. */
|
|
filename = symtab_to_fullname (symtab);
|
|
}
|
|
else
|
|
filename = arg;
|
|
|
|
skiplist_entry::add_entry (false, std::string (filename),
|
|
false, std::string ());
|
|
|
|
printf_filtered (_("File %s will be skipped when stepping.\n"), filename);
|
|
}
|
|
|
|
/* Create a skiplist entry for the given function NAME and add it to the
|
|
list. */
|
|
|
|
static void
|
|
skip_function (const char *name)
|
|
{
|
|
skiplist_entry::add_entry (false, std::string (), false, std::string (name));
|
|
|
|
printf_filtered (_("Function %s will be skipped when stepping.\n"), name);
|
|
}
|
|
|
|
static void
|
|
skip_function_command (const char *arg, int from_tty)
|
|
{
|
|
/* Default to the current function if no argument is given. */
|
|
if (arg == NULL)
|
|
{
|
|
frame_info *fi = get_selected_frame (_("No default function now."));
|
|
struct symbol *sym = get_frame_function (fi);
|
|
const char *name = NULL;
|
|
|
|
if (sym != NULL)
|
|
name = sym->print_name ();
|
|
else
|
|
error (_("No function found containing current program point %s."),
|
|
paddress (get_current_arch (), get_frame_pc (fi)));
|
|
skip_function (name);
|
|
return;
|
|
}
|
|
|
|
skip_function (arg);
|
|
}
|
|
|
|
/* Process "skip ..." that does not match "skip file" or "skip function". */
|
|
|
|
static void
|
|
skip_command (const char *arg, int from_tty)
|
|
{
|
|
const char *file = NULL;
|
|
const char *gfile = NULL;
|
|
const char *function = NULL;
|
|
const char *rfunction = NULL;
|
|
int i;
|
|
|
|
if (arg == NULL)
|
|
{
|
|
skip_function_command (arg, from_tty);
|
|
return;
|
|
}
|
|
|
|
gdb_argv argv (arg);
|
|
|
|
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". */
|
|
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."));
|
|
|
|
/* This shouldn't happen as "skip" by itself gets punted to
|
|
skip_function_command. */
|
|
gdb_assert (file != NULL || gfile != NULL
|
|
|| function != NULL || rfunction != NULL);
|
|
|
|
std::string entry_file;
|
|
if (file != NULL)
|
|
entry_file = file;
|
|
else if (gfile != NULL)
|
|
entry_file = gfile;
|
|
|
|
std::string entry_function;
|
|
if (function != NULL)
|
|
entry_function = function;
|
|
else if (rfunction != NULL)
|
|
entry_function = rfunction;
|
|
|
|
skiplist_entry::add_entry (gfile != NULL, std::move (entry_file),
|
|
rfunction != NULL, std::move (entry_function));
|
|
|
|
/* 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)
|
|
{
|
|
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);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
info_skip_command (const char *arg, int from_tty)
|
|
{
|
|
int num_printable_entries = 0;
|
|
struct value_print_options opts;
|
|
|
|
get_user_print_options (&opts);
|
|
|
|
/* Count the number of rows in the table and see if we need space for a
|
|
64-bit address anywhere. */
|
|
for (const skiplist_entry &e : skiplist_entries)
|
|
if (arg == NULL || number_is_in_list (arg, e.number ()))
|
|
num_printable_entries++;
|
|
|
|
if (num_printable_entries == 0)
|
|
{
|
|
if (arg == NULL)
|
|
current_uiout->message (_("Not skipping any files or functions.\n"));
|
|
else
|
|
current_uiout->message (
|
|
_("No skiplist entries found with number %s.\n"), arg);
|
|
|
|
return;
|
|
}
|
|
|
|
ui_out_emit_table table_emitter (current_uiout, 6, num_printable_entries,
|
|
"SkiplistTable");
|
|
|
|
current_uiout->table_header (5, ui_left, "number", "Num"); /* 1 */
|
|
current_uiout->table_header (3, ui_left, "enabled", "Enb"); /* 2 */
|
|
current_uiout->table_header (4, ui_right, "regexp", "Glob"); /* 3 */
|
|
current_uiout->table_header (20, ui_left, "file", "File"); /* 4 */
|
|
current_uiout->table_header (2, ui_right, "regexp", "RE"); /* 5 */
|
|
current_uiout->table_header (40, ui_noalign, "function", "Function"); /* 6 */
|
|
current_uiout->table_body ();
|
|
|
|
for (const skiplist_entry &e : skiplist_entries)
|
|
{
|
|
QUIT;
|
|
if (arg != NULL && !number_is_in_list (arg, e.number ()))
|
|
continue;
|
|
|
|
ui_out_emit_tuple tuple_emitter (current_uiout, "blklst-entry");
|
|
current_uiout->field_signed ("number", e.number ()); /* 1 */
|
|
|
|
if (e.enabled ())
|
|
current_uiout->field_string ("enabled", "y"); /* 2 */
|
|
else
|
|
current_uiout->field_string ("enabled", "n"); /* 2 */
|
|
|
|
if (e.file_is_glob ())
|
|
current_uiout->field_string ("regexp", "y"); /* 3 */
|
|
else
|
|
current_uiout->field_string ("regexp", "n"); /* 3 */
|
|
|
|
current_uiout->field_string ("file",
|
|
e.file ().empty () ? "<none>"
|
|
: e.file ().c_str (),
|
|
e.file ().empty ()
|
|
? metadata_style.style ()
|
|
: file_name_style.style ()); /* 4 */
|
|
if (e.function_is_regexp ())
|
|
current_uiout->field_string ("regexp", "y"); /* 5 */
|
|
else
|
|
current_uiout->field_string ("regexp", "n"); /* 5 */
|
|
|
|
current_uiout->field_string ("function",
|
|
e.function ().empty () ? "<none>"
|
|
: e.function ().c_str (),
|
|
e.function ().empty ()
|
|
? metadata_style.style ()
|
|
: function_name_style.style ()); /* 6 */
|
|
|
|
current_uiout->text ("\n");
|
|
}
|
|
}
|
|
|
|
static void
|
|
skip_enable_command (const char *arg, int from_tty)
|
|
{
|
|
bool found = false;
|
|
|
|
for (skiplist_entry &e : skiplist_entries)
|
|
if (arg == NULL || number_is_in_list (arg, e.number ()))
|
|
{
|
|
e.enable ();
|
|
found = true;
|
|
}
|
|
|
|
if (!found)
|
|
error (_("No skiplist entries found with number %s."), arg);
|
|
}
|
|
|
|
static void
|
|
skip_disable_command (const char *arg, int from_tty)
|
|
{
|
|
bool found = false;
|
|
|
|
for (skiplist_entry &e : skiplist_entries)
|
|
if (arg == NULL || number_is_in_list (arg, e.number ()))
|
|
{
|
|
e.disable ();
|
|
found = true;
|
|
}
|
|
|
|
if (!found)
|
|
error (_("No skiplist entries found with number %s."), arg);
|
|
}
|
|
|
|
static void
|
|
skip_delete_command (const char *arg, int from_tty)
|
|
{
|
|
bool found = false;
|
|
|
|
for (auto it = skiplist_entries.begin (),
|
|
end = skiplist_entries.end ();
|
|
it != end;)
|
|
{
|
|
const skiplist_entry &e = *it;
|
|
|
|
if (arg == NULL || number_is_in_list (arg, e.number ()))
|
|
{
|
|
it = skiplist_entries.erase (it);
|
|
found = true;
|
|
}
|
|
else
|
|
++it;
|
|
}
|
|
|
|
if (!found)
|
|
error (_("No skiplist entries found with number %s."), arg);
|
|
}
|
|
|
|
bool
|
|
skiplist_entry::do_skip_file_p (const symtab_and_line &function_sal) const
|
|
{
|
|
if (debug_skip)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"skip: checking if file %s matches non-glob %s...",
|
|
function_sal.symtab->filename, m_file.c_str ());
|
|
|
|
bool result;
|
|
|
|
/* 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,
|
|
m_file.c_str ()))
|
|
result = true;
|
|
|
|
/* Before we invoke realpath, which can get expensive when many
|
|
files are involved, do a quick comparison of the basenames. */
|
|
else if (!basenames_may_differ
|
|
&& filename_cmp (lbasename (function_sal.symtab->filename),
|
|
lbasename (m_file.c_str ())) != 0)
|
|
result = false;
|
|
else
|
|
{
|
|
/* Note: symtab_to_fullname caches its result, thus we don't have to. */
|
|
const char *fullname = symtab_to_fullname (function_sal.symtab);
|
|
|
|
result = compare_filenames_for_search (fullname, m_file.c_str ());
|
|
}
|
|
|
|
if (debug_skip)
|
|
fprintf_unfiltered (gdb_stdlog, result ? "yes.\n" : "no.\n");
|
|
|
|
return result;
|
|
}
|
|
|
|
bool
|
|
skiplist_entry::do_skip_gfile_p (const symtab_and_line &function_sal) const
|
|
{
|
|
if (debug_skip)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"skip: checking if file %s matches glob %s...",
|
|
function_sal.symtab->filename, m_file.c_str ());
|
|
|
|
bool result;
|
|
|
|
/* Check first sole SYMTAB->FILENAME. It may not be a substring of
|
|
symtab_to_fullname as it may contain "./" etc. */
|
|
if (gdb_filename_fnmatch (m_file.c_str (), function_sal.symtab->filename,
|
|
FNM_FILE_NAME | FNM_NOESCAPE) == 0)
|
|
result = true;
|
|
|
|
/* 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. */
|
|
else if (!basenames_may_differ
|
|
&& gdb_filename_fnmatch (lbasename (m_file.c_str ()),
|
|
lbasename (function_sal.symtab->filename),
|
|
FNM_FILE_NAME | FNM_NOESCAPE) != 0)
|
|
result = false;
|
|
else
|
|
{
|
|
/* Note: symtab_to_fullname caches its result, thus we don't have to. */
|
|
const char *fullname = symtab_to_fullname (function_sal.symtab);
|
|
|
|
result = compare_glob_filenames_for_search (fullname, m_file.c_str ());
|
|
}
|
|
|
|
if (debug_skip)
|
|
fprintf_unfiltered (gdb_stdlog, result ? "yes.\n" : "no.\n");
|
|
|
|
return result;
|
|
}
|
|
|
|
bool
|
|
skiplist_entry::skip_file_p (const symtab_and_line &function_sal) const
|
|
{
|
|
if (m_file.empty ())
|
|
return false;
|
|
|
|
if (function_sal.symtab == NULL)
|
|
return false;
|
|
|
|
if (m_file_is_glob)
|
|
return do_skip_gfile_p (function_sal);
|
|
else
|
|
return do_skip_file_p (function_sal);
|
|
}
|
|
|
|
bool
|
|
skiplist_entry::skip_function_p (const char *function_name) const
|
|
{
|
|
if (m_function.empty ())
|
|
return false;
|
|
|
|
bool result;
|
|
|
|
if (m_function_is_regexp)
|
|
{
|
|
if (debug_skip)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
"skip: checking if function %s matches regex %s...",
|
|
function_name, m_function.c_str ());
|
|
|
|
gdb_assert (m_compiled_function_regexp);
|
|
result
|
|
= (m_compiled_function_regexp->exec (function_name, 0, NULL, 0) == 0);
|
|
}
|
|
else
|
|
{
|
|
if (debug_skip)
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
("skip: checking if function %s matches non-regex "
|
|
"%s..."),
|
|
function_name, m_function.c_str ());
|
|
result = (strcmp_iw (function_name, m_function.c_str ()) == 0);
|
|
}
|
|
|
|
if (debug_skip)
|
|
fprintf_unfiltered (gdb_stdlog, result ? "yes.\n" : "no.\n");
|
|
|
|
return result;
|
|
}
|
|
|
|
/* See skip.h. */
|
|
|
|
bool
|
|
function_name_is_marked_for_skip (const char *function_name,
|
|
const symtab_and_line &function_sal)
|
|
{
|
|
if (function_name == NULL)
|
|
return false;
|
|
|
|
for (const skiplist_entry &e : skiplist_entries)
|
|
{
|
|
if (!e.enabled ())
|
|
continue;
|
|
|
|
bool skip_by_file = e.skip_file_p (function_sal);
|
|
bool skip_by_function = e.skip_function_p (function_name);
|
|
|
|
/* If both file and function must match, make sure we don't errantly
|
|
exit if only one of them match. */
|
|
if (!e.file ().empty () && !e.function ().empty ())
|
|
{
|
|
if (skip_by_file && skip_by_function)
|
|
return true;
|
|
}
|
|
/* Only one of file/function is specified. */
|
|
else if (skip_by_file || skip_by_function)
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/* Completer for skip numbers. */
|
|
|
|
static void
|
|
complete_skip_number (cmd_list_element *cmd,
|
|
completion_tracker &completer,
|
|
const char *text, const char *word)
|
|
{
|
|
size_t word_len = strlen (word);
|
|
|
|
for (const skiplist_entry &entry : skiplist_entries)
|
|
{
|
|
gdb::unique_xmalloc_ptr<char> name (xstrprintf ("%d", entry.number ()));
|
|
if (strncmp (word, name.get (), word_len) == 0)
|
|
completer.add_completion (std::move (name));
|
|
}
|
|
}
|
|
|
|
void _initialize_step_skip ();
|
|
void
|
|
_initialize_step_skip ()
|
|
{
|
|
static struct cmd_list_element *skiplist = NULL;
|
|
struct cmd_list_element *c;
|
|
|
|
add_prefix_cmd ("skip", class_breakpoint, skip_command, _("\
|
|
Ignore a function while stepping.\n\
|
|
\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 [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\
|
|
If no function name is given, skip the current function."),
|
|
&skiplist);
|
|
set_cmd_completer (c, location_completer);
|
|
|
|
c = add_cmd ("enable", class_breakpoint, skip_enable_command, _("\
|
|
Enable skip entries.\n\
|
|
Usage: skip enable [NUMBER | RANGE]...\n\
|
|
You can specify numbers (e.g. \"skip enable 1 3\"),\n\
|
|
ranges (e.g. \"skip enable 4-8\"), or both (e.g. \"skip enable 1 3 4-8\").\n\n\
|
|
If you don't specify any numbers or ranges, we'll enable all skip entries."),
|
|
&skiplist);
|
|
set_cmd_completer (c, complete_skip_number);
|
|
|
|
c = add_cmd ("disable", class_breakpoint, skip_disable_command, _("\
|
|
Disable skip entries.\n\
|
|
Usage: skip disable [NUMBER | RANGE]...\n\
|
|
You can specify numbers (e.g. \"skip disable 1 3\"),\n\
|
|
ranges (e.g. \"skip disable 4-8\"), or both (e.g. \"skip disable 1 3 4-8\").\n\n\
|
|
If you don't specify any numbers or ranges, we'll disable all skip entries."),
|
|
&skiplist);
|
|
set_cmd_completer (c, complete_skip_number);
|
|
|
|
c = add_cmd ("delete", class_breakpoint, skip_delete_command, _("\
|
|
Delete skip entries.\n\
|
|
Usage: skip delete [NUMBER | RANGES]...\n\
|
|
You can specify numbers (e.g. \"skip delete 1 3\"),\n\
|
|
ranges (e.g. \"skip delete 4-8\"), or both (e.g. \"skip delete 1 3 4-8\").\n\n\
|
|
If you don't specify any numbers or ranges, we'll delete all skip entries."),
|
|
&skiplist);
|
|
set_cmd_completer (c, complete_skip_number);
|
|
|
|
add_info ("skip", info_skip_command, _("\
|
|
Display the status of skips.\n\
|
|
Usage: info skip [NUMBER | RANGES]...\n\
|
|
You can specify numbers (e.g. \"info skip 1 3\"), \n\
|
|
ranges (e.g. \"info skip 4-8\"), or both (e.g. \"info skip 1 3 4-8\").\n\n\
|
|
If you don't specify any numbers or ranges, we'll show all skips."));
|
|
set_cmd_completer (c, complete_skip_number);
|
|
|
|
add_setshow_boolean_cmd ("skip", class_maintenance,
|
|
&debug_skip, _("\
|
|
Set whether to print the debug output about skipping files and functions."),
|
|
_("\
|
|
Show whether the debug output about skipping files and functions is printed."),
|
|
_("\
|
|
When non-zero, debug output about skipping files and functions is displayed."),
|
|
NULL, NULL,
|
|
&setdebuglist, &showdebuglist);
|
|
}
|