systemc: Get rid of leftovers from unimplemented warnings past.
authorGabe Black <gabeblack@google.com>
Thu, 11 Oct 2018 02:19:36 +0000 (19:19 -0700)
committerGabe Black <gabeblack@google.com>
Tue, 16 Oct 2018 01:18:36 +0000 (01:18 +0000)
These warnings were removed when the functionality they warned about
was implemented, but there were some leftovers like unnecessary
includes and some helper functions which hid gem5 specific headers
from the ext directory.

Change-Id: Ic886ac0f1264687524e3a7b7eaab8836f318a5a2
Reviewed-on: https://gem5-review.googlesource.com/c/13398
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>

33 files changed:
src/systemc/channel/sc_event_queue.cc
src/systemc/channel/sc_in_resolved.cc
src/systemc/channel/sc_inout_resolved.cc
src/systemc/channel/sc_mutex.cc
src/systemc/channel/sc_out_resolved.cc
src/systemc/channel/sc_semaphore.cc
src/systemc/channel/sc_signal_resolved.cc
src/systemc/core/event.cc
src/systemc/core/object.cc
src/systemc/core/process.cc
src/systemc/core/sc_attr.cc
src/systemc/core/sc_event.cc
src/systemc/core/sc_export.cc
src/systemc/core/sc_interface.cc
src/systemc/core/sc_join.cc
src/systemc/core/sc_module.cc
src/systemc/core/sc_module_name.cc
src/systemc/core/sc_object.cc
src/systemc/core/sc_prim.cc
src/systemc/core/sc_process_handle.cc
src/systemc/core/sc_sensitive.cc
src/systemc/core/sc_simcontext.cc
src/systemc/core/sc_time.cc
src/systemc/core/sensitivity.cc
src/systemc/ext/core/sc_spawn.hh
src/systemc/ext/utils/sc_trace_file.hh
src/systemc/ext/utils/warn_unimpl.hh [deleted file]
src/systemc/utils/SConscript
src/systemc/utils/sc_report_handler.cc
src/systemc/utils/sc_trace_file.cc
src/systemc/utils/tracefile.cc
src/systemc/utils/vcd.cc
src/systemc/utils/warn_unimpl.cc [deleted file]

index 50cf2d278b8017db59b54d5805f562aa28bfdb56..e91b6f959753b578d807aec1b2414d15aa43abbc 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/ext/channel/sc_event_queue.hh"
 #include "systemc/ext/core/sc_main.hh"
 #include "systemc/ext/core/sc_time.hh"
index 94cb55a897c26f825bee92718fb27ae24c46419c..50904b29e4315cc07f16107df39142c489aed2c8 100644 (file)
@@ -27,7 +27,7 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
+#include "base/cprintf.hh"
 #include "systemc/ext/channel/sc_in_resolved.hh"
 #include "systemc/ext/channel/sc_signal_resolved.hh"
 
index 3310e23de537e6af052cb6a16092d153b6d9db09..eb3a49114549093ad9e44cfdb5509d23bc9f5ea2 100644 (file)
@@ -27,7 +27,7 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
+#include "base/cprintf.hh"
 #include "systemc/ext/channel/messages.hh"
 #include "systemc/ext/channel/sc_inout_resolved.hh"
 #include "systemc/ext/channel/sc_signal_resolved.hh"
index 9c5e9c20c40b792d736b8a892d3354ab940e0a2d..5cff50ee6e7177a96e7d0d34e99c1f7ddef0e3fd 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/channel/sc_mutex.hh"
 #include "systemc/ext/core/sc_module.hh" // for sc_gen_unique_name
index af61f31ca81ce7a478c7a62e260569db9cca596a..3147fdf0933b0f00c2b9d2cd9fb9576ace28f74a 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/ext/channel/sc_out_resolved.hh"
 
 namespace sc_core
index 9bace3964fd2f5ec48ec39ea0ab2f46e187814b4..04511d9e056e961cdf09eef89c0ab70238f5d65d 100644 (file)
@@ -29,7 +29,6 @@
 
 #include <string>
 
-#include "base/logging.hh"
 #include "systemc/ext/channel/messages.hh"
 #include "systemc/ext/channel/sc_semaphore.hh"
 #include "systemc/ext/core/sc_module.hh" // for sc_gen_unique_name
index 119082486722b80518e8f00f20beb0f92199de28..a68736f1ff7d1c62d7728bb5cb370eee685cdacf 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/core/process.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/channel/sc_signal_resolved.hh"
index 1c966d8156a7211a7d6820dbde672a565618d0c2..a80dd2c0e68521bd17b087b02dfc0561639323ac 100644 (file)
@@ -33,7 +33,6 @@
 #include <cstring>
 #include <utility>
 
-#include "base/logging.hh"
 #include "sim/core.hh"
 #include "systemc/core/module.hh"
 #include "systemc/core/scheduler.hh"
index e67aa167c6985db4e503f8517afe2e55f37002e6..8801c7303ef118bc17574a013c4112d257503256 100644 (file)
@@ -32,7 +32,6 @@
 #include <algorithm>
 #include <stack>
 
-#include "base/logging.hh"
 #include "systemc/core/event.hh"
 #include "systemc/core/module.hh"
 #include "systemc/core/scheduler.hh"
index e29cee030303687653ced2a5c4e40ee96a8ec25f..193056f676c5a1e2f87aee2dce6595bbc50461fd 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "systemc/core/process.hh"
 
-#include "base/logging.hh"
 #include "systemc/core/event.hh"
 #include "systemc/core/port.hh"
 #include "systemc/core/scheduler.hh"
index 37a6575de66383a98042d80f808d310f5a3c9453..b7c0a1eba068cdf70f3a3b400addcc9e751b672a 100644 (file)
@@ -29,7 +29,6 @@
 
 #include <utility>
 
-#include "base/logging.hh"
 #include "systemc/ext/core/sc_attr.hh"
 
 namespace sc_core
index 0eeae038f7f2e9049fb459d146aa275ff85845dd..75d5c8978b5e970289f0d0bf4c9e3214538a69ec 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/core/event.hh"
 #include "systemc/ext/core/sc_event.hh"
 #include "systemc/ext/core/sc_module.hh"
index a2cee316ca7f0792e4716b7ae903f27817bd4aa0..0ace0310b8df21225479f1ea3f5658a588381382 100644 (file)
@@ -27,7 +27,7 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
+#include "base/cprintf.hh"
 #include "systemc/core/module.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/channel/messages.hh"
index 88b4487425a2dc1235c7f29a824189cf3920743d..33ab2d6e27403c99c2d6c610d306b49d4a51db73 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/ext/channel/messages.hh"
 #include "systemc/ext/core/sc_event.hh"
 #include "systemc/ext/core/sc_interface.hh"
index bc7441d6efa56e17dd1d427a5c462ca5312712ea..8bd67303c71fefb5b0c0efe48cd78eaa16093e8e 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/core/process.hh"
 #include "systemc/ext/core/messages.hh"
 #include "systemc/ext/core/sc_event.hh"
index ae2580639433c45a91da1c2b40db4654dea6ae93..5d9e3da1563f9cd476d04e32df99913c2bcb5665 100644 (file)
@@ -31,7 +31,6 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.hh"
 #include "systemc/core/event.hh"
 #include "systemc/core/kernel.hh"
 #include "systemc/core/module.hh"
index 27d115c956608a7e675a7af12b7f30396d8fbd35..1b28890a864436b5b8bef49fa2eeb7dab35fa750 100644 (file)
@@ -28,7 +28,6 @@
  */
 
 
-#include "base/logging.hh"
 #include "systemc/core/module.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/core/messages.hh"
index c2e27610b48ba1e8630a7c7c024f388ea00a88b3..7c126bc7f5d0d0ea32b02fcd5a453d1f488fa279 100644 (file)
@@ -29,7 +29,6 @@
 
 #include <vector>
 
-#include "base/logging.hh"
 #include "systemc/core/object.hh"
 #include "systemc/ext/core/sc_object.hh"
 
index 5dacc7f2f4b20083d7c3fe2a251da43a79b4f682..cbf96b0a9f154daaf8c1fb83f6fa11f3feb2a506 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/core/channel.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/channel/messages.hh"
index 9fd8efc40a89a2f515d46b6d15707637612a4e37..56631fe99d89975b856ad2f2ac37db850ef4cb8b 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/core/process.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/core/messages.hh"
index 58bf3c9dbf7c61d579d7ad736b026a52ecfca1a5..715177f7b2aa97c0c74f4c8f5832c14c4c59e755 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/core/process.hh"
 #include "systemc/ext/channel/sc_in.hh"
 #include "systemc/ext/channel/sc_inout.hh"
index 3a085e5ab9f53eb53d7950d67eed74ccf54de8d6..f8cf3eb44fd5118b816ab4b5290976b20b0cddbf 100644 (file)
@@ -27,7 +27,6 @@
  * Authors: Gabe Black
  */
 
-#include "base/logging.hh"
 #include "systemc/core/object.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/core/sc_main.hh"
index 2dbc648f3a255b6bfa0d1abc92b67b507a93cc1d..5c72927da9b000f0a2110d720f57645c9e7c4d87 100644 (file)
@@ -30,7 +30,6 @@
 #include <sstream>
 #include <vector>
 
-#include "base/logging.hh"
 #include "base/types.hh"
 #include "python/pybind11/pybind.hh"
 #include "sim/core.hh"
index 75128cb7fb45ef9bfdefe04e386e29e73147b618..0221188b2e0e04598202db7eae4a20a04c23abef 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "systemc/core/sensitivity.hh"
 
-#include "base/logging.hh"
 #include "systemc/core/event.hh"
 #include "systemc/core/port.hh"
 #include "systemc/core/process.hh"
index a37e48206c01119ba5540ca4ea420bdf177282da..413b0095b7dba72cc377d687dcb85a216f5c1016 100644 (file)
@@ -151,8 +151,6 @@ class sc_spawn_options
     sc_spawn_options &operator = (const sc_spawn_options &) { return *this; }
 };
 
-void sc_spawn_warn_unimpl(const char *func);
-
 template <typename T>
 sc_process_handle
 sc_spawn(T object, const char *name_p=nullptr,
index 09f5bb254e08c5755294c580a194531116a2731c..cf6722a902d152b953ea06e1eb15f3154497df8f 100644 (file)
@@ -33,7 +33,6 @@
 #include <exception>
 
 #include "../core/sc_time.hh"
-#include "warn_unimpl.hh"
 
 namespace sc_dt
 {
diff --git a/src/systemc/ext/utils/warn_unimpl.hh b/src/systemc/ext/utils/warn_unimpl.hh
deleted file mode 100644 (file)
index 77873fa..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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_UTILS_WARN_UNIMPL_HH__
-#define __SYSTEMC_EXT_UTILS_WARN_UNIMPL_HH__
-
-namespace sc_core
-{
-
-void sc_utils_warn_unimpl(const char *func);
-
-} // namespace sc_core
-
-#endif  //__SYSTEMC_EXT_UTILS_WARN_UNIMPL_HH__
index f8de5b0c8d636627fa2a1afe7bbf2fc6404608a6..eae586fdc942fe665f768a7ea814d588443b415d 100644 (file)
@@ -37,4 +37,3 @@ if env['USE_SYSTEMC']:
     Source('sc_vector.cc')
     Source('tracefile.cc')
     Source('vcd.cc')
-    Source('warn_unimpl.cc')
index a2b915ed1115660693353050aeae82c2e5241eca..ad0d3b84ed71603f9e14a20635c5ec820e54fc91 100644 (file)
@@ -32,7 +32,7 @@
 #include <sstream>
 #include <string>
 
-#include "base/logging.hh"
+#include "base/cprintf.hh"
 #include "systemc/core/process.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/core/sc_main.hh"
index cc9ceef3749e514faf89bcc9145f41b13d51381d..194dd2ad6c050b6c1b256a5ca7be1b0f9eccc8f1 100644 (file)
@@ -29,7 +29,6 @@
 
 #include <vector>
 
-#include "base/logging.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/channel/sc_signal_in_if.hh"
 #include "systemc/ext/core/sc_event.hh"
index cf771463b912b4bb92e89da44d13ac030d7508ab..8cdd0bdd448af03b62c8d4ca3db99ef07ddb95fa 100644 (file)
@@ -32,7 +32,6 @@
 #include <ctime>
 #include <iomanip>
 
-#include "base/logging.hh"
 #include "base/output.hh"
 #include "sim/core.hh"
 #include "systemc/core/time.hh"
index 83e6b50e885c0334137936d382de334ca8973780..ff9290701fb67dfd862b5b6173b102d51704e301 100644 (file)
@@ -34,7 +34,6 @@
 
 #include "base/bitfield.hh"
 #include "base/cprintf.hh"
-#include "base/logging.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/core/sc_event.hh"
 #include "systemc/ext/core/sc_main.hh"
diff --git a/src/systemc/utils/warn_unimpl.cc b/src/systemc/utils/warn_unimpl.cc
deleted file mode 100644 (file)
index f96e604..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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/utils/warn_unimpl.hh"
-
-namespace sc_core
-{
-
-void
-sc_utils_warn_unimpl(const char *func)
-{
-    warn("%s not implemented.\n", func);
-}
-
-} // namespace sc_core