gas: xtensa: extract jump assembling for trampolines

[deliverable/binutils-gdb.git] / gdb / interps.h

diff --git a/gdb/interps.h b/gdb/interps.h
index 1b9580c1183c90a4992fc59f6c9238cef8ef8ac6..2a0ee0b53f168664143f79a0c0e2186551c3c491 100644 (file)
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -35,8 +35,6 @@ typedef struct interp *(*interp_factory_func) (const char *name);
 extern void interp_factory_register (const char *name,
                                     interp_factory_func func);
 
-extern int interp_resume (struct interp *interp);
-extern int interp_suspend (struct interp *interp);
 extern struct gdb_exception interp_exec (struct interp *interp,
                                         const char *command);
 
@@ -102,7 +100,32 @@ extern void set_top_level_interpreter (const char *name);
 
 extern struct ui_out *interp_ui_out (struct interp *interp);
 extern const char *interp_name (struct interp *interp);
-extern struct interp *interp_set_temp (const char *name);
+
+/* Temporarily set the current interpreter, and reset it on
+   destruction.  */
+class scoped_restore_interp
+{
+public:
+
+  scoped_restore_interp (const char *name)
+    : m_interp (set_interp (name))
+  {
+  }
+
+  ~scoped_restore_interp ()
+  {
+    set_interp (interp_name (m_interp));
+  }
+
+  scoped_restore_interp (const scoped_restore_interp &) = delete;
+  scoped_restore_interp &operator= (const scoped_restore_interp &) = delete;
+
+private:
+
+  struct interp *set_interp (const char *name);
+
+  struct interp *m_interp;
+};
 
 extern int current_interp_named_p (const char *name);
 
@@ -138,9 +161,10 @@ extern void interp_pre_command_loop (struct interp *interp);
 
 /* List the possible interpreters which could complete the given
    text.  */
-extern VEC (char_ptr) *interpreter_completer (struct cmd_list_element *ignore,
-                                             const char *text,
-                                             const char *word);
+extern void interpreter_completer (struct cmd_list_element *ignore,
+                                  completion_tracker &tracker,
+                                  const char *text,
+                                  const char *word);
 
 /* well-known interpreters */
 #define INTERP_CONSOLE         "console"