systemc: Fix TLM related includes.

There are a couple things this CL fixes related to the TLM #includes.

1. Removes #includes of <systemc> and <tlm>. These bring in a header
file from boost which shouldn't be necessary but which some of the
tests (and likely some external code) depends on. We avoid including
those in files built into gem5 itself so that gem5 isn't dependent on
boost.

2. All includes in ext should be relative. That way those headers can
be removed from gem5 and still build, allowing them to be moved over
to or referenced from a foreign codebase which isn't part of gem5.

Change-Id: I76e267385b48cb4fe93aea89ec8319c76465a0a4
Reviewed-on: https://gem5-review.googlesource.com/c/15796
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>

diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis.hh b/src/systemc/ext/tlm_core/1/analysis/analysis.hh
index 13858aca3ec83fef46ce7440343d71d82c780c9a..83f33539e54b4067b028faf70a5afbbbf25830f1 100644 (file)
--- a/src/systemc/ext/tlm_core/1/analysis/analysis.hh
+++ b/src/systemc/ext/tlm_core/1/analysis/analysis.hh
@@ -20,10 +20,10 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_HH__
 #define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_HH__
 
-#include "tlm_core/1/analysis/analysis_fifo.hh"
-#include "tlm_core/1/analysis/analysis_if.hh"
-#include "tlm_core/1/analysis/analysis_port.hh"
-#include "tlm_core/1/analysis/analysis_triple.hh"
-#include "tlm_core/1/analysis/write_if.hh"
+#include "analysis_fifo.hh"
+#include "analysis_if.hh"
+#include "analysis_port.hh"
+#include "analysis_triple.hh"
+#include "write_if.hh"
 
 #endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_HH__ */

diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh b/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh
index 33cbc1179802b25a66322fb886c1888c9a8c45d4..36283dd00ec7c6eb6c0f14e3d1508608a494f868 100644 (file)
--- a/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh
+++ b/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh
@@ -20,9 +20,9 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_HH__
 #define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_HH__
 
-#include "tlm_core/1/analysis/analysis_if.hh"
-#include "tlm_core/1/analysis/analysis_triple.hh"
-#include "tlm_core/1/req_rsp/channels/fifo/fifo.hh"
+#include "../req_rsp/channels/fifo/fifo.hh"
+#include "analysis_if.hh"
+#include "analysis_triple.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_if.hh b/src/systemc/ext/tlm_core/1/analysis/analysis_if.hh
index 880f1c186dd4de2261784e995e2e949d7aa11cbf..46f91807daa6fec2ef97bd046afeb07451074c81 100644 (file)
--- a/src/systemc/ext/tlm_core/1/analysis/analysis_if.hh
+++ b/src/systemc/ext/tlm_core/1/analysis/analysis_if.hh
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_HH__
 #define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_HH__
 
-#include "tlm_core/1/analysis/write_if.hh"
+#include "write_if.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_port.hh b/src/systemc/ext/tlm_core/1/analysis/analysis_port.hh
index 21ad261fa97189d97aee2fc3781e203975255e8d..5449dbe49d1da6a568f9363125b6791f92327535 100644 (file)
--- a/src/systemc/ext/tlm_core/1/analysis/analysis_port.hh
+++ b/src/systemc/ext/tlm_core/1/analysis/analysis_port.hh
@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <deque>
 
-#include "tlm_core/1/analysis/analysis_if.hh"
+#include "analysis_if.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/analysis/write_if.hh b/src/systemc/ext/tlm_core/1/analysis/write_if.hh
index 0461a3a2b106f19756db27823bb5ceea062313a0..bbe5af7e3f09b59f29484469065cd274201409af 100644 (file)
--- a/src/systemc/ext/tlm_core/1/analysis/write_if.hh
+++ b/src/systemc/ext/tlm_core/1/analysis/write_if.hh
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_HH__
 #define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_HH__
 
-#include <systemc>
+#include "../../../core/sc_interface.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh b/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh
index 0e451aac886ee150a3885ba0f5ecb6688c31b020..8becac6e583430b0974a44b4a8310bc5ddb3132a 100644 (file)
--- a/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_HH__
 #define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh"
+#include "../interfaces/master_slave_ifs.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh
index d1ce4835ba23caed7a6cc3299179596c95ba8979..7a0c8d564e5c569e1c4770450c5031dd695460d5 100644 (file)
--- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh
@@ -34,8 +34,8 @@
 // actual physical buffer.
 //
 
-#include "tlm_core/1/req_rsp/channels/fifo/circular_buffer.hh"
-#include "tlm_core/1/req_rsp/interfaces/fifo_ifs.hh"
+#include "../../interfaces/fifo_ifs.hh"
+#include "circular_buffer.hh"
 
 namespace tlm
 {
@@ -223,8 +223,8 @@ tlm_fifo<T>::update()
 
 } // namespace tlm
 
-#include "tlm_core/1/req_rsp/channels/fifo/fifo_peek.hh"
-#include "tlm_core/1/req_rsp/channels/fifo/fifo_put_get.hh"
-#include "tlm_core/1/req_rsp/channels/fifo/fifo_resize.hh"
+#include "fifo_peek.hh"
+#include "fifo_put_get.hh"
+#include "fifo_resize.hh"
 
 #endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_HH__ */

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh
index 196a72e7d5b4e5ae7cc2baa422aef32e5941c909..ab1adf2fbaae04160fab3420412e38972eef3daa 100644 (file)
--- a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh
@@ -22,9 +22,9 @@
 #define \
     __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_HH__
 
-#include "tlm_core/1/req_rsp/adapters/adapters.hh"
-#include "tlm_core/1/req_rsp/channels/fifo/fifo.hh"
-#include "tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.hh"
+#include "../../adapters/adapters.hh"
+#include "../fifo/fifo.hh"
+#include "put_get_imp.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh
index bb05a21017bf16c5692071d6566396074cba41aa..5c88495f966e025c5955904176cc1ac8a8dcf213 100644 (file)
--- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_HH__
 #define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/tag.hh"
+#include "tag.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh
index b6d06cef8155bfdd563b65faeb523ea2d28e7022..9f4034e7961e196fb019457036d641ae21d386d8 100644 (file)
--- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_HH__
 #define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh"
+#include "core_ifs.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh
index 04c28ce607cbf3832d61234f346452944b8c422f..59cc9e5f81af45caf3435bb3e3deca74a2f7c608 100644 (file)
--- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh
@@ -20,7 +20,7 @@
 #ifndef __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_HH__
 #define __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh"
+#include "core_ifs.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
index a56118b3fb5659a4b7a631f822ab1df84d992e32..49e5ed08ad6cf2bbd8f9c427c9c4cb3755651f68 100644 (file)
--- a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
@@ -22,7 +22,7 @@
 
 #include <sstream>
 
-#include "tlm_core/1/req_rsp/interfaces/tag.hh"
+#include "../interfaces/tag.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh b/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh
index 65964d3d293db54a0e7c9cfd27cf24ee3ec82a6f..0a9311d50eceea968abb62d8858119041e4baf51 100644 (file)
--- a/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh
@@ -20,8 +20,8 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_HH__
 #define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh"
-#include "tlm_core/1/req_rsp/ports/event_finder.hh"
+#include "../interfaces/core_ifs.hh"
+#include "event_finder.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh b/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh
index 30acf829b48830a21bacf7e1171f61617ac46851..f5b7f7a02f74986f1cde7940c8e6f93792c2fae0 100644 (file)
--- a/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh
@@ -22,15 +22,15 @@
 
 // The unannotated TLM interfaces.
 
-#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh"
-#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh"
+#include "interfaces/core_ifs.hh"
+#include "interfaces/master_slave_ifs.hh"
 
 // The channels : tlm_fifo, tlm_transport_channel and tlm_req_rsp_channel.
 
-#include "tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh"
+#include "channels/req_rsp_channels/req_rsp_channels.hh"
 
 // Some non blocking ports to provide static sensitivity.
 
-#include "tlm_core/1/req_rsp/ports/nonblocking_port.hh"
+#include "ports/nonblocking_port.hh"
 
 #endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_HH__ */

diff --git a/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh
index 07dcef74c56175d533b7e618ee1eea825f688ec8..05d2f652a3884f104aff59fd1755c492d755eb61 100644 (file)
--- a/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh
+++ b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh
@@ -23,7 +23,7 @@
 
 #include <cstring> // std::memset
 
-#include "tlm_core/2/generic_payload/gp.hh"
+#include "gp.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh b/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh
index 4e03bb9071396bf37501f87d43300b286052d25d..0d0e4df1a7545b1467a1b1c271ddff46556d7486 100644 (file)
--- a/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh
+++ b/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh
@@ -20,9 +20,9 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__
 #define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__
 
-#include "tlm_core/2/generic_payload/endian_conv.hh"
-#include "tlm_core/2/generic_payload/gp.hh"
-#include "tlm_core/2/generic_payload/helpers.hh"
-#include "tlm_core/2/generic_payload/phase.hh"
+#include "endian_conv.hh"
+#include "gp.hh"
+#include "helpers.hh"
+#include "phase.hh"
 
 #endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__ */

diff --git a/src/systemc/ext/tlm_core/2/generic_payload/gp.hh b/src/systemc/ext/tlm_core/2/generic_payload/gp.hh
index 80ceb6a205c7094dd1f514e76ed59197dfcf1ebe..63db3a76bd2ec80d92207962ebe1be0fbefd9587 100644 (file)
--- a/src/systemc/ext/tlm_core/2/generic_payload/gp.hh
+++ b/src/systemc/ext/tlm_core/2/generic_payload/gp.hh
@@ -20,10 +20,10 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__
 #define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__
 
-#include <systemc>
 #include <typeinfo> // std::type_info
 
-#include "tlm_core/2/generic_payload/array.hh"
+#include "../../../utils/sc_report_handler.hh" // sc_assert
+#include "array.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/2/interfaces/dmi.hh b/src/systemc/ext/tlm_core/2/interfaces/dmi.hh
index b00f0990cc16d1eb674a27b2c80fcd43b149fb46..9450993ac3a6a2eae3616b6f50e8685a56eff472 100644 (file)
--- a/src/systemc/ext/tlm_core/2/interfaces/dmi.hh
+++ b/src/systemc/ext/tlm_core/2/interfaces/dmi.hh
@@ -20,7 +20,8 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__
 #define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__
 
-#include <systemc>
+#include "../../../core/sc_time.hh"
+#include "../../../dt/int/sc_nbdefs.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh
index 76946532d8a39e86fe93912fb37595e936524c4f..51621f4f8bbdee2bece6c126aa6163f3ee793ed3 100644 (file)
--- a/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh
+++ b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh
@@ -20,10 +20,10 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__
 #define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__
 
-#include <systemc>
-
-#include "tlm_core/2/generic_payload/generic_payload.hh"
-#include "tlm_core/2/interfaces/dmi.hh"
+#include "../../../core/sc_interface.hh"
+#include "../../../core/sc_time.hh"
+#include "../generic_payload/generic_payload.hh"
+#include "dmi.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh b/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh
index 88868347312d79b759d279b7f7da7d6d6cf552a1..6bd5b5687b5350f59ca99705d28d4168e5bdb6cc 100644 (file)
--- a/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh
+++ b/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__
 #define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__
 
-#include "tlm_core/2/interfaces/dmi.hh"
-#include "tlm_core/2/interfaces/fw_bw_ifs.hh"
+#include "dmi.hh"
+#include "fw_bw_ifs.hh"
 
 #endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__ */

diff --git a/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh b/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh
index 5b6e267d1b2fec483762de709ea4e2f85e6976ae..ab9a5b1178931bfa41d6904595f4e2961bfaf694 100644 (file)
--- a/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh
+++ b/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__
 #define __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__
 
-#include <systemc>
+#include "../../../core/sc_time.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/2/quantum/quantum.hh b/src/systemc/ext/tlm_core/2/quantum/quantum.hh
index b46047e63cecd937ae2f05f94a2b6e9ebcb36e99..9d53400332d86212cdcb6f0a3333e5588d5fb5d4 100644 (file)
--- a/src/systemc/ext/tlm_core/2/quantum/quantum.hh
+++ b/src/systemc/ext/tlm_core/2/quantum/quantum.hh
@@ -20,6 +20,6 @@
 #ifndef ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__
 #define ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__
 
-#include "tlm_core/2/quantum/global_quantum.hh"
+#include "global_quantum.hh"
 
 #endif /* ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__ */

diff --git a/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh b/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh
index a494b683fda0db8f17117cd9c8c10be03f3e1ac8..fd2e277c16bb47be108fd33545fb726818bd79db 100644 (file)
--- a/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh
+++ b/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh
@@ -20,9 +20,11 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_BASE_SOCKET_IF_H__
 #define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_BASE_SOCKET_IF_H__
 
-#include <systemc>
 #include <typeindex>
 
+#include "../../../core/sc_export.hh"
+#include "../../../core/sc_port.hh"
+
 namespace tlm
 {
 

diff --git a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh
index a7c53cc335c8d28fd155c18b3c95b8f8884084a8..71fbf1b90094b52f2611f389d97eee925f6ee9c8 100644 (file)
--- a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh
+++ b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh
@@ -22,8 +22,8 @@
 
 #include <typeindex>
 
-#include "tlm_core/2/interfaces/fw_bw_ifs.hh"
-#include "tlm_core/2/sockets/base_socket_if.hh"
+#include "../interfaces/fw_bw_ifs.hh"
+#include "base_socket_if.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_core/2/sockets/sockets.hh b/src/systemc/ext/tlm_core/2/sockets/sockets.hh
index 781c51a26c3bb29e24534633316b063109259313..7a2ea308a0972515c20898c611dafacd02b405d3 100644 (file)
--- a/src/systemc/ext/tlm_core/2/sockets/sockets.hh
+++ b/src/systemc/ext/tlm_core/2/sockets/sockets.hh
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__
 #define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__
 
-#include "tlm_core/2/sockets/initiator_socket.hh"
-#include "tlm_core/2/sockets/target_socket.hh"
+#include "initiator_socket.hh"
+#include "target_socket.hh"
 
 #endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__ */

diff --git a/src/systemc/ext/tlm_core/2/sockets/target_socket.hh b/src/systemc/ext/tlm_core/2/sockets/target_socket.hh
index 4ca31c9b9a9a4bec9da4a3a532b3a2c8315da0f7..5a0e5ff9ef404adb844878890e043a1aa7100d16 100644 (file)
--- a/src/systemc/ext/tlm_core/2/sockets/target_socket.hh
+++ b/src/systemc/ext/tlm_core/2/sockets/target_socket.hh
@@ -22,8 +22,8 @@
 
 #include <typeindex>
 
-#include "tlm_core/2/interfaces/fw_bw_ifs.hh"
-#include "tlm_core/2/sockets/base_socket_if.hh"
+#include "../interfaces/fw_bw_ifs.hh"
+#include "base_socket_if.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/ext/tlm_utils/convenience_socket_bases.h b/src/systemc/ext/tlm_utils/convenience_socket_bases.h
index 8cbfee8d20e8804cca19cbdb0b610100d30aeeba..8f67f1bdc37d0b1ba2ef7ec57c123787dce718e8 100644 (file)
--- a/src/systemc/ext/tlm_utils/convenience_socket_bases.h
+++ b/src/systemc/ext/tlm_utils/convenience_socket_bases.h
@@ -19,8 +19,6 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_CONVENIENCE_SOCKET_BASES_H__
 #define __SYSTEMC_EXT_TLM_UTILS_CONVENIENCE_SOCKET_BASES_H__
 
-#include <systemc>
-
 namespace sc_core
 {
 

diff --git a/src/systemc/ext/tlm_utils/instance_specific_extensions.h b/src/systemc/ext/tlm_utils/instance_specific_extensions.h
index 4b77ddc0bcc7708ed723ea98877018687582aef2..01688a564c7d484e85cf66d8166682ece1ac3188 100644 (file)
--- a/src/systemc/ext/tlm_utils/instance_specific_extensions.h
+++ b/src/systemc/ext/tlm_utils/instance_specific_extensions.h
@@ -47,7 +47,7 @@ the extension before/after setting/clearing the extension.
 #ifndef __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_H__
 #define __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_H__
 
-#include "tlm_utils/instance_specific_extensions_int.h"
+#include "instance_specific_extensions_int.h"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h b/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h
index 7e931e200b4c30d1635430a5062b11d1e0d9e340..a391091a6acdc143b82bfc08d4d2a14d01ccda63 100644 (file)
--- a/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h
+++ b/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h
@@ -19,7 +19,9 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_INT_H__
 #define __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_INT_H__
 
-#include <tlm>
+#include <vector>
+
+#include "../tlm_core/2/generic_payload/array.hh"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/ext/tlm_utils/multi_passthrough_target_socket.h b/src/systemc/ext/tlm_utils/multi_passthrough_target_socket.h
index a136141cf904b80cc410e2fa8122b4d6743eddbe..4dddac6145ae63c200c623cfe458df1a5e1bbca7 100644 (file)
--- a/src/systemc/ext/tlm_utils/multi_passthrough_target_socket.h
+++ b/src/systemc/ext/tlm_utils/multi_passthrough_target_socket.h
@@ -19,7 +19,9 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_MULTI_PASSTHROUGH_TARGET_SOCKET_H__
 #define __SYSTEMC_EXT_TLM_UTILS_MULTI_PASSTHROUGH_TARGET_SOCKET_H__
 
-#include "tlm_utils/multi_socket_bases.h"
+#include "../core/sc_module.hh"
+#include "../core/sc_port.hh"
+#include "multi_socket_bases.h"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/ext/tlm_utils/multi_socket_bases.h b/src/systemc/ext/tlm_utils/multi_socket_bases.h
index 95ca56adbf2773ecb3c04e8fcbb8c9558d2cb549..e7fb589e1dd6dc8b81e908fd65c634b744760852 100644 (file)
--- a/src/systemc/ext/tlm_utils/multi_socket_bases.h
+++ b/src/systemc/ext/tlm_utils/multi_socket_bases.h
@@ -21,8 +21,10 @@
 #define __SYSTEMC_EXT_TLM_UTILS_MULTI_SOCKET_BASES_H__
 
 #include <map>
-#include <tlm>
-#include "tlm_utils/convenience_socket_bases.h"
+
+#include "../core/sc_port.hh"
+#include "../tlm_core/2/interfaces/fw_bw_ifs.hh"
+#include "convenience_socket_bases.h"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/ext/tlm_utils/passthrough_target_socket.h b/src/systemc/ext/tlm_utils/passthrough_target_socket.h
index 2e7de85d61b194ffee8c563cda68cbd57a3c2285..3dfc837f5f020d91f07ef721db0f5d0b43ccc8d3 100644 (file)
--- a/src/systemc/ext/tlm_utils/passthrough_target_socket.h
+++ b/src/systemc/ext/tlm_utils/passthrough_target_socket.h
@@ -20,8 +20,11 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_PASSTHROUGH_TARGET_SOCKET_H__
 #define __SYSTEMC_EXT_TLM_UTILS_PASSTHROUGH_TARGET_SOCKET_H__
 
-#include <tlm>
-#include "tlm_utils/convenience_socket_bases.h"
+#include "../core/sc_port.hh"
+#include "../core/sc_time.hh"
+#include "../tlm_core/2/sockets/target_socket.hh"
+#include "../utils/sc_report_handler.hh"
+#include "convenience_socket_bases.h"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/ext/tlm_utils/peq_with_cb_and_phase.h b/src/systemc/ext/tlm_utils/peq_with_cb_and_phase.h
index e924aedceb39c1920021dc39bc502a0850920dbe..5d87e8b0bc53d3b5efaf8672e4bd858be4eb2580 100644 (file)
--- a/src/systemc/ext/tlm_utils/peq_with_cb_and_phase.h
+++ b/src/systemc/ext/tlm_utils/peq_with_cb_and_phase.h
@@ -20,10 +20,14 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_PEQ_WITH_CB_AND_PHASE_H__
 #define __SYSTEMC_EXT_TLM_UTILS_PEQ_WITH_CB_AND_PHASE_H__
 
-#include <systemc>
-#include <tlm>
 #include <vector>
 
+#include "../core/sc_main.hh"
+#include "../core/sc_object.hh"
+#include "../core/sc_spawn.hh"
+#include "../core/sc_time.hh"
+#include "../dt/int/sc_nbdefs.hh"
+
 namespace tlm_utils
 {
 

diff --git a/src/systemc/ext/tlm_utils/peq_with_get.h b/src/systemc/ext/tlm_utils/peq_with_get.h
index a341c05cfe99d20c600002e437a02b7d6178a610..b406e6a4d6a903b32e238fb4d13c1adda70ce83a 100644 (file)
--- a/src/systemc/ext/tlm_utils/peq_with_get.h
+++ b/src/systemc/ext/tlm_utils/peq_with_get.h
@@ -25,7 +25,11 @@
 #define __SYSTEMC_EXT_TLM_UTILS_PEQ_WITH_GET_H__
 
 #include <map>
-#include <systemc>
+
+#include "../core/sc_event.hh"
+#include "../core/sc_main.hh"
+#include "../core/sc_object.hh"
+#include "../core/sc_time.hh"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/ext/tlm_utils/simple_initiator_socket.h b/src/systemc/ext/tlm_utils/simple_initiator_socket.h
index abeb510e3598409b450be82f2144132aa6405b79..6b1dbbf0d6312b103951ce36f7cc2194f99a9629 100644 (file)
--- a/src/systemc/ext/tlm_utils/simple_initiator_socket.h
+++ b/src/systemc/ext/tlm_utils/simple_initiator_socket.h
@@ -20,9 +20,13 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_SIMPLE_INITIATOR_SOCKET_H__
 #define __SYSTEMC_EXT_TLM_UTILS_SIMPLE_INITIATOR_SOCKET_H__
 
-#include <tlm>
-
-#include "tlm_utils/convenience_socket_bases.h"
+#include "../core/sc_module.hh"
+#include "../core/sc_port.hh"
+#include "../tlm_core/2/generic_payload/gp.hh"
+#include "../tlm_core/2/interfaces/fw_bw_ifs.hh"
+#include "../tlm_core/2/sockets/initiator_socket.hh"
+#include "../utils/sc_report_handler.hh"
+#include "convenience_socket_bases.h"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/ext/tlm_utils/simple_target_socket.h b/src/systemc/ext/tlm_utils/simple_target_socket.h
index 7830e2a8b7d26a1d0b044241b9852c5697d7efc1..617ef7c80aed2d482687ba4c8173fd2125db5808 100644 (file)
--- a/src/systemc/ext/tlm_utils/simple_target_socket.h
+++ b/src/systemc/ext/tlm_utils/simple_target_socket.h
@@ -20,11 +20,15 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_SIMPLE_TARGET_SOCKET_H__
 #define __SYSTEMC_EXT_TLM_UTILS_SIMPLE_TARGET_SOCKET_H__
 
-#include <systemc>
-#include <tlm>
-
-#include "tlm_utils/convenience_socket_bases.h"
-#include "tlm_utils/peq_with_get.h"
+#include "../core/sc_event.hh"
+#include "../core/sc_module.hh"
+#include "../core/sc_port.hh"
+#include "../tlm_core/2/generic_payload/gp.hh"
+#include "../tlm_core/2/interfaces/fw_bw_ifs.hh"
+#include "../tlm_core/2/sockets/target_socket.hh"
+#include "../utils/sc_report_handler.hh"
+#include "convenience_socket_bases.h"
+#include "peq_with_get.h"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h b/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h
index bad46ad117adf57aadf7d223ef564280693718a4..0a394dde232001db75c7c5137bbd36447602f50b 100644 (file)
--- a/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h
+++ b/src/systemc/ext/tlm_utils/tlm_quantumkeeper.h
@@ -20,7 +20,7 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_TLM_QUANTUMKEEPER_H__
 #define __SYSTEMC_EXT_TLM_UTILS_TLM_QUANTUMKEEPER_H__
 
-#include <tlm>
+#include "../core/sc_time.hh"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/tlm_core/2/generic_payload/gp.cc b/src/systemc/tlm_core/2/generic_payload/gp.cc
index b42bdb836ed8990aad3e573f4965e650c04bfb6a..8397e85b9ba3eb122f53f015a1ca34f86ad0fe31 100644 (file)
--- a/src/systemc/tlm_core/2/generic_payload/gp.cc
+++ b/src/systemc/tlm_core/2/generic_payload/gp.cc
@@ -19,10 +19,10 @@
 
 #include <cstring>  // std::memcpy et.al.
 #include <map>
-#include <systemc>
-#include <tlm>
 #include <typeindex>
 
+#include "systemc/ext/tlm_core/2/generic_payload/gp.hh"
+
 namespace tlm
 {
 

diff --git a/src/systemc/tlm_core/2/generic_payload/phase.cc b/src/systemc/tlm_core/2/generic_payload/phase.cc
index 8f9172296f04b16a699e7d852181b58fca1e8ce9..8f558f4e06a3ed36474b895dfc5bf62961650897 100644 (file)
--- a/src/systemc/tlm_core/2/generic_payload/phase.cc
+++ b/src/systemc/tlm_core/2/generic_payload/phase.cc
@@ -20,10 +20,11 @@
 #include <cstring>
 #include <map>
 #include <string>
-#include <systemc>
-#include <tlm>
 #include <typeindex>
 
+#include "systemc/ext/tlm_core/2/generic_payload/phase.hh"
+#include "systemc/ext/utils/sc_report_handler.hh"
+
 namespace tlm
 {
 

diff --git a/src/systemc/tlm_core/2/quantum/global_quantum.cc b/src/systemc/tlm_core/2/quantum/global_quantum.cc
index 69a68aa9cd9b81ac60399f7d81b88688fa3a26c6..bb09e863aea5315d057b6af6c6c13c56df573e76 100644 (file)
--- a/src/systemc/tlm_core/2/quantum/global_quantum.cc
+++ b/src/systemc/tlm_core/2/quantum/global_quantum.cc
@@ -17,8 +17,9 @@
 
  *****************************************************************************/
 
-#include <systemc>
-#include <tlm>
+#include "systemc/ext/core/sc_main.hh"
+#include "systemc/ext/core/sc_time.hh"
+#include "systemc/ext/tlm_core/2/quantum/global_quantum.hh"
 
 namespace tlm
 {

diff --git a/src/systemc/tlm_utils/convenience_socket_bases.cc b/src/systemc/tlm_utils/convenience_socket_bases.cc
index ba38d6c79858a5dd4172fda3ac6ac67cb929a9db..93b814c56a29f201a8b031a34dcf566dd23da33d 100644 (file)
--- a/src/systemc/tlm_utils/convenience_socket_bases.cc
+++ b/src/systemc/tlm_utils/convenience_socket_bases.cc
@@ -20,7 +20,10 @@
 #include <tlm_utils/convenience_socket_bases.h>
 
 #include <sstream>
-#include <systemc>
+
+#include "systemc/ext/core/sc_object.hh"
+#include "systemc/ext/core/sc_simcontext.hh"
+#include "systemc/ext/utils/sc_report_handler.hh"
 
 namespace tlm_utils
 {

diff --git a/src/systemc/tlm_utils/instance_specific_extensions.cc b/src/systemc/tlm_utils/instance_specific_extensions.cc
index 91610dd02ffb8dcbc31959e1890515a483501370..62c6aa0da417a565b33cd3c4fea1edc8b8dceb10 100644 (file)
--- a/src/systemc/tlm_utils/instance_specific_extensions.cc
+++ b/src/systemc/tlm_utils/instance_specific_extensions.cc
@@ -21,8 +21,6 @@
 
 #include <iostream>
 #include <map>
-#include <systemc>
-#include <tlm>
 #include <typeindex>
 
 namespace tlm