diff options
42 files changed, 112 insertions, 83 deletions
diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis.hh b/src/systemc/ext/tlm_core/1/analysis/analysis.hh index 13858aca3..83f33539e 100644 --- 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 33cbc1179..36283dd00 100644 --- 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 880f1c186..46f91807d 100644 --- 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 21ad261fa..5449dbe49 100644 --- 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 0461a3a2b..bbe5af7e3 100644 --- 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 0e451aac8..8becac6e5 100644 --- 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 d1ce4835b..7a0c8d564 100644 --- 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 196a72e7d..ab1adf2fb 100644 --- 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 bb05a2101..5c88495f9 100644 --- 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 b6d06cef8..9f4034e79 100644 --- 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 04c28ce60..59cc9e5f8 100644 --- 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 a56118b3f..49e5ed08a 100644 --- 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 65964d3d2..0a9311d50 100644 --- 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 30acf829b..f5b7f7a02 100644 --- 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 07dcef74c..05d2f652a 100644 --- 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 4e03bb907..0d0e4df1a 100644 --- 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 80ceb6a20..63db3a76b 100644 --- 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 b00f0990c..9450993ac 100644 --- 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 76946532d..51621f4f8 100644 --- 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 888683473..6bd5b5687 100644 --- 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 5b6e267d1..ab9a5b117 100644 --- 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 b46047e63..9d5340033 100644 --- 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 a494b683f..fd2e277c1 100644 --- 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 a7c53cc33..71fbf1b90 100644 --- 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 781c51a26..7a2ea308a 100644 --- 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 4ca31c9b9..5a0e5ff9e 100644 --- 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 8cbfee8d2..8f67f1bdc 100644 --- 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 4b77ddc0b..01688a564 100644 --- 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 7e931e200..a391091a6 100644 --- 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 a136141cf..4dddac614 100644 --- 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 95ca56adb..e7fb589e1 100644 --- 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 2e7de85d6..3dfc837f5 100644 --- 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 e924aedce..5d87e8b0b 100644 --- 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 a341c05cf..b406e6a4d 100644 --- 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 abeb510e3..6b1dbbf0d 100644 --- 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 7830e2a8b..617ef7c80 100644 --- 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 bad46ad11..0a394dde2 100644 --- 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 b42bdb836..8397e85b9 100644 --- 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 8f9172296..8f558f4e0 100644 --- 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 69a68aa9c..bb09e863a 100644 --- 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 ba38d6c79..93b814c56 100644 --- 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 91610dd02..62c6aa0da 100644 --- 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 |