8 files changed, 12 insertions, 28 deletions

diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 98bc203..0031054 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -152,15 +152,9 @@ cli_interp_base::on_no_history ()
   print_no_history_reason (this->interp_ui_out ());
 }
 
-/* Observer for the sync_execution_done notification.  */
-
-static void
-cli_base_on_sync_execution_done ()
+void
+cli_interp_base::on_sync_execution_done ()
 {
-  cli_interp_base *cli = as_cli_interp_base (top_level_interpreter ());
-  if (cli == nullptr)
-    return;
-
   display_gdb_prompt (NULL);
 }
 
@@ -361,8 +355,6 @@ _initialize_cli_interp ()
   interp_factory_register (INTERP_CONSOLE, cli_interp_factory);
 
   /* Note these all work for both the CLI and TUI interpreters.  */
-  gdb::observers::sync_execution_done.attach (cli_base_on_sync_execution_done,
-					      "cli-interp-base");
   gdb::observers::command_error.attach (cli_base_on_command_error,
 					"cli-interp-base");
   gdb::observers::user_selected_context_changed.attach
diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h
index 7fc22a0..4680c80 100644
--- a/gdb/cli/cli-interp.h
+++ b/gdb/cli/cli-interp.h
@@ -38,6 +38,7 @@ public:
   void on_normal_stop (bpstat *bs, int print_frame) override;
   void on_exited (int status) override;
   void on_no_history () override;
+  void on_sync_execution_done () override;
 
 private:
   struct saved_output_files
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 3328631..2d234ed 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -4207,7 +4207,7 @@ check_curr_ui_sync_execution_done (void)
       && !gdb_in_secondary_prompt_p (ui))
     {
       target_terminal::ours ();
-      gdb::observers::sync_execution_done.notify ();
+      top_level_interpreter ()->on_sync_execution_done ();
       ui->register_file_handler ();
     }
 }
diff --git a/gdb/interps.h b/gdb/interps.h
index 915a5f7..349ffb1 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -102,6 +102,10 @@ public:
      execution because there is no more history.  */
   virtual void on_no_history () {}
 
+  /* Notify the interpreter that a synchronous command it started has
+     finished.  */
+  virtual void on_sync_execution_done () {}
+
 private:
   /* The memory for this is static, it comes from literal strings (e.g. "cli").  */
   const char *m_name;
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 795d70e..1cc0a6a 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -82,7 +82,6 @@ static void mi_breakpoint_modified (struct breakpoint *b);
 static void mi_command_param_changed (const char *param, const char *value);
 static void mi_memory_changed (struct inferior *inf, CORE_ADDR memaddr,
 			       ssize_t len, const bfd_byte *myaddr);
-static void mi_on_sync_execution_done (void);
 
 /* Display the MI prompt.  */
 
@@ -269,20 +268,13 @@ mi_execute_command_wrapper (const char *cmd)
   mi_execute_command (cmd, ui->instream == ui->stdin_stream);
 }
 
-/* Observer for the synchronous_command_done notification.  */
-
-static void
-mi_on_sync_execution_done (void)
+void
+mi_interp::on_sync_execution_done ()
 {
-  struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
-  if (mi == NULL)
-    return;
-
   /* If MI is sync, then output the MI prompt now, indicating we're
      ready for further input.  */
   if (!mi_async_p ())
-    display_mi_prompt (mi);
+    display_mi_prompt (this);
 }
 
 /* mi_execute_command_wrapper wrapper suitable for INPUT_HANDLER.  */
@@ -1247,8 +1239,6 @@ _initialize_mi_interp ()
 						"mi-interp");
   gdb::observers::command_error.attach (mi_on_command_error, "mi-interp");
   gdb::observers::memory_changed.attach (mi_memory_changed, "mi-interp");
-  gdb::observers::sync_execution_done.attach (mi_on_sync_execution_done,
-					      "mi-interp");
   gdb::observers::user_selected_context_changed.attach
     (mi_user_selected_context_changed, "mi-interp");
 }
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index 45b6f15..5e82606 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -47,6 +47,7 @@ public:
   void on_normal_stop (struct bpstat *bs, int print_frame) override;
   void on_exited (int status) override;
   void on_no_history () override;
+  void on_sync_execution_done () override;
 
   /* MI's output channels */
   mi_console_file *out;
diff --git a/gdb/observable.c b/gdb/observable.c
index 502e2d9..f52989d 100644
--- a/gdb/observable.c
+++ b/gdb/observable.c
@@ -34,7 +34,6 @@ bool observer_debug = false;
 
 DEFINE_OBSERVABLE (normal_stop);
 DEFINE_OBSERVABLE (signal_received);
-DEFINE_OBSERVABLE (sync_execution_done);
 DEFINE_OBSERVABLE (command_error);
 DEFINE_OBSERVABLE (target_changed);
 DEFINE_OBSERVABLE (executable_changed);
diff --git a/gdb/observable.h b/gdb/observable.h
index b06d13b..4be05ef 100644
--- a/gdb/observable.h
+++ b/gdb/observable.h
@@ -57,9 +57,6 @@ extern observable<struct bpstat */* bs */, int /* print_frame */> normal_stop;
 /* The inferior was stopped by a signal.  */
 extern observable<enum gdb_signal /* siggnal */> signal_received;
 
-/* A synchronous command finished.  */
-extern observable<> sync_execution_done;
-
 /* An error was caught while executing a command.  */
 extern observable<> command_error;