diff options
author | Gabe Black <gabeblack@google.com> | 2018-10-06 02:58:02 -0700 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2018-10-16 01:02:06 +0000 |
commit | a7d99be947c80de4647d07fd4f73c19cc4050a77 (patch) | |
tree | b59d98011d72ebc847ce5f73cbf2063f1f7cac13 /src/systemc/core/process.hh | |
parent | 9677f2da711edc3382e754c7dfd62464e904a9e9 (diff) | |
download | gem5-a7d99be947c80de4647d07fd4f73c19cc4050a77.tar.xz |
systemc: Remove a redundant injectException for Thread's throw_it.
For some reason lost to the sands of time, the throw_it function was
virtual for the Thread class, and that class would call the base
class's throw_it, and then also injectException itself. That would
result in the exception being injected into the thread twice which is
incorrect.
Since it's not clear what the original intention of this code was, the
throw_it function is now no longer virtual, and the one useful aspect
of it, a check if the process is already terminated, was moved into the
base class function.
Change-Id: I7fb14baa7728bd1e9206011870b6ccaa9c4e8c64
Reviewed-on: https://gem5-review.googlesource.com/c/13312
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/systemc/core/process.hh')
-rw-r--r-- | src/systemc/core/process.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/systemc/core/process.hh b/src/systemc/core/process.hh index 0331f0786..86ca6744e 100644 --- a/src/systemc/core/process.hh +++ b/src/systemc/core/process.hh @@ -84,7 +84,7 @@ class Process : public ::sc_core::sc_process_b, public ListNode void kill(bool inc_kids); void reset(bool inc_kids); - virtual void throw_it(ExceptionWrapperBase &exc, bool inc_kids); + void throw_it(ExceptionWrapperBase &exc, bool inc_kids); void injectException(ExceptionWrapperBase &exc); ExceptionWrapperBase *excWrapper; |