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>

17 files changed, 1 insertions, 17 deletions

diff --git a/src/systemc/core/event.cc b/src/systemc/core/event.cc
index 1c966d815..a80dd2c0e 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 e67aa167c..8801c7303 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 e29cee030..193056f67 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 37a6575de..b7c0a1eba 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 0eeae038f..75d5c8978 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 a2cee316c..0ace0310b 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 88b448742..33ab2d6e2 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 bc7441d6e..8bd67303c 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 ae2580639..5d9e3da15 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 27d115c95..1b28890a8 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 c2e27610b..7c126bc7f 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 5dacc7f2f..cbf96b0a9 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 9fd8efc40..56631fe99 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 58bf3c9db..715177f7b 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 3a085e5ab..f8cf3eb44 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 2dbc648f3..5c72927da 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 75128cb7f..0221188b2 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"