diff options
-rw-r--r-- | gdb/guile/guile-internal.h | 5 | ||||
-rw-r--r-- | gdb/guile/scm-pretty-print.c | 5 | ||||
-rw-r--r-- | gdb/guile/scm-type.c | 5 | ||||
-rw-r--r-- | gdb/guile/scm-value.c | 5 | ||||
-rw-r--r-- | gdb/top.h | 2 |
5 files changed, 21 insertions, 1 deletions
diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h index 42ecb3c..b04ef17 100644 --- a/gdb/guile/guile-internal.h +++ b/gdb/guile/guile-internal.h @@ -29,6 +29,7 @@ #include "symtab.h" #include "libguile.h" #include "objfiles.h" +#include "top.h" /* For quit_force(). */ struct block; struct frame_info; @@ -704,6 +705,10 @@ gdbscm_wrap (Function &&func, Args &&... args) { result = func (std::forward<Args> (args)...); } + catch (const gdb_exception_forced_quit &e) + { + quit_force (NULL, 0); + } catch (const gdb_exception &except) { exc = unpack (except); diff --git a/gdb/guile/scm-pretty-print.c b/gdb/guile/scm-pretty-print.c index e172a14..ae56758 100644 --- a/gdb/guile/scm-pretty-print.c +++ b/gdb/guile/scm-pretty-print.c @@ -21,6 +21,7 @@ conventions, et.al. */ #include "defs.h" +#include "top.h" /* For quit_force(). */ #include "charset.h" #include "symtab.h" /* Needed by language.h. */ #include "language.h" @@ -558,6 +559,10 @@ ppscm_pretty_print_one_value (SCM printer, struct value **out_value, (_("invalid result from pretty-printer to-string"), result); } } + catch (const gdb_exception_forced_quit &except) + { + quit_force (NULL, 0); + } catch (const gdb_exception &except) { } diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c index da16d22..008e792 100644 --- a/gdb/guile/scm-type.c +++ b/gdb/guile/scm-type.c @@ -21,6 +21,7 @@ conventions, et.al. */ #include "defs.h" +#include "top.h" /* For quit_force(). */ #include "arch-utils.h" #include "value.h" #include "gdbtypes.h" @@ -132,6 +133,10 @@ tyscm_type_name (struct type *type) &type_print_raw_options); return stb.release (); } + catch (const gdb_exception_forced_quit &except) + { + quit_force (NULL, 0); + } catch (const gdb_exception &except) { excp = gdbscm_scm_from_gdb_exception (unpack (except)); diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c index ac948dc..32a9539 100644 --- a/gdb/guile/scm-value.c +++ b/gdb/guile/scm-value.c @@ -21,6 +21,7 @@ conventions, et.al. */ #include "defs.h" +#include "top.h" /* For quit_force(). */ #include "arch-utils.h" #include "charset.h" #include "cp-abi.h" @@ -416,6 +417,10 @@ gdbscm_value_address (SCM self) { address = vlscm_scm_from_value (value_addr (value)); } + catch (const gdb_exception_forced_quit &except) + { + quit_force (NULL, 0); + } catch (const gdb_exception &except) { } @@ -235,7 +235,7 @@ extern void read_command_file (FILE *); extern void init_history (void); extern void command_loop (void); extern int quit_confirm (void); -extern void quit_force (int *, int); +extern void quit_force (int *, int) ATTRIBUTE_NORETURN; extern void quit_command (const char *, int); extern void quit_cover (void); extern void execute_command (const char *, int); |