From b6ad37a88e95a2efbb118324ef48206ee0b6dbc6 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 28 Aug 2018 23:14:40 -0700 Subject: systemc: Improve handling of empty process handles. Most had checks, but didn't print any message. throw_it needed a check as well. Change-Id: I916c837112f9b27852583f01b3e16a6f53d5e7ca Reviewed-on: https://gem5-review.googlesource.com/c/12440 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/ext/core/sc_process_handle.hh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/systemc/ext/core') diff --git a/src/systemc/ext/core/sc_process_handle.hh b/src/systemc/ext/core/sc_process_handle.hh index 04df4728f..b9bb9a0c4 100644 --- a/src/systemc/ext/core/sc_process_handle.hh +++ b/src/systemc/ext/core/sc_process_handle.hh @@ -33,7 +33,8 @@ #include #include -#include "systemc/ext/core/sc_object.hh" +#include "../utils/sc_report_handler.hh" +#include "sc_object.hh" namespace sc_gem5 { @@ -212,6 +213,11 @@ class sc_process_handle sc_descendent_inclusion_info include_descendants= SC_NO_DESCENDANTS) { + if (!_gem5_process) { + SC_REPORT_WARNING("(W570) attempt to use an empty " + "process handle ignored", "throw_it()"); + return; + } ::sc_gem5::ExceptionWrapper exc(user_defined_exception); ::sc_gem5::throw_it_wrapper(_gem5_process, exc, include_descendants == SC_INCLUDE_DESCENDANTS); -- cgit v1.2.3