@@ -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>
@@ -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 *,
@@ -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"
@@ -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"
@@ -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"
@@ -26,6 +26,7 @@
#include "cli/cli-utils.h"
#include "disasm.h"
#include "interps.h"
+#include "top.h"
#include <ctype.h>
@@ -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"
@@ -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