From 0f368d5ebdd4eeff9f475aed244677a4191df5d8 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 10 Oct 2018 19:19:36 -0700 Subject: [PATCH] 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 Maintainer: Gabe Black --- src/systemc/channel/sc_event_queue.cc | 1 - src/systemc/channel/sc_in_resolved.cc | 2 +- src/systemc/channel/sc_inout_resolved.cc | 2 +- src/systemc/channel/sc_mutex.cc | 1 - src/systemc/channel/sc_out_resolved.cc | 1 - src/systemc/channel/sc_semaphore.cc | 1 - src/systemc/channel/sc_signal_resolved.cc | 1 - src/systemc/core/event.cc | 1 - src/systemc/core/object.cc | 1 - src/systemc/core/process.cc | 1 - src/systemc/core/sc_attr.cc | 1 - src/systemc/core/sc_event.cc | 1 - src/systemc/core/sc_export.cc | 2 +- src/systemc/core/sc_interface.cc | 1 - src/systemc/core/sc_join.cc | 1 - src/systemc/core/sc_module.cc | 1 - src/systemc/core/sc_module_name.cc | 1 - src/systemc/core/sc_object.cc | 1 - src/systemc/core/sc_prim.cc | 1 - src/systemc/core/sc_process_handle.cc | 1 - src/systemc/core/sc_sensitive.cc | 1 - src/systemc/core/sc_simcontext.cc | 1 - src/systemc/core/sc_time.cc | 1 - src/systemc/core/sensitivity.cc | 1 - src/systemc/ext/core/sc_spawn.hh | 2 -- src/systemc/ext/utils/sc_trace_file.hh | 1 - src/systemc/ext/utils/warn_unimpl.hh | 40 --------------------- src/systemc/utils/SConscript | 1 - src/systemc/utils/sc_report_handler.cc | 2 +- src/systemc/utils/sc_trace_file.cc | 1 - src/systemc/utils/tracefile.cc | 1 - src/systemc/utils/vcd.cc | 1 - src/systemc/utils/warn_unimpl.cc | 42 ----------------------- 33 files changed, 4 insertions(+), 114 deletions(-) delete mode 100644 src/systemc/ext/utils/warn_unimpl.hh delete mode 100644 src/systemc/utils/warn_unimpl.cc diff --git a/src/systemc/channel/sc_event_queue.cc b/src/systemc/channel/sc_event_queue.cc index 50cf2d278b..e91b6f9597 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 94cb55a897..50904b29e4 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 3310e23de5..eb3a491145 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 9c5e9c20c4..5cff50ee6e 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 af61f31ca8..3147fdf093 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 9bace3964f..04511d9e05 100644 --- a/src/systemc/channel/sc_semaphore.cc +++ b/src/systemc/channel/sc_semaphore.cc @@ -29,7 +29,6 @@ #include -#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 1190824867..a68736f1ff 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 1c966d8156..a80dd2c0e6 100644 --- a/src/systemc/core/event.cc +++ b/src/systemc/core/event.cc @@ -33,7 +33,6 @@ #include #include -#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 e67aa167c6..8801c7303e 100644 --- a/src/systemc/core/object.cc +++ b/src/systemc/core/object.cc @@ -32,7 +32,6 @@ #include #include -#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 e29cee0303..193056f676 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 37a6575de6..b7c0a1eba0 100644 --- a/src/systemc/core/sc_attr.cc +++ b/src/systemc/core/sc_attr.cc @@ -29,7 +29,6 @@ #include -#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 0eeae038f7..75d5c8978b 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 a2cee316ca..0ace0310b8 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 88b4487425..33ab2d6e27 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 bc7441d6ef..8bd67303c7 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 ae25806394..5d9e3da156 100644 --- a/src/systemc/core/sc_module.cc +++ b/src/systemc/core/sc_module.cc @@ -31,7 +31,6 @@ #include #include -#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 27d115c956..1b28890a86 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 c2e27610b4..7c126bc7f5 100644 --- a/src/systemc/core/sc_object.cc +++ b/src/systemc/core/sc_object.cc @@ -29,7 +29,6 @@ #include -#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 5dacc7f2f4..cbf96b0a9f 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 9fd8efc40a..56631fe99d 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 58bf3c9dbf..715177f7b2 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 3a085e5ab9..f8cf3eb44f 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 2dbc648f3a..5c72927da9 100644 --- a/src/systemc/core/sc_time.cc +++ b/src/systemc/core/sc_time.cc @@ -30,7 +30,6 @@ #include #include -#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 75128cb7fb..0221188b2e 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 a37e48206c..413b0095b7 100644 --- a/src/systemc/ext/core/sc_spawn.hh +++ b/src/systemc/ext/core/sc_spawn.hh @@ -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 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 09f5bb254e..cf6722a902 100644 --- a/src/systemc/ext/utils/sc_trace_file.hh +++ b/src/systemc/ext/utils/sc_trace_file.hh @@ -33,7 +33,6 @@ #include #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 77873faaf2..0000000000 --- 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 f8de5b0c8d..eae586fdc9 100644 --- a/src/systemc/utils/SConscript +++ b/src/systemc/utils/SConscript @@ -37,4 +37,3 @@ if env['USE_SYSTEMC']: 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 a2b915ed11..ad0d3b84ed 100644 --- a/src/systemc/utils/sc_report_handler.cc +++ b/src/systemc/utils/sc_report_handler.cc @@ -32,7 +32,7 @@ #include #include -#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 cc9ceef374..194dd2ad6c 100644 --- a/src/systemc/utils/sc_trace_file.cc +++ b/src/systemc/utils/sc_trace_file.cc @@ -29,7 +29,6 @@ #include -#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 cf771463b9..8cdd0bdd44 100644 --- a/src/systemc/utils/tracefile.cc +++ b/src/systemc/utils/tracefile.cc @@ -32,7 +32,6 @@ #include #include -#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 83e6b50e88..ff9290701f 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 f96e60487d..0000000000 --- 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