Add support for inlining scripts into .debug_gdb_scripts.
include/gdb/ChangeLog: * section-scripts.h: Remove "future extension" comment. (SECTION_SCRIPT_ID_PYTHON_TEXT): New macro. (SECTION_SCRIPT_ID_SCHEME_TEXT): New macro. gdb/ChangeLog: * NEWS: Mention inlined scripts in .debug_gdb_scripts section. * auto-load.c: #include ctype.h. (struct auto_load_pspace_info): Replace member loaded_scripts with new members loaded_script_files, loaded_script_texts. (auto_load_pspace_data_cleanup): Update. (init_loaded_scripts_info): Update. (get_auto_load_pspace_data_for_loading): Update. (maybe_add_script_file): Renamed from maybe_add_script. All callers updated. (maybe_add_script_text): New function. (clear_section_scripts): Update. (source_script_file, execute_script_contents): New functions. (source_section_scripts): Add support for SECTION_SCRIPT_ID_PYTHON_TEXT, SECTION_SCRIPT_ID_GUILE_TEXT. (print_scripts): New function. (auto_load_info_scripts): Also print inlined scripts. (maybe_print_unsupported_script_warning): Renamed from unsupported_script_warning_print. All callers updated. (maybe_print_script_not_found_warning): Renamed from script_not_found_warning_print. All callers updated. * extension-priv.h (struct extension_language_script_ops): New member objfile_script_executor. * extension.c (ext_lang_objfile_script_executor): New function. * extension.h (objfile_script_executor_func): New typedef. (ext_lang_objfile_script_executor): Declare. * guile/guile-internal.h (gdbscm_execute_objfile_script): Declare. * guile/guile.c (guile_extension_script_ops): Update. * guile/scm-objfile.c (gdbscm_execute_objfile_script): New function. * python/python.c (python_extension_script_ops): Update. (gdbpy_execute_objfile_script): New function. gdb/doc/ChangeLog: * gdb.texinfo (dotdebug_gdb_scripts section): Update docs to distinguish script files vs inlined scripts. * python.texi (Python Auto-loading): Ditto. gdb/testsuite/ChangeLog: * gdb.guile/scm-section-script.c: Add duplicate inlined section script entries. Duplicate file section script entries. * gdb.guile/scm-section-script.exp: Add tests for duplicate entries, inlined entries. Add test for safe-path rejection. * gdb.python/py-section-script.c: Add duplicate inlined section script entries. Duplicate file section script entries. * gdb.python/py-section-script.exp: Add tests for duplicate entries, inlined entries. Add test for safe-path rejection.
This commit is contained in:
parent
312809f883
commit
9f0500621b
20 changed files with 744 additions and 194 deletions
|
@ -131,6 +131,7 @@ PyObject *gdbpy_gdb_memory_error;
|
|||
|
||||
static script_sourcer_func gdbpy_source_script;
|
||||
static objfile_script_sourcer_func gdbpy_source_objfile_script;
|
||||
static objfile_script_executor_func gdbpy_execute_objfile_script;
|
||||
static void gdbpy_finish_initialization
|
||||
(const struct extension_language_defn *);
|
||||
static int gdbpy_initialized (const struct extension_language_defn *);
|
||||
|
@ -155,6 +156,7 @@ static const struct extension_language_script_ops python_extension_script_ops =
|
|||
{
|
||||
gdbpy_source_script,
|
||||
gdbpy_source_objfile_script,
|
||||
gdbpy_execute_objfile_script,
|
||||
gdbpy_auto_load_enabled
|
||||
};
|
||||
|
||||
|
@ -1262,7 +1264,8 @@ gdbpy_progspaces (PyObject *unused1, PyObject *unused2)
|
|||
|
||||
/* The "current" objfile. This is set when gdb detects that a new
|
||||
objfile has been loaded. It is only set for the duration of a call to
|
||||
gdbpy_source_objfile_script; it is NULL at other times. */
|
||||
gdbpy_source_objfile_script and gdbpy_execute_objfile_script; it is NULL
|
||||
at other times. */
|
||||
static struct objfile *gdbpy_current_objfile;
|
||||
|
||||
/* Set the current objfile to OBJFILE and then read FILE named FILENAME
|
||||
|
@ -1290,6 +1293,31 @@ gdbpy_source_objfile_script (const struct extension_language_defn *extlang,
|
|||
gdbpy_current_objfile = NULL;
|
||||
}
|
||||
|
||||
/* Set the current objfile to OBJFILE and then execute SCRIPT
|
||||
as Python code. This does not throw any errors. If an exception
|
||||
occurs python will print the traceback and clear the error indicator.
|
||||
This is the extension_language_script_ops.objfile_script_executor
|
||||
"method". */
|
||||
|
||||
static void
|
||||
gdbpy_execute_objfile_script (const struct extension_language_defn *extlang,
|
||||
struct objfile *objfile, const char *name,
|
||||
const char *script)
|
||||
{
|
||||
struct cleanup *cleanups;
|
||||
|
||||
if (!gdb_python_initialized)
|
||||
return;
|
||||
|
||||
cleanups = ensure_python_env (get_objfile_arch (objfile), current_language);
|
||||
gdbpy_current_objfile = objfile;
|
||||
|
||||
PyRun_SimpleString (script);
|
||||
|
||||
do_cleanups (cleanups);
|
||||
gdbpy_current_objfile = NULL;
|
||||
}
|
||||
|
||||
/* Return the current Objfile, or None if there isn't one. */
|
||||
|
||||
static PyObject *
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue