From 1ab49504cfda08838395c71374de307a82358d2b Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 18 Jun 2018 17:50:08 -0700 Subject: systemc: Add the nonstandard sc_join class and sc_thread_handle type. Change-Id: I09905bad4797d9c456229afe601006ce16977394 Reviewed-on: https://gem5-review.googlesource.com/11353 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/core/SConscript | 1 + src/systemc/core/sc_join.cc | 72 +++++++++++++++++++++++++++++++++++++++++ src/systemc/ext/core/_core.hh | 1 + src/systemc/ext/core/_using.hh | 3 ++ src/systemc/ext/core/sc_join.hh | 55 +++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+) create mode 100644 src/systemc/core/sc_join.cc create mode 100644 src/systemc/ext/core/sc_join.hh diff --git a/src/systemc/core/SConscript b/src/systemc/core/SConscript index 329e7c7ae..2cf410eae 100644 --- a/src/systemc/core/SConscript +++ b/src/systemc/core/SConscript @@ -37,6 +37,7 @@ if env['USE_SYSTEMC']: Source('sc_event.cc') Source('sc_export.cc') Source('sc_interface.cc') + Source('sc_join.cc') Source('sc_main.cc') Source('sc_module.cc') Source('sc_module_name.cc') diff --git a/src/systemc/core/sc_join.cc b/src/systemc/core/sc_join.cc new file mode 100644 index 000000000..4d531433a --- /dev/null +++ b/src/systemc/core/sc_join.cc @@ -0,0 +1,72 @@ +/* + * Copyright 2018 Google, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Authors: Gabe Black + */ + +#include "base/logging.hh" +#include "systemc/ext/core/sc_join.hh" + +namespace sc_core +{ + +sc_join::sc_join() +{ + warn("%s not implemented.\n", __PRETTY_FUNCTION__); +} + +void +sc_join::add_process(sc_process_handle) +{ + warn("%s not implemented.\n", __PRETTY_FUNCTION__); +} + +int +sc_join::process_count() +{ + warn("%s not implemented.\n", __PRETTY_FUNCTION__); + return 0; +} + +void +sc_join::signal(sc_thread_handle thread_p, int type) +{ + warn("%s not implemented.\n", __PRETTY_FUNCTION__); +} + +void +sc_join::wait() +{ + warn("%s not implemented.\n", __PRETTY_FUNCTION__); +} + +void +sc_join::wait_clocked() +{ + warn("%s not implemented.\n", __PRETTY_FUNCTION__); +} + +} // namespace sc_core diff --git a/src/systemc/ext/core/_core.hh b/src/systemc/ext/core/_core.hh index f4ce54ce8..03a04adde 100644 --- a/src/systemc/ext/core/_core.hh +++ b/src/systemc/ext/core/_core.hh @@ -34,6 +34,7 @@ #include "sc_event.hh" #include "sc_export.hh" #include "sc_interface.hh" +#include "sc_join.hh" #include "sc_main.hh" #include "sc_module.hh" #include "sc_module_name.hh" diff --git a/src/systemc/ext/core/_using.hh b/src/systemc/ext/core/_using.hh index 9c779fd9d..71d4cf909 100644 --- a/src/systemc/ext/core/_using.hh +++ b/src/systemc/ext/core/_using.hh @@ -51,6 +51,9 @@ using sc_core::sc_export; using sc_core::sc_interface; +using sc_core::sc_thread_handle; +using sc_core::sc_join; + using sc_core::sc_argc; using sc_core::sc_argv; using sc_core::sc_starvation_policy; diff --git a/src/systemc/ext/core/sc_join.hh b/src/systemc/ext/core/sc_join.hh new file mode 100644 index 000000000..18119ae3d --- /dev/null +++ b/src/systemc/ext/core/sc_join.hh @@ -0,0 +1,55 @@ +/* + * Copyright 2018 Google, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Authors: Gabe Black + */ + +#ifndef __SYSTEMC_EXT_CORE_SC_JOIN_HH__ +#define __SYSTEMC_EXT_CORE_SC_JOIN_HH__ + +#include "sc_process_handle.hh" + +namespace sc_core +{ + +// Nonstandard +typedef sc_process_b *sc_thread_handle; + +// Nonstandard +class sc_join +{ + public: + sc_join(); + void add_process(sc_process_handle); + int process_count(); + virtual void signal(sc_thread_handle thread_p, int type); + void wait(); + void wait_clocked(); +}; + +} // namespace sc_core + +#endif //__SYSTEMC_EXT_CORE_SC_JOIN_HH__ -- cgit v1.2.3