diff options
author | Doug Evans <xdje42@gmail.com> | 2015-01-31 12:01:13 -0800 |
---|---|---|
committer | Doug Evans <xdje42@gmail.com> | 2015-01-31 12:01:13 -0800 |
commit | 9f0500621b6a4908986394eb0fac151ef097f520 (patch) | |
tree | 36c8a7d7cb12d9cfe5afff2949ede1a252a91b48 /gdb/guile | |
parent | 312809f8838911dabff84d7ad3ccf341307d2b19 (diff) | |
download | gdb-9f0500621b6a4908986394eb0fac151ef097f520.zip gdb-9f0500621b6a4908986394eb0fac151ef097f520.tar.gz gdb-9f0500621b6a4908986394eb0fac151ef097f520.tar.bz2 |
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.
Diffstat (limited to 'gdb/guile')
-rw-r--r-- | gdb/guile/guile-internal.h | 1 | ||||
-rw-r--r-- | gdb/guile/guile.c | 1 | ||||
-rw-r--r-- | gdb/guile/scm-objfile.c | 28 |
3 files changed, 29 insertions, 1 deletions
diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h index 968b4d3..9a8ef68 100644 --- a/gdb/guile/guile-internal.h +++ b/gdb/guile/guile-internal.h @@ -549,6 +549,7 @@ extern struct value *vlscm_convert_value_from_scheme /* stript_lang methods */ extern objfile_script_sourcer_func gdbscm_source_objfile_script; +extern objfile_script_executor_func gdbscm_execute_objfile_script; extern int gdbscm_auto_load_enabled (const struct extension_language_defn *); diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c index c434ec0..319b583 100644 --- a/gdb/guile/guile.c +++ b/gdb/guile/guile.c @@ -128,6 +128,7 @@ static const struct extension_language_script_ops guile_extension_script_ops = { gdbscm_source_script, gdbscm_source_objfile_script, + gdbscm_execute_objfile_script, gdbscm_auto_load_enabled }; diff --git a/gdb/guile/scm-objfile.c b/gdb/guile/scm-objfile.c index 8162d01..8e94b96 100644 --- a/gdb/guile/scm-objfile.c +++ b/gdb/guile/scm-objfile.c @@ -283,7 +283,8 @@ gdbscm_set_objfile_pretty_printers_x (SCM self, SCM printers) /* 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 - gdbscm_source_objfile_script; it is NULL at other times. */ + gdbscm_source_objfile_script and gdbscm_execute_objfile_script; it is NULL + at other times. */ static struct objfile *ofscm_current_objfile; /* Set the current objfile to OBJFILE and then read FILE named FILENAME @@ -311,6 +312,31 @@ gdbscm_source_objfile_script (const struct extension_language_defn *extlang, ofscm_current_objfile = NULL; } +/* Set the current objfile to OBJFILE and then read FILE named FILENAME + as Guile code. This does not throw any errors. If an exception + occurs Guile will print the backtrace. + This is the extension_language_script_ops.objfile_script_sourcer + "method". */ + +void +gdbscm_execute_objfile_script (const struct extension_language_defn *extlang, + struct objfile *objfile, const char *name, + const char *script) +{ + char *msg; + + ofscm_current_objfile = objfile; + + msg = gdbscm_safe_eval_string (script, 0 /* display_result */); + if (msg != NULL) + { + fprintf_filtered (gdb_stderr, "%s", msg); + xfree (msg); + } + + ofscm_current_objfile = NULL; +} + /* (current-objfile) -> <gdb:obfjile> Return the current objfile, or #f if there isn't one. Ideally this would be named ofscm_current_objfile, but that name is |