From 7eb6ad4aaa3afb8a5625a4515cbcfd141d5ce45b Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 6 Oct 2018 19:00:56 -0700 Subject: systemc: Refactor reporting to prep for int based messages. There's a deprecated reporting mechanism based on integer message ids, and the reporting mechanism needs to be refactored a bit to make it easier to support. Some bookkeeping data structures were moved out to somewhere they can be accessed by other code, obviating the non-standard get_handler function. Change-Id: Id427cd79be9ef0f3275fbac39ff047ab672fb3e0 Reviewed-on: https://gem5-review.googlesource.com/c/13318 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/core/scheduler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/systemc/core/scheduler.cc') diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc index e0a270d4f..969e40155 100644 --- a/src/systemc/core/scheduler.cc +++ b/src/systemc/core/scheduler.cc @@ -36,6 +36,7 @@ #include "systemc/ext/core/sc_main.hh" #include "systemc/ext/utils/sc_report.hh" #include "systemc/ext/utils/sc_report_handler.hh" +#include "systemc/utils/report.hh" #include "systemc/utils/tracefile.hh" namespace sc_gem5 @@ -469,8 +470,7 @@ throwingReportHandler(const ::sc_core::sc_report &r, const ::sc_core::sc_report reportifyException() { - ::sc_core::sc_report_handler_proc old_handler = - ::sc_core::sc_report_handler::get_handler(); + ::sc_core::sc_report_handler_proc old_handler = reportHandlerProc; ::sc_core::sc_report_handler::set_handler(&throwingReportHandler); try { -- cgit v1.2.3