diff options
| -rw-r--r-- | gdb/complaints.c | 1 | ||||
| -rw-r--r-- | gdb/gdbcmd.h | 31 | ||||
| -rw-r--r-- | gdb/printcmd.c | 1 | ||||
| -rw-r--r-- | gdb/record-btrace.c | 1 | ||||
| -rw-r--r-- | gdb/record-full.c | 1 | ||||
| -rw-r--r-- | gdb/record.c | 1 | ||||
| -rw-r--r-- | gdb/stack.c | 1 | ||||
| -rw-r--r-- | gdb/thread.c | 1 | ||||
| -rw-r--r-- | gdb/top.c | 13 | ||||
| -rw-r--r-- | gdb/top.h | 24 |
10 files changed, 38 insertions, 37 deletions
diff --git a/gdb/complaints.c b/gdb/complaints.c index d3c72df..7dd5205 100644 --- a/gdb/complaints.c +++ b/gdb/complaints.c @@ -21,6 +21,7 @@ #include "command.h" #include "gdbcmd.h" #include "run-on-main-thread.h" +#include "top.h" #include "gdbsupport/selftest.h" #include <unordered_map> #include <mutex> diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h index 8a1f6f2..c212a0c 100644 --- a/gdb/gdbcmd.h +++ b/gdb/gdbcmd.h @@ -29,37 +29,6 @@ #include "cli/cli-script.h" #include "cli/cli-cmds.h" -extern void execute_command (const char *, int); - -/* Run FN. Sends its output to FILE, do not display it to the screen. - The global BATCH_FLAG will be temporarily set to true. */ - -extern void execute_fn_to_ui_file (struct ui_file *file, std::function<void(void)> fn); - -/* Run FN. Capture its output into the returned string, do not display it - to the screen. The global BATCH_FLAG will temporarily be set to true. - When TERM_OUT is true the output is collected with terminal behaviour - (e.g. with styling). When TERM_OUT is false raw output will be collected - (e.g. no styling). */ - -extern void execute_fn_to_string (std::string &res, - std::function<void(void)> fn, bool term_out); - -/* As execute_fn_to_ui_file, but run execute_command for P and FROM_TTY. */ - -extern void execute_command_to_ui_file (struct ui_file *file, - const char *p, int from_tty); - -/* As execute_fn_to_string, but run execute_command for P and FROM_TTY. */ - -extern void execute_command_to_string (std::string &res, const char *p, - int from_tty, bool term_out); - -/* As execute_command_to_string, but ignore resulting string. */ - -extern void execute_command_to_string (const char *p, - int from_tty, bool term_out); - extern void print_command_line (struct command_line *, unsigned int, struct ui_file *); extern void print_command_lines (struct ui_out *, diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 66669f1..25e391b 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -22,6 +22,7 @@ #include "frame.h" #include "symtab.h" #include "gdbtypes.h" +#include "top.h" #include "value.h" #include "language.h" #include "c-lang.h" diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 0ef1dfb..aac59ee 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -28,6 +28,7 @@ #include "observable.h" #include "cli/cli-utils.h" #include "source.h" +#include "top.h" #include "ui-out.h" #include "symtab.h" #include "filenames.h" diff --git a/gdb/record-full.c b/gdb/record-full.c index 9d8c4ee..d288eb9 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -39,6 +39,7 @@ #include "gdbsupport/gdb_unlinker.h" #include "gdbsupport/byte-vector.h" #include "async-event.h" +#include "top.h" #include "valprint.h" #include "interps.h" diff --git a/gdb/record.c b/gdb/record.c index 5b1093d..2059fb7 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -26,6 +26,7 @@ #include "cli/cli-utils.h" #include "disasm.h" #include "interps.h" +#include "top.h" #include <ctype.h> diff --git a/gdb/stack.c b/gdb/stack.c index d183254..fae1fce 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -19,6 +19,7 @@ #include "event-top.h" #include "extract-store-integer.h" +#include "top.h" #include "value.h" #include "symtab.h" #include "gdbtypes.h" diff --git a/gdb/thread.c b/gdb/thread.c index 60a1bef..43c28be 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -24,6 +24,7 @@ #include "frame.h" #include "inferior.h" #include "gdbsupport/environ.h" +#include "top.h" #include "value.h" #include "target.h" #include "gdbthread.h" @@ -598,9 +598,10 @@ execute_command (const char *p, int from_tty) cleanup_if_error.release (); } -/* See gdbcmd.h. */ +/* Run FN. Send its output to FILE, do not display it to the screen. + The global BATCH_FLAG will be temporarily set to true. */ -void +static void execute_fn_to_ui_file (struct ui_file *file, std::function<void(void)> fn) { /* GDB_STDOUT should be better already restored during these @@ -627,7 +628,7 @@ execute_fn_to_ui_file (struct ui_file *file, std::function<void(void)> fn) } } -/* See gdbcmd.h. */ +/* See top.h. */ void execute_fn_to_string (std::string &res, std::function<void(void)> fn, @@ -650,7 +651,7 @@ execute_fn_to_string (std::string &res, std::function<void(void)> fn, res = str_file.release (); } -/* See gdbcmd.h. */ +/* See top.h. */ void execute_command_to_ui_file (struct ui_file *file, @@ -659,7 +660,7 @@ execute_command_to_ui_file (struct ui_file *file, execute_fn_to_ui_file (file, [=]() { execute_command (p, from_tty); }); } -/* See gdbcmd.h. */ +/* See top.h. */ void execute_command_to_string (std::string &res, const char *p, int from_tty, @@ -669,7 +670,7 @@ execute_command_to_string (std::string &res, const char *p, int from_tty, term_out); } -/* See gdbcmd.h. */ +/* See top.h. */ void execute_command_to_string (const char *p, int from_tty, @@ -47,6 +47,30 @@ extern void quit_command (const char *, int); extern void quit_cover (void); extern void execute_command (const char *, int); +/* Run FN. Capture its output into the returned string, do not display it + to the screen. The global BATCH_FLAG will temporarily be set to true. + When TERM_OUT is true the output is collected with terminal behaviour + (e.g. with styling). When TERM_OUT is false raw output will be collected + (e.g. no styling). */ + +extern void execute_fn_to_string (std::string &res, + std::function<void(void)> fn, bool term_out); + +/* As execute_fn_to_ui_file, but run execute_command for P and FROM_TTY. */ + +extern void execute_command_to_ui_file (struct ui_file *file, + const char *p, int from_tty); + +/* As execute_fn_to_string, but run execute_command for P and FROM_TTY. */ + +extern void execute_command_to_string (std::string &res, const char *p, + int from_tty, bool term_out); + +/* Same as the above, but ignore resulting string. */ + +extern void execute_command_to_string (const char *p, + int from_tty, bool term_out); + /* If the interpreter is in sync mode (we're running a user command's list, running command hooks or similars), and we just ran a synchronous command that started the target, wait for that command |