systemc: Get rid of leftovers from unimplemented warnings past.
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>
diff --git a/src/systemc/channel/sc_event_queue.cc b/src/systemc/channel/sc_event_queue.cc
index 50cf2d2..e91b6f9 100644
--- a/src/systemc/channel/sc_event_queue.cc
+++ b/src/systemc/channel/sc_event_queue.cc
@@ -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"
diff --git a/src/systemc/channel/sc_in_resolved.cc b/src/systemc/channel/sc_in_resolved.cc
index 94cb55a..50904b2 100644
--- a/src/systemc/channel/sc_in_resolved.cc
+++ b/src/systemc/channel/sc_in_resolved.cc
@@ -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"
diff --git a/src/systemc/channel/sc_inout_resolved.cc b/src/systemc/channel/sc_inout_resolved.cc
index 3310e23..eb3a491 100644
--- a/src/systemc/channel/sc_inout_resolved.cc
+++ b/src/systemc/channel/sc_inout_resolved.cc
@@ -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"
diff --git a/src/systemc/channel/sc_mutex.cc b/src/systemc/channel/sc_mutex.cc
index 9c5e9c2..5cff50e 100644
--- a/src/systemc/channel/sc_mutex.cc
+++ b/src/systemc/channel/sc_mutex.cc
@@ -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
diff --git a/src/systemc/channel/sc_out_resolved.cc b/src/systemc/channel/sc_out_resolved.cc
index af61f31..3147fdf 100644
--- a/src/systemc/channel/sc_out_resolved.cc
+++ b/src/systemc/channel/sc_out_resolved.cc
@@ -27,7 +27,6 @@
* Authors: Gabe Black
*/
-#include "base/logging.hh"
#include "systemc/ext/channel/sc_out_resolved.hh"
namespace sc_core
diff --git a/src/systemc/channel/sc_semaphore.cc b/src/systemc/channel/sc_semaphore.cc
index 9bace39..04511d9 100644
--- a/src/systemc/channel/sc_semaphore.cc
+++ b/src/systemc/channel/sc_semaphore.cc
@@ -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
diff --git a/src/systemc/channel/sc_signal_resolved.cc b/src/systemc/channel/sc_signal_resolved.cc
index 1190824..a68736f 100644
--- a/src/systemc/channel/sc_signal_resolved.cc
+++ b/src/systemc/channel/sc_signal_resolved.cc
@@ -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"
diff --git a/src/systemc/core/event.cc b/src/systemc/core/event.cc
index 1c966d8..a80dd2c 100644
--- a/src/systemc/core/event.cc
+++ b/src/systemc/core/event.cc
@@ -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"
diff --git a/src/systemc/core/object.cc b/src/systemc/core/object.cc
index e67aa16..8801c73 100644
--- a/src/systemc/core/object.cc
+++ b/src/systemc/core/object.cc
@@ -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"
diff --git a/src/systemc/core/process.cc b/src/systemc/core/process.cc
index e29cee0..193056f 100644
--- a/src/systemc/core/process.cc
+++ b/src/systemc/core/process.cc
@@ -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"
diff --git a/src/systemc/core/sc_attr.cc b/src/systemc/core/sc_attr.cc
index 37a6575..b7c0a1e 100644
--- a/src/systemc/core/sc_attr.cc
+++ b/src/systemc/core/sc_attr.cc
@@ -29,7 +29,6 @@
#include <utility>
-#include "base/logging.hh"
#include "systemc/ext/core/sc_attr.hh"
namespace sc_core
diff --git a/src/systemc/core/sc_event.cc b/src/systemc/core/sc_event.cc
index 0eeae03..75d5c89 100644
--- a/src/systemc/core/sc_event.cc
+++ b/src/systemc/core/sc_event.cc
@@ -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"
diff --git a/src/systemc/core/sc_export.cc b/src/systemc/core/sc_export.cc
index a2cee31..0ace031 100644
--- a/src/systemc/core/sc_export.cc
+++ b/src/systemc/core/sc_export.cc
@@ -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"
diff --git a/src/systemc/core/sc_interface.cc b/src/systemc/core/sc_interface.cc
index 88b4487..33ab2d6 100644
--- a/src/systemc/core/sc_interface.cc
+++ b/src/systemc/core/sc_interface.cc
@@ -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"
diff --git a/src/systemc/core/sc_join.cc b/src/systemc/core/sc_join.cc
index bc7441d..8bd6730 100644
--- a/src/systemc/core/sc_join.cc
+++ b/src/systemc/core/sc_join.cc
@@ -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"
diff --git a/src/systemc/core/sc_module.cc b/src/systemc/core/sc_module.cc
index ae25806..5d9e3da 100644
--- a/src/systemc/core/sc_module.cc
+++ b/src/systemc/core/sc_module.cc
@@ -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"
diff --git a/src/systemc/core/sc_module_name.cc b/src/systemc/core/sc_module_name.cc
index 27d115c..1b28890 100644
--- a/src/systemc/core/sc_module_name.cc
+++ b/src/systemc/core/sc_module_name.cc
@@ -28,7 +28,6 @@
*/
-#include "base/logging.hh"
#include "systemc/core/module.hh"
#include "systemc/core/scheduler.hh"
#include "systemc/ext/core/messages.hh"
diff --git a/src/systemc/core/sc_object.cc b/src/systemc/core/sc_object.cc
index c2e2761..7c126bc 100644
--- a/src/systemc/core/sc_object.cc
+++ b/src/systemc/core/sc_object.cc
@@ -29,7 +29,6 @@
#include <vector>
-#include "base/logging.hh"
#include "systemc/core/object.hh"
#include "systemc/ext/core/sc_object.hh"
diff --git a/src/systemc/core/sc_prim.cc b/src/systemc/core/sc_prim.cc
index 5dacc7f..cbf96b0 100644
--- a/src/systemc/core/sc_prim.cc
+++ b/src/systemc/core/sc_prim.cc
@@ -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"
diff --git a/src/systemc/core/sc_process_handle.cc b/src/systemc/core/sc_process_handle.cc
index 9fd8efc..56631fe 100644
--- a/src/systemc/core/sc_process_handle.cc
+++ b/src/systemc/core/sc_process_handle.cc
@@ -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"
diff --git a/src/systemc/core/sc_sensitive.cc b/src/systemc/core/sc_sensitive.cc
index 58bf3c9..715177f 100644
--- a/src/systemc/core/sc_sensitive.cc
+++ b/src/systemc/core/sc_sensitive.cc
@@ -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"
diff --git a/src/systemc/core/sc_simcontext.cc b/src/systemc/core/sc_simcontext.cc
index 3a085e5..f8cf3eb 100644
--- a/src/systemc/core/sc_simcontext.cc
+++ b/src/systemc/core/sc_simcontext.cc
@@ -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"
diff --git a/src/systemc/core/sc_time.cc b/src/systemc/core/sc_time.cc
index 2dbc648..5c72927 100644
--- a/src/systemc/core/sc_time.cc
+++ b/src/systemc/core/sc_time.cc
@@ -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"
diff --git a/src/systemc/core/sensitivity.cc b/src/systemc/core/sensitivity.cc
index 75128cb..0221188 100644
--- a/src/systemc/core/sensitivity.cc
+++ b/src/systemc/core/sensitivity.cc
@@ -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"
diff --git a/src/systemc/ext/core/sc_spawn.hh b/src/systemc/ext/core/sc_spawn.hh
index a37e482..413b009 100644
--- a/src/systemc/ext/core/sc_spawn.hh
+++ b/src/systemc/ext/core/sc_spawn.hh
@@ -151,8 +151,6 @@
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,
diff --git a/src/systemc/ext/utils/sc_trace_file.hh b/src/systemc/ext/utils/sc_trace_file.hh
index 09f5bb2..cf6722a 100644
--- a/src/systemc/ext/utils/sc_trace_file.hh
+++ b/src/systemc/ext/utils/sc_trace_file.hh
@@ -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
index 77873fa..0000000
--- a/src/systemc/ext/utils/warn_unimpl.hh
+++ /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__
diff --git a/src/systemc/utils/SConscript b/src/systemc/utils/SConscript
index f8de5b0..eae586f 100644
--- a/src/systemc/utils/SConscript
+++ b/src/systemc/utils/SConscript
@@ -37,4 +37,3 @@
Source('sc_vector.cc')
Source('tracefile.cc')
Source('vcd.cc')
- Source('warn_unimpl.cc')
diff --git a/src/systemc/utils/sc_report_handler.cc b/src/systemc/utils/sc_report_handler.cc
index a2b915e..ad0d3b8 100644
--- a/src/systemc/utils/sc_report_handler.cc
+++ b/src/systemc/utils/sc_report_handler.cc
@@ -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"
diff --git a/src/systemc/utils/sc_trace_file.cc b/src/systemc/utils/sc_trace_file.cc
index cc9ceef..194dd2a 100644
--- a/src/systemc/utils/sc_trace_file.cc
+++ b/src/systemc/utils/sc_trace_file.cc
@@ -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"
diff --git a/src/systemc/utils/tracefile.cc b/src/systemc/utils/tracefile.cc
index cf77146..8cdd0bd 100644
--- a/src/systemc/utils/tracefile.cc
+++ b/src/systemc/utils/tracefile.cc
@@ -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"
diff --git a/src/systemc/utils/vcd.cc b/src/systemc/utils/vcd.cc
index 83e6b50..ff92907 100644
--- a/src/systemc/utils/vcd.cc
+++ b/src/systemc/utils/vcd.cc
@@ -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
index f96e604..0000000
--- a/src/systemc/utils/warn_unimpl.cc
+++ /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
