Browse Source

Fixed include scheme to first look at local dir

pull/3/head
Eyck Jentzsch 1 year ago
parent
commit
9f6fe12b4a

+ 1
- 1
incl/scc/configurable_tracer.h View File

@@ -23,7 +23,7 @@
#ifndef _SCC_CONFIGURABLE_TRACER_H_
#define _SCC_CONFIGURABLE_TRACER_H_

#include "scc/tracer.h"
#include "tracer.h"
#include <cci_configuration>

namespace scc {

+ 2
- 2
incl/scc/configurer.h View File

@@ -23,8 +23,8 @@
#ifndef _SYSC_CONFIGURER_H_
#define _SYSC_CONFIGURER_H_

#include "scc/report.h"
#include "scc/utilities.h"
#include "report.h"
#include "utilities.h"
#include <cci_configuration>
#include <json/json.h>


+ 2
- 2
incl/scc/ext_attribute.h View File

@@ -23,8 +23,8 @@
#ifndef _SYSC_EXT_ATTRIBUTE_H_
#define _SYSC_EXT_ATTRIBUTE_H_

#include "scc/configurer.h"
#include "scc/utilities.h"
#include "configurer.h"
#include "utilities.h"

namespace scc {
template <typename T> class ext_attribute : public sc_core::sc_attribute<T> {

+ 1
- 1
incl/scc/initiator_mixin.h View File

@@ -19,7 +19,7 @@

#include <functional>
#include <sstream>
#include "scc/utilities.h"
#include "utilities.h"
#include <tlm>

namespace scc {

+ 3
- 3
incl/scc/memory.h View File

@@ -26,9 +26,9 @@
// Needed for the simple_target_socket
#define SC_INCLUDE_DYNAMIC_PROCESSES

#include "scc/report.h"
#include "scc/target_mixin.h"
#include "scc/utilities.h"
#include "report.h"
#include "target_mixin.h"
#include "utilities.h"
#include <tlm.h>
#include <util/sparse_array.h>


+ 3
- 3
incl/scc/register.h View File

@@ -28,9 +28,9 @@
#include <functional>
#include <limits>
#include <sstream>
#include "scc/resetable.h"
#include "scc/resource_access_if.h"
#include "scc/utilities.h"
#include "resetable.h"
#include "resource_access_if.h"
#include "utilities.h"
#include "util/delegate.h"

namespace scc {

+ 2
- 1
incl/scc/report.h View File

@@ -24,7 +24,7 @@
#define _SYSC_REPORT_H_

#include <sysc/utils/sc_report.h>
#include "scc/utilities.h"
#include "utilities.h"
#include <util/logging.h>
#include <sysc/kernel/sc_time.h>
#include <iomanip>
@@ -77,6 +77,7 @@ protected:
#define SCINFO(...) if (::sc_core::sc_report_handler::get_verbosity_level() >= sc_core::SC_MEDIUM) ::scc::ScLogger<::sc_core::SC_INFO>(__FILE__,__LINE__, sc_core::SC_MEDIUM).type(__VA_ARGS__).get()
#define SCWARN(...) ::scc::ScLogger<::sc_core::SC_WARNING>(__FILE__,__LINE__,sc_core::SC_MEDIUM).type(__VA_ARGS__).get()
#define SCERR(...) ::scc::ScLogger<::sc_core::SC_ERROR>(__FILE__,__LINE__,sc_core::SC_MEDIUM).type(__VA_ARGS__).get()
#define SCFATAL(...) ::scc::ScLogger<::sc_core::SC_FATAL>(__FILE__,__LINE__,sc_core::SC_MEDIUM).type(__VA_ARGS__).get()

}


+ 1
- 1
incl/scc/resetable.h View File

@@ -24,7 +24,7 @@
#define _SYSC_RESETTABLE_H_

#include <vector>
#include "scc/resource_access_if.h"
#include "resource_access_if.h"

namespace scc {


+ 3
- 3
incl/scc/router.h View File

@@ -24,11 +24,11 @@
#define _SYSC_ROUTER_H_

#include "util/range_lut.h"
#include "scc/utilities.h"
#include "utilities.h"
#include "scv4tlm/tlm_rec_initiator_socket.h"
#include "scv4tlm/tlm_rec_target_socket.h"
#include "scc/initiator_mixin.h"
#include "scc/target_mixin.h"
#include "initiator_mixin.h"
#include "target_mixin.h"
#include <sysc/utils/sc_vector.h>
#include <tlm.h>
#include <limits>

+ 1
- 1
incl/scc/signal_initiator_mixin.h View File

@@ -17,7 +17,7 @@
#ifndef __SIGNAL_INITIATOR_MIXIN_H__
#define __SIGNAL_INITIATOR_MIXIN_H__

#include "scc/utilities.h"
#include "utilities.h"
#include <tlm/tlm_signal.h>
#include <functional>
#include <sstream>

+ 1
- 1
incl/scc/signal_target_mixin.h View File

@@ -16,7 +16,7 @@
#ifndef __SIGNAL_TARGET_MIXIN_H__
#define __SIGNAL_TARGET_MIXIN_H__

#include "scc/utilities.h"
#include "utilities.h"
#include <tlm/tlm_signal.h>
#include <functional>
#include <sstream>

+ 1
- 1
incl/scc/tagged_initiator_mixin.h View File

@@ -19,7 +19,7 @@

#include <functional>
#include <sstream>
#include "scc/utilities.h"
#include "utilities.h"
#include <tlm>

namespace scc {

+ 1
- 1
incl/scc/tagged_target_mixin.h View File

@@ -21,7 +21,7 @@
#endif

#include <sstream>
#include "scc/utilities.h"
#include "utilities.h"
#include <tlm>
#include <tlm_utils/peq_with_get.h>


+ 1
- 1
incl/scc/target_mixin.h View File

@@ -21,7 +21,7 @@
#endif

#include <sstream>
#include "scc/utilities.h"
#include "utilities.h"
#include <tlm>
#include <tlm_utils/peq_with_get.h>


+ 1
- 1
incl/scc/time2tick.h View File

@@ -8,7 +8,7 @@
#ifndef _SCC_TIME2TICK_H_
#define _SCC_TIME2TICK_H_

#include <scc/utilities.h>
#include "utilities.h"

class time2tick: public sc_core::sc_module {
SC_HAS_PROCESS(time2tick);

+ 3
- 3
incl/scc/tlm_target.h View File

@@ -23,11 +23,11 @@
#ifndef _SYSC_TLM_TARGET_H_
#define _SYSC_TLM_TARGET_H_

#include "scc/utilities.h"
#include "utilities.h"
#include "scv4tlm/tlm_rec_target_socket.h"
#include "util/range_lut.h"
#include "scc/resource_access_if.h"
#include "scc/target_mixin.h"
#include "resource_access_if.h"
#include "target_mixin.h"
#include <array>

namespace scc {

+ 1
- 1
incl/scc/tracer.h View File

@@ -23,7 +23,7 @@
#ifndef _SCC_TRACER_H_
#define _SCC_TRACER_H_

#include "scc/utilities.h"
#include "utilities.h"
#ifdef WITH_SCV
#include <scv.h>
#endif

+ 1
- 1
incl/scc/utilities.h View File

@@ -23,7 +23,7 @@
#ifndef _SYSC_UTILITIES_H_
#define _SYSC_UTILITIES_H_

#include "scc/traceable.h"
#include "traceable.h"

// pragmas to disable the deprecated warnings for SystemC headers
#pragma GCC diagnostic push

Loading…
Cancel
Save