From 3f3773757eb2cf5d62caf5e01adf8611c8684dde Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 7 Sep 2018 01:37:57 -0700 Subject: systemc: Fortify how exceptions are caught and passed around. This change tightens up exception catching and makes gem5's systemc code react to exceptions more in line with the Accellera implementation. This prevents exceptions from being caught by the pybind11 integration which makes it very difficult to see where an exception came from, and makes the output differ by including a (mostly useless) backtrace. Change-Id: I7130d53a98fadd137073d1718f780f32f57c658c Reviewed-on: https://gem5-review.googlesource.com/c/12601 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/ext/utils/sc_report_handler.hh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/systemc/ext/utils') diff --git a/src/systemc/ext/utils/sc_report_handler.hh b/src/systemc/ext/utils/sc_report_handler.hh index f65b32cca..6ce20afb4 100644 --- a/src/systemc/ext/utils/sc_report_handler.hh +++ b/src/systemc/ext/utils/sc_report_handler.hh @@ -105,6 +105,10 @@ class sc_report_handler static void set_handler(sc_report_handler_proc); static void default_handler(const sc_report &, const sc_actions &); static sc_actions get_new_action_id(); + // Nonstandard + // Returns the current handler so it can be restored if it needs to be + // changed temporarily. + static sc_report_handler_proc get_handler(); static sc_report *get_cached_report(); static void clear_cached_report(); -- cgit v1.2.3