Extension Language API

	* configure.ac (libpython checking): Remove all but python.o from
	CONFIG_OBS.  Remove all but python.c from CONFIG_SRCS.
	* configure: Regenerate.

	* Makefile.in (SFILES): Add extension.c.
	(HFILES_NO_SRCDIR): Add extension.h, extension-priv.h
	(COMMON_OBS): Add extension.o.
	* extension.h: New file.
	* extension-priv.h: New file.
	* extension.c: New file.

	* python/python-internal.h: #include "extension.h".
	(gdbpy_auto_load_enabled): Declare.
	(gdbpy_apply_val_pretty_printer): Declare.
	(gdbpy_apply_frame_filter): Declare.
	(gdbpy_preserve_values): Declare.
	(gdbpy_breakpoint_cond_says_stop): Declare.
	(gdbpy_breakpoint_has_cond): Declare.
	(void source_python_script_for_objfile): Delete.
	* python/python.c: #include "extension-priv.h".
	Delete inclusion of "observer.h".
	(extension_language_python): Moved here and renamed from
	script_language_python in py-auto-load.c.
	Redefined to be of type extension_language_defn.
	(python_extension_script_ops): New global.
	(python_extension_ops): New global.
	(struct python_env): New member previous_active.
	(restore_python_env): Call restore_active_ext_lang.
	(ensure_python_env): Call set_active_ext_lang.
	(gdbpy_clear_quit_flag): Renamed from clear_quit_flag, made static.
	New arg extlang.
	(gdbpy_set_quit_flag): Renamed from set_quit_flag, made static.
	New arg extlang.
	(gdbpy_check_quit_flag): Renamed from check_quit_flag, made static.
	New arg extlang.
	(gdbpy_eval_from_control_command): Renamed from
	eval_python_from_control_command, made static.  New arg extlang.
	(gdbpy_source_script) Renamed from source_python_script, made static.
	New arg extlang.
	(gdbpy_before_prompt_hook): Renamed from before_prompt_hook.  Change
	result to int.  New arg extlang.
	(gdbpy_source_objfile_script): Renamed from
	source_python_script_for_objfile, made static.  New arg extlang.
	(gdbpy_start_type_printers): Renamed from start_type_printers, made
	static.  New args extlang, extlang_printers.  Change result type to
	"void".
	(gdbpy_apply_type_printers): Renamed from apply_type_printers, made
	static.  New arg extlang.  Rename arg printers to extlang_printers
	and change type to ext_lang_type_printers *.
	(gdbpy_free_type_printers): Renamed from free_type_printers, made
	static.  Replace argument arg with extlang, extlang_printers.
	(!HAVE_PYTHON, eval_python_from_control_command): Delete.
	(!HAVE_PYTHON, source_python_script): Delete.
	(!HAVE_PYTHON, gdbpy_should_stop): Delete.
	(!HAVE_PYTHON, gdbpy_breakpoint_has_py_cond): Delete.
	(!HAVE_PYTHON, start_type_printers): Delete.
	(!HAVE_PYTHON, apply_type_printers): Delete.
	(!HAVE_PYTHON, free_type_printers): Delete.
	(_initialize_python): Delete call to observer_attach_before_prompt.
	(finalize_python): Set/restore active extension language.
	(gdbpy_finish_initialization) Renamed from
	finish_python_initialization, made static.  New arg extlang.
	(gdbpy_initialized): New function.
	* python/python.h: #include "extension.h".  Delete #include
	"value.h", "mi/mi-cmds.h".
	(extension_language_python): Declare.
	(GDBPY_AUTO_FILE_NAME): Delete.
	(enum py_bt_status): Moved to extension.h and renamed to
	ext_lang_bt_status.
	(enum frame_filter_flags): Moved to extension.h.
	(enum py_frame_args): Moved to extension.h and renamed to
	ext_lang_frame_args.
	(finish_python_initialization): Delete.
	(eval_python_from_control_command): Delete.
	(source_python_script): Delete.
	(apply_val_pretty_printer): Delete.
	(apply_frame_filter): Delete.
	(preserve_python_values): Delete.
	(gdbpy_script_language_defn): Delete.
	(gdbpy_should_stop, gdbpy_breakpoint_has_py_cond): Delete.
	(start_type_printers, apply_type_printers, free_type_printers): Delete.

	* auto-load.c: #include "extension.h".
	(GDB_AUTO_FILE_NAME): Delete.
	(auto_load_gdb_scripts_enabled): Make public.  New arg extlang.
	(script_language_gdb): Delete, moved to extension.c and renamed to
	extension_language_gdb.
	(source_gdb_script_for_objfile): Delete.
	(auto_load_pspace_info): New member unsupported_script_warning_printed.
	(loaded_script): Change type of language member to
	struct extension_language_defn *.
	(init_loaded_scripts_info): Initialize
	unsupported_script_warning_printed.
	(maybe_add_script): Make static.  Change type of language arg to
	struct extension_language_defn *.
	(clear_section_scripts): Reset unsupported_script_warning_printed.
	(auto_load_objfile_script_1): Rewrite to use extension language API.
	(auto_load_objfile_script): Make public.  Remove support-compiled-in
	and auto-load-enabled checks, moved to auto_load_scripts_for_objfile.
	(source_section_scripts): Rewrite to use extension language API.
	(load_auto_scripts_for_objfile): Rewrite to use
	auto_load_scripts_for_objfile.
	(collect_matching_scripts_data): Change type of language member to
	struct extension_language_defn *.
	(auto_load_info_scripts): Change type of language arg to
	struct extension_language_defn *.
	(unsupported_script_warning_print): New function.
	(script_not_found_warning_print): Make static.
	(_initialize_auto_load): Rewrite construction of scripts-directory
	help.
	* auto-load.h (struct objfile): Add forward decl.
	(struct script_language): Delete.
	(struct auto_load_pspace_info): Add forward decl.
	(struct extension_language_defn): Add forward decl.
	(maybe_add_script): Delete.
	(auto_load_objfile_script): Declare.
	(script_not_found_warning_print): Delete.
	(auto_load_info_scripts): Update prototype.
	(auto_load_gdb_scripts_enabled): Declare.
	* python/py-auto-load.c (gdbpy_auto_load_enabled): Renamed from
	auto_load_python_scripts_enabled and made public.
	(script_language_python): Delete, moved to python.c.
	(gdbpy_script_language_defn): Delete.
	(info_auto_load_python_scripts): Update to use
	extension_language_python.

	* breakpoint.c (condition_command): Replace call to
	gdbpy_breakpoint_has_py_cond with call to get_breakpoint_cond_ext_lang.
	(bpstat_check_breakpoint_conditions): Replace call to gdbpy_should_stop
	with call to breakpoint_ext_lang_cond_says_stop.
	* python/py-breakpoint.c (gdbpy_breakpoint_cond_says_stop): Renamed
	from gdbpy_should_stop.  Change result type to enum scr_bp_stop.
	New arg slang.  Return SCR_BP_STOP_UNSET if py_bp_object is NULL.
	(gdbpy_breakpoint_has_cond): Renamed from gdbpy_breakpoint_has_py_cond.
	New arg slang.
	(local_setattro): Print name of extension language with existing
	stop condition.

	* valprint.c (val_print, value_print): Update to call
	apply_ext_lang_val_pretty_printer.
	* cp-valprint.c (cp_print_value): Update call to
	apply_ext_lang_val_pretty_printer.
	* python/py-prettyprint.c: Remove #ifdef HAVE_PYTHON.
	(gdbpy_apply_val_pretty_printer): Renamed from
	apply_val_pretty_printer.  New arg extlang.
	(!HAVE_PYTHON, apply_val_pretty_printer): Delete.

	* cli/cli-cmds.c (source_script_from_stream): Rewrite to use
	extension language API.
	* cli/cli-script.c (execute_control_command): Update to call
	eval_ext_lang_from_control_command.

	* mi/mi-cmd-stack.c (mi_cmd_stack_list_frames): Update to use
	enum ext_lang_bt_status values.  Update call to
	apply_ext_lang_frame_filter.
	(mi_cmd_stack_list_locals): Ditto.
	(mi_cmd_stack_list_args): Ditto.
	(mi_cmd_stack_list_variables): Ditto.
	* mi/mi-main.c: Delete #include "python/python-internal.h".
	Add #include "extension.h".
	(mi_cmd_list_features): Replace reference to python internal variable
	gdb_python_initialized with call to ext_lang_initialized_p.

	* stack.c (backtrace_command_1): Update to use enum ext_lang_bt_status.
	Update to use enum ext_lang_frame_args.  Update to call
	apply_ext_lang_frame_filter.
	* python/py-framefilter.c (extract_sym): Update to use enum
	ext_lang_bt_status.
	(extract_value, py_print_type, py_print_value): Ditto.
	(py_print_single_arg, enumerate_args, enumerate_locals): Ditto.
	(py_mi_print_variables, py_print_locals, py_print_args): Ditto.
	(py_print_frame): Ditto.
	(gdbpy_apply_frame_filter): Renamed from apply_frame_filter.
	New arg extlang.  Update to use enum ext_lang_bt_status.

	* top.c (gdb_init): Delete #ifdef HAVE_PYTHON call to
	finish_python_initialization.  Replace with call to
	finish_ext_lang_initialization.

	* typeprint.c (do_free_global_table): Update to call
	free_ext_lang_type_printers.
	(create_global_typedef_table): Update to call
	start_ext_lang_type_printers.
	(find_global_typedef): Update to call apply_ext_lang_type_printers.
	* typeprint.h (struct ext_lang_type_printers): Add forward decl.
	(type_print_options): Change type of global_printers from "void *"
	to "struct ext_lang_type_printers *".

	* value.c (preserve_values): Update to call preserve_ext_lang_values.
	* python/py-value.c: Remove #ifdef HAVE_PYTHON.
	(gdbpy_preserve_values): Renamed from preserve_python_values.
	New arg extlang.
	(!HAVE_PYTHON, preserve_python_values): Delete.

	* utils.c (quit_flag): Delete, moved to extension.c.
	(clear_quit_flag, set_quit_flag, check_quit_flag): Delete, moved to
	extension.c.

	* eval.c: Delete #include "python/python.h".
	* main.c: Delete #include "python/python.h".

	* defs.h: Update comment.

	testsuite/

	* gdb.python/py-breakpoint.exp (test_bkpt_eval_funcs): Update expected
	output.

	* gdb.gdb/python-interrupts.exp: New file.

1 files changed, 116 insertions, 114 deletions

diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
index 1a9f3e0598..ec382255ef 100644
--- a/gdb/python/py-framefilter.c
+++ b/gdb/python/py-framefilter.c
@@ -48,17 +48,17 @@ enum mi_print_types
    this will be set to NULL.  LANGUAGE is also a pass-through argument
    denoting the language attributed to the Symbol.  In the case of SYM
    being  NULL, this  will be  set to  the current  language.  Returns
-   PY_BT_ERROR on error with the appropriate Python exception set, and
-   PY_BT_OK on success.  */
+   EXT_LANG_BT_ERROR on error with the appropriate Python exception set, and
+   EXT_LANG_BT_OK on success.  */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 extract_sym (PyObject *obj, char **name, struct symbol **sym,
 	     const struct language_defn **language)
 {
   PyObject *result = PyObject_CallMethod (obj, "symbol", NULL);
 
   if (result == NULL)
-    return PY_BT_ERROR;
+    return EXT_LANG_BT_ERROR;
 
   /* For 'symbol' callback, the function can return a symbol or a
      string.  */
@@ -68,7 +68,7 @@ extract_sym (PyObject *obj, char **name, struct symbol **sym,
       Py_DECREF (result);
 
       if (*name == NULL)
-	return PY_BT_ERROR;
+	return EXT_LANG_BT_ERROR;
       /* If the API returns a string (and not a symbol), then there is
 	no symbol derived language available and the frame filter has
 	either overridden the symbol with a string, or supplied a
@@ -90,7 +90,7 @@ extract_sym (PyObject *obj, char **name, struct symbol **sym,
 	  PyErr_SetString (PyExc_RuntimeError,
 			   _("Unexpected value.  Expecting a "
 			     "gdb.Symbol or a Python string."));
-	  return PY_BT_ERROR;
+	  return EXT_LANG_BT_ERROR;
 	}
 
       /* Duplicate the symbol name, so the caller has consistency
@@ -106,7 +106,7 @@ extract_sym (PyObject *obj, char **name, struct symbol **sym,
 	*language = current_language;
     }
 
-  return PY_BT_OK;
+  return EXT_LANG_BT_OK;
 }
 
 /* Helper function to extract a value from an object that conforms to
@@ -114,11 +114,11 @@ extract_sym (PyObject *obj, char **name, struct symbol **sym,
    the value from.  VALUE is a pass-through argument where the value
    will be written.  If the object does not have the value attribute,
    or provides the Python None for a value, VALUE will be set to NULL
-   and this function will return as successful.  Returns PY_BT_ERROR
-   on error with the appropriate Python exception set, and PY_BT_OK on
+   and this function will return as successful.  Returns EXT_LANG_BT_ERROR
+   on error with the appropriate Python exception set, and EXT_LANG_BT_OK on
    success.  */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 extract_value (PyObject *obj, struct value **value)
 {
   if (PyObject_HasAttrString (obj, "value"))
@@ -126,7 +126,7 @@ extract_value (PyObject *obj, struct value **value)
       PyObject *vresult = PyObject_CallMethod (obj, "value", NULL);
 
       if (vresult == NULL)
-	return PY_BT_ERROR;
+	return EXT_LANG_BT_ERROR;
 
       /* The Python code has returned 'None' for a value, so we set
 	 value to NULL.  This flags that GDB should read the
@@ -135,7 +135,7 @@ extract_value (PyObject *obj, struct value **value)
 	{
 	  Py_DECREF (vresult);
 	  *value = NULL;
-	  return PY_BT_OK;
+	  return EXT_LANG_BT_OK;
 	}
       else
 	{
@@ -143,15 +143,15 @@ extract_value (PyObject *obj, struct value **value)
 	  Py_DECREF (vresult);
 
 	  if (*value == NULL)
-	    return PY_BT_ERROR;
+	    return EXT_LANG_BT_ERROR;
 
-	  return PY_BT_OK;
+	  return EXT_LANG_BT_OK;
 	}
     }
   else
     *value = NULL;
 
-  return PY_BT_OK;
+  return EXT_LANG_BT_OK;
 }
 
 /* MI prints only certain values according to the type of symbol and
@@ -195,11 +195,11 @@ mi_should_print (struct symbol *sym, enum mi_print_types type)
 /* Helper function which outputs a type name extracted from VAL to a
    "type" field in the output stream OUT.  OUT is the ui-out structure
    the type name will be output too, and VAL is the value that the
-   type will be extracted from.  Returns PY_BT_ERROR on error, with
-   any GDB exceptions converted to a Python exception, or PY_BT_OK on
+   type will be extracted from.  Returns EXT_LANG_BT_ERROR on error, with
+   any GDB exceptions converted to a Python exception, or EXT_LANG_BT_OK on
    success.  */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 py_print_type (struct ui_out *out, struct value *val)
 {
   volatile struct gdb_exception except;
@@ -220,10 +220,10 @@ py_print_type (struct ui_out *out, struct value *val)
   if (except.reason < 0)
     {
       gdbpy_convert_exception (except);
-      return PY_BT_ERROR;
+      return EXT_LANG_BT_ERROR;
     }
 
-  return PY_BT_OK;
+  return EXT_LANG_BT_OK;
 }
 
 /* Helper function which outputs a value to an output field in a
@@ -231,15 +231,15 @@ py_print_type (struct ui_out *out, struct value *val)
    VAL is the value that will be printed, OPTS contains the value
    printing options, ARGS_TYPE is an enumerator describing the
    argument format, and LANGUAGE is the language_defn that the value
-   will be printed with.  Returns PY_BT_ERROR on error, with any GDB
-   exceptions converted to a Python exception, or PY_BT_OK on
+   will be printed with.  Returns EXT_LANG_BT_ERROR on error, with any GDB
+   exceptions converted to a Python exception, or EXT_LANG_BT_OK on
    success. */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 py_print_value (struct ui_out *out, struct value *val,
 		const struct value_print_options *opts,
 		int indent,
-		enum py_frame_args args_type,
+		enum ext_lang_frame_args args_type,
 		const struct language_defn *language)
 {
   int should_print = 0;
@@ -265,7 +265,7 @@ py_print_value (struct ui_out *out, struct value *val,
       if (except.reason < 0)
 	{
 	  gdbpy_convert_exception (except);
-	  return PY_BT_ERROR;
+	  return EXT_LANG_BT_ERROR;
 	}
 
       if (args_type == MI_PRINT_ALL_VALUES)
@@ -295,11 +295,11 @@ py_print_value (struct ui_out *out, struct value *val,
       if (except.reason < 0)
 	{
 	  gdbpy_convert_exception (except);
-	  return PY_BT_ERROR;
+	  return EXT_LANG_BT_ERROR;
 	}
     }
 
-  return PY_BT_OK;
+  return EXT_LANG_BT_OK;
 }
 
 /* Helper function to call a Python method and extract an iterator
@@ -350,16 +350,16 @@ get_py_iter_from_func (PyObject *filter, char *func)
     ARGS_TYPE is an enumerator describing the argument format,
     PRINT_ARGS_FIELD is a flag which indicates if we output "ARGS=1"
     in MI output in commands where both arguments and locals are
-    printed.  Returns PY_BT_ERROR on error, with any GDB exceptions
-    converted to a Python exception, or PY_BT_OK on success.  */
+    printed.  Returns EXT_LANG_BT_ERROR on error, with any GDB exceptions
+    converted to a Python exception, or EXT_LANG_BT_OK on success.  */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 py_print_single_arg (struct ui_out *out,
 		     const char *sym_name,
 		     struct frame_arg *fa,
 		     struct value *fv,
 		     const struct value_print_options *opts,
-		     enum py_frame_args args_type,
+		     enum ext_lang_frame_args args_type,
 		     int print_args_field,
 		     const struct language_defn *language)
 {
@@ -435,7 +435,7 @@ py_print_single_arg (struct ui_out *out,
 	 types.  */
       if (args_type == MI_PRINT_SIMPLE_VALUES)
 	{
-	  if (py_print_type (out, val) == PY_BT_ERROR)
+	  if (py_print_type (out, val) == EXT_LANG_BT_ERROR)
 	    {
 	      do_cleanups (cleanups);
 	      goto error;
@@ -455,7 +455,7 @@ py_print_single_arg (struct ui_out *out,
 	  if (args_type != NO_VALUES)
 	    {
 	      if (py_print_value (out, val, opts, 0, args_type, language)
-		  == PY_BT_ERROR)
+		  == EXT_LANG_BT_ERROR)
 		{
 		  do_cleanups (cleanups);
 		  goto error;
@@ -471,10 +471,10 @@ py_print_single_arg (struct ui_out *out,
       goto error;
     }
 
-  return PY_BT_OK;
+  return EXT_LANG_BT_OK;
 
  error:
-  return PY_BT_ERROR;
+  return EXT_LANG_BT_ERROR;
 }
 
 /* Helper function to loop over frame arguments provided by the
@@ -484,14 +484,14 @@ py_print_single_arg (struct ui_out *out,
    enumerator describing the argument format, PRINT_ARGS_FIELD is a
    flag which indicates if we output "ARGS=1" in MI output in commands
    where both arguments and locals are printed, and FRAME is the
-   backing frame.  Returns PY_BT_ERROR on error, with any GDB
-   exceptions converted to a Python exception, or PY_BT_OK on
+   backing frame.  Returns EXT_LANG_BT_ERROR on error, with any GDB
+   exceptions converted to a Python exception, or EXT_LANG_BT_OK on
    success.  */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 enumerate_args (PyObject *iter,
 		struct ui_out *out,
-		enum py_frame_args args_type,
+		enum ext_lang_frame_args args_type,
 		int print_args_field,
 		struct frame_info *frame)
 {
@@ -533,17 +533,17 @@ enumerate_args (PyObject *iter,
       char *sym_name;
       struct symbol *sym;
       struct value *val;
-      enum py_bt_status success = PY_BT_ERROR;
+      enum ext_lang_bt_status success = EXT_LANG_BT_ERROR;
 
       success = extract_sym (item, &sym_name, &sym, &language);
-      if (success == PY_BT_ERROR)
+      if (success == EXT_LANG_BT_ERROR)
 	{
 	  Py_DECREF (item);
 	  goto error;
 	}
 
       success = extract_value (item, &val);
-      if (success == PY_BT_ERROR)
+      if (success == EXT_LANG_BT_ERROR)
 	{
 	  xfree (sym_name);
 	  Py_DECREF (item);
@@ -597,7 +597,7 @@ enumerate_args (PyObject *iter,
 				       NULL, &opts,
 				       args_type,
 				       print_args_field,
-				       NULL) == PY_BT_ERROR)
+				       NULL) == EXT_LANG_BT_ERROR)
 		{
 		  xfree (arg.error);
 		  xfree (entryarg.error);
@@ -625,9 +625,9 @@ enumerate_args (PyObject *iter,
 		    }
 		}
 
-	      if (py_print_single_arg (out, NULL, &entryarg, NULL,
-				      &opts, args_type,
-				      print_args_field, NULL) == PY_BT_ERROR)
+	      if (py_print_single_arg (out, NULL, &entryarg, NULL, &opts,
+				       args_type, print_args_field, NULL)
+		  == EXT_LANG_BT_ERROR)
 		{
 		      xfree (arg.error);
 		      xfree (entryarg.error);
@@ -646,7 +646,7 @@ enumerate_args (PyObject *iter,
 	    {
 	      if (py_print_single_arg (out, sym_name, NULL, val, &opts,
 				       args_type, print_args_field,
-				       language) == PY_BT_ERROR)
+				       language) == EXT_LANG_BT_ERROR)
 		{
 		  xfree (sym_name);
 		  goto error;
@@ -688,10 +688,10 @@ enumerate_args (PyObject *iter,
 	}
     }
 
-  return PY_BT_OK;
+  return EXT_LANG_BT_OK;
 
  error:
-  return PY_BT_ERROR;
+  return EXT_LANG_BT_ERROR;
 }
 
 
@@ -703,14 +703,14 @@ enumerate_args (PyObject *iter,
    the argument format, PRINT_ARGS_FIELD is flag which indicates
    whether to output the ARGS field in the case of
    -stack-list-variables and FRAME is the backing frame.  Returns
-   PY_BT_ERROR on error, with any GDB exceptions converted to a Python
-   exception, or PY_BT_OK on success.  */
+   EXT_LANG_BT_ERROR on error, with any GDB exceptions converted to a Python
+   exception, or EXT_LANG_BT_OK on success.  */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 enumerate_locals (PyObject *iter,
 		  struct ui_out *out,
 		  int indent,
-		  enum py_frame_args args_type,
+		  enum ext_lang_frame_args args_type,
 		  int print_args_field,
 		  struct frame_info *frame)
 {
@@ -725,7 +725,7 @@ enumerate_locals (PyObject *iter,
       const struct language_defn *language;
       char *sym_name;
       struct value *val;
-      enum py_bt_status  success = PY_BT_ERROR;
+      enum ext_lang_bt_status success = EXT_LANG_BT_ERROR;
       struct symbol *sym;
       volatile struct gdb_exception except;
       int local_indent = 8 + (8 * indent);
@@ -734,7 +734,7 @@ enumerate_locals (PyObject *iter,
       locals_cleanups = make_cleanup_py_decref (item);
 
       success = extract_sym (item, &sym_name, &sym, &language);
-      if (success == PY_BT_ERROR)
+      if (success == EXT_LANG_BT_ERROR)
 	{
 	  do_cleanups (locals_cleanups);
 	  goto error;
@@ -743,7 +743,7 @@ enumerate_locals (PyObject *iter,
       make_cleanup (xfree, sym_name);
 
       success = extract_value (item, &val);
-      if (success == PY_BT_ERROR)
+      if (success == EXT_LANG_BT_ERROR)
 	{
 	  do_cleanups (locals_cleanups);
 	  goto error;
@@ -801,7 +801,7 @@ enumerate_locals (PyObject *iter,
 
       if (args_type == MI_PRINT_SIMPLE_VALUES)
 	{
-	  if (py_print_type (out, val) == PY_BT_ERROR)
+	  if (py_print_type (out, val) == EXT_LANG_BT_ERROR)
 	    {
 	      do_cleanups (locals_cleanups);
 	      goto error;
@@ -815,7 +815,7 @@ enumerate_locals (PyObject *iter,
 	  int val_indent = (indent + 1) * 4;
 
 	  if (py_print_value (out, val, &opts, val_indent, args_type,
-			      language) ==  PY_BT_ERROR)
+			      language) == EXT_LANG_BT_ERROR)
 	    {
 	      do_cleanups (locals_cleanups);
 	      goto error;
@@ -826,7 +826,7 @@ enumerate_locals (PyObject *iter,
 	  if (args_type != NO_VALUES)
 	    {
 	      if (py_print_value (out, val, &opts, 0, args_type,
-				  language) ==  PY_BT_ERROR)
+				  language) == EXT_LANG_BT_ERROR)
 		{
 		  do_cleanups (locals_cleanups);
 		  goto error;
@@ -850,19 +850,19 @@ enumerate_locals (PyObject *iter,
   if (item == NULL && PyErr_Occurred ())
     goto error;
 
-  return PY_BT_OK;
+  return EXT_LANG_BT_OK;
 
  error:
-  return PY_BT_ERROR;
+  return EXT_LANG_BT_ERROR;
 }
 
-/*  Helper function for -stack-list-variables.  Returns PY_BT_ERROR on
-    error, or PY_BT_OK on success.  */
+/*  Helper function for -stack-list-variables.  Returns EXT_LANG_BT_ERROR on
+    error, or EXT_LANG_BT_OK on success.  */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 py_mi_print_variables (PyObject *filter, struct ui_out *out,
 		       struct value_print_options *opts,
-		       enum py_frame_args args_type,
+		       enum ext_lang_frame_args args_type,
 		       struct frame_info *frame)
 {
   struct cleanup *old_chain;
@@ -882,30 +882,31 @@ py_mi_print_variables (PyObject *filter, struct ui_out *out,
   make_cleanup_ui_out_list_begin_end (out, "variables");
 
   if (args_iter != Py_None)
-    if (enumerate_args (args_iter, out, args_type, 1, frame) == PY_BT_ERROR)
+    if (enumerate_args (args_iter, out, args_type, 1, frame)
+	== EXT_LANG_BT_ERROR)
       goto error;
 
   if (locals_iter != Py_None)
     if (enumerate_locals (locals_iter, out, 1, args_type, 1, frame)
-	== PY_BT_ERROR)
+	== EXT_LANG_BT_ERROR)
       goto error;
 
   do_cleanups (old_chain);
-  return PY_BT_OK;
+  return EXT_LANG_BT_OK;
 
  error:
   do_cleanups (old_chain);
-  return PY_BT_ERROR;
+  return EXT_LANG_BT_ERROR;
 }
 
 /* Helper function for printing locals.  This function largely just
    creates the wrapping tuple, and calls enumerate_locals.  Returns
-   PY_BT_ERROR on error, or PY_BT_OK on success.*/
+   EXT_LANG_BT_ERROR on error, or EXT_LANG_BT_OK on success.  */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 py_print_locals (PyObject *filter,
 		 struct ui_out *out,
-		 enum py_frame_args args_type,
+		 enum ext_lang_frame_args args_type,
 		 int indent,
 		 struct frame_info *frame)
 {
@@ -920,26 +921,26 @@ py_print_locals (PyObject *filter,
 
   if (locals_iter != Py_None)
     if (enumerate_locals (locals_iter, out, indent, args_type,
-			  0, frame) == PY_BT_ERROR)
+			  0, frame) == EXT_LANG_BT_ERROR)
       goto locals_error;
 
   do_cleanups (old_chain);
-  return PY_BT_OK;;
+  return EXT_LANG_BT_OK;
 
  locals_error:
   do_cleanups (old_chain);
-  return PY_BT_ERROR;
+  return EXT_LANG_BT_ERROR;
 }
 
 /* Helper function for printing frame arguments.  This function
    largely just creates the wrapping tuple, and calls enumerate_args.
-   Returns PY_BT_ERROR on error, with any GDB exceptions converted to
-   a Python exception, or PY_BT_OK on success.  */
+   Returns EXT_LANG_BT_ERROR on error, with any GDB exceptions converted to
+   a Python exception, or EXT_LANG_BT_OK on success.  */
 
-static enum py_bt_status
+static enum ext_lang_bt_status
 py_print_args (PyObject *filter,
 	       struct ui_out *out,
-	       enum py_frame_args args_type,
+	       enum ext_lang_frame_args args_type,
 	       struct frame_info *frame)
 {
   PyObject *args_iter  = get_py_iter_from_func (filter, "frame_args");
@@ -964,7 +965,8 @@ py_print_args (PyObject *filter,
     }
 
   if (args_iter != Py_None)
-    if (enumerate_args (args_iter, out, args_type, 0, frame) == PY_BT_ERROR)
+    if (enumerate_args (args_iter, out, args_type, 0, frame)
+	== EXT_LANG_BT_ERROR)
       goto args_error;
 
   TRY_CATCH (except, RETURN_MASK_ALL)
@@ -979,11 +981,11 @@ py_print_args (PyObject *filter,
     }
 
   do_cleanups (old_chain);
-  return PY_BT_OK;
+  return EXT_LANG_BT_OK;
 
  args_error:
   do_cleanups (old_chain);
-  return PY_BT_ERROR;
+  return EXT_LANG_BT_ERROR;
 }
 
 /*  Print a single frame to the designated output stream, detecting
@@ -997,12 +999,13 @@ py_print_args (PyObject *filter,
     (in the case of elided frames), and LEVELS_PRINTED is a hash-table
     containing all the frames level that have already been printed.
     If a frame level has been printed, do not print it again (in the
-    case of elided frames).  Returns PY_BT_ERROR on error, with any
-    GDB exceptions converted to a Python exception, or PY_BT_COMPLETED
+    case of elided frames).  Returns EXT_LANG_BT_ERROR on error, with any
+    GDB exceptions converted to a Python exception, or EXT_LANG_BT_COMPLETED
     on success.  */
 
-static enum py_bt_status
-py_print_frame (PyObject *filter, int flags, enum py_frame_args args_type,
+static enum ext_lang_bt_status
+py_print_frame (PyObject *filter, int flags,
+		enum ext_lang_frame_args args_type,
 		struct ui_out *out, int indent, htab_t levels_printed)
 {
   int has_addr = 0;
@@ -1052,12 +1055,12 @@ py_print_frame (PyObject *filter, int flags, enum py_frame_args args_type,
   if (print_locals && print_args && ! print_frame_info)
     {
       if (py_mi_print_variables (filter, out, &opts,
-				 args_type, frame) == PY_BT_ERROR)
+				 args_type, frame) == EXT_LANG_BT_ERROR)
 	goto error;
       else
 	{
 	  do_cleanups (cleanup_stack);
-	  return PY_BT_COMPLETED;
+	  return EXT_LANG_BT_COMPLETED;
 	}
     }
 
@@ -1230,7 +1233,7 @@ py_print_frame (PyObject *filter, int flags, enum py_frame_args args_type,
      wrong.  */
   if (print_args)
     {
-      if (py_print_args (filter, out, args_type, frame) == PY_BT_ERROR)
+      if (py_print_args (filter, out, args_type, frame) == EXT_LANG_BT_ERROR)
 	goto error;
     }
 
@@ -1334,7 +1337,7 @@ py_print_frame (PyObject *filter, int flags, enum py_frame_args args_type,
   if (print_locals)
     {
       if (py_print_locals (filter, out, args_type, indent,
-			   frame) == PY_BT_ERROR)
+			   frame) == EXT_LANG_BT_ERROR)
 	goto error;
     }
 
@@ -1355,12 +1358,12 @@ py_print_frame (PyObject *filter, int flags, enum py_frame_args args_type,
 
       while ((item = PyIter_Next (elided)))
 	{
-	  enum py_bt_status success = py_print_frame (item, flags,
-						      args_type, out,
-						      indent,
-						      levels_printed);
+	  enum ext_lang_bt_status success = py_print_frame (item, flags,
+							    args_type, out,
+							    indent,
+							    levels_printed);
 
-	  if (success == PY_BT_ERROR)
+	  if (success == EXT_LANG_BT_ERROR)
 	    {
 	      Py_DECREF (item);
 	      goto error;
@@ -1374,11 +1377,11 @@ py_print_frame (PyObject *filter, int flags, enum py_frame_args args_type,
 
 
   do_cleanups (cleanup_stack);
-  return PY_BT_COMPLETED;
+  return EXT_LANG_BT_COMPLETED;
 
  error:
   do_cleanups (cleanup_stack);
-  return PY_BT_ERROR;
+  return EXT_LANG_BT_ERROR;
 }
 
 /* Helper function to initiate frame filter invocation at starting
@@ -1456,26 +1459,25 @@ bootstrap_python_frame_filters (struct frame_info *frame,
     variables.  ARGS_TYPE is an enumerator describing the argument
     format, OUT is the output stream to print.  FRAME_LOW is the
     beginning of the slice of frames to print, and FRAME_HIGH is the
-    upper limit of the frames to count.  Returns PY_BT_ERROR on error,
-    or PY_BT_COMPLETED on success.*/
-
-enum py_bt_status
-apply_frame_filter (struct frame_info *frame, int flags,
-		    enum py_frame_args args_type,
-		    struct ui_out *out, int frame_low,
-		    int frame_high)
-
+    upper limit of the frames to count.  Returns EXT_LANG_BT_ERROR on error,
+    or EXT_LANG_BT_COMPLETED on success.  */
+
+enum ext_lang_bt_status
+gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
+			  struct frame_info *frame, int flags,
+			  enum ext_lang_frame_args args_type,
+			  struct ui_out *out, int frame_low, int frame_high)
 {
   struct gdbarch *gdbarch = NULL;
   struct cleanup *cleanups;
-  enum py_bt_status success = PY_BT_ERROR;
+  enum ext_lang_bt_status success = EXT_LANG_BT_ERROR;
   PyObject *iterable;
   volatile struct gdb_exception except;
   PyObject *item;
   htab_t levels_printed;
 
   if (!gdb_python_initialized)
-    return PY_BT_NO_FILTERS;
+    return EXT_LANG_BT_NO_FILTERS;
 
   TRY_CATCH (except, RETURN_MASK_ALL)
     {
@@ -1484,7 +1486,7 @@ apply_frame_filter (struct frame_info *frame, int flags,
   if (except.reason < 0)
     {
       /* Let gdb try to print the stack trace.  */
-      return PY_BT_NO_FILTERS;
+      return EXT_LANG_BT_NO_FILTERS;
     }
 
   cleanups = ensure_python_env (gdbarch, current_language);
@@ -1501,14 +1503,14 @@ apply_frame_filter (struct frame_info *frame, int flags,
 	 where GDB cannot initialize the frame filters (most likely
 	 due to incorrect auto-load paths), GDB has printed nothing.
 	 In this case it is OK to print the default backtrace after
-	 printing the error message.  GDB returns PY_BT_NO_FILTERS
+	 printing the error message.  GDB returns EXT_LANG_BT_NO_FILTERS
 	 here to signify there are no filters after printing the
 	 initialization error.  This return code will trigger a
 	 default backtrace.  */
 
       gdbpy_print_stack ();
       do_cleanups (cleanups);
-      return PY_BT_NO_FILTERS;
+      return EXT_LANG_BT_NO_FILTERS;
     }
 
   /* If iterable is None, then there are no frame filters registered.
@@ -1517,7 +1519,7 @@ apply_frame_filter (struct frame_info *frame, int flags,
   make_cleanup_py_decref (iterable);
   if (iterable == Py_None)
     {
-      success = PY_BT_NO_FILTERS;
+      success = EXT_LANG_BT_NO_FILTERS;
       goto done;
     }
 
@@ -1534,7 +1536,7 @@ apply_frame_filter (struct frame_info *frame, int flags,
 
       /* Do not exit on error printing a single frame.  Print the
 	 error and continue with other frames.  */
-      if (success == PY_BT_ERROR)
+      if (success == EXT_LANG_BT_ERROR)
 	gdbpy_print_stack ();
 
       Py_DECREF (item);
@@ -1552,5 +1554,5 @@ apply_frame_filter (struct frame_info *frame, int flags,
  error:
   gdbpy_print_stack ();
   do_cleanups (cleanups);
-  return PY_BT_ERROR;
+  return EXT_LANG_BT_ERROR;
 }