Browse Source

Fixed include scheme to first look at local dir

Eyck Jentzsch 1 year ago
parent
commit
9f6fe12b4a

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

@@ -23,7 +23,7 @@
23 23
 #ifndef _SCC_CONFIGURABLE_TRACER_H_
24 24
 #define _SCC_CONFIGURABLE_TRACER_H_
25 25
 
26
-#include "scc/tracer.h"
26
+#include "tracer.h"
27 27
 #include <cci_configuration>
28 28
 
29 29
 namespace scc {

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

@@ -23,8 +23,8 @@
23 23
 #ifndef _SYSC_CONFIGURER_H_
24 24
 #define _SYSC_CONFIGURER_H_
25 25
 
26
-#include "scc/report.h"
27
-#include "scc/utilities.h"
26
+#include "report.h"
27
+#include "utilities.h"
28 28
 #include <cci_configuration>
29 29
 #include <json/json.h>
30 30
 

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

@@ -23,8 +23,8 @@
23 23
 #ifndef _SYSC_EXT_ATTRIBUTE_H_
24 24
 #define _SYSC_EXT_ATTRIBUTE_H_
25 25
 
26
-#include "scc/configurer.h"
27
-#include "scc/utilities.h"
26
+#include "configurer.h"
27
+#include "utilities.h"
28 28
 
29 29
 namespace scc {
30 30
 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 @@
19 19
 
20 20
 #include <functional>
21 21
 #include <sstream>
22
-#include "scc/utilities.h"
22
+#include "utilities.h"
23 23
 #include <tlm>
24 24
 
25 25
 namespace scc {

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

@@ -26,9 +26,9 @@
26 26
 // Needed for the simple_target_socket
27 27
 #define SC_INCLUDE_DYNAMIC_PROCESSES
28 28
 
29
-#include "scc/report.h"
30
-#include "scc/target_mixin.h"
31
-#include "scc/utilities.h"
29
+#include "report.h"
30
+#include "target_mixin.h"
31
+#include "utilities.h"
32 32
 #include <tlm.h>
33 33
 #include <util/sparse_array.h>
34 34
 

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

@@ -28,9 +28,9 @@
28 28
 #include <functional>
29 29
 #include <limits>
30 30
 #include <sstream>
31
-#include "scc/resetable.h"
32
-#include "scc/resource_access_if.h"
33
-#include "scc/utilities.h"
31
+#include "resetable.h"
32
+#include "resource_access_if.h"
33
+#include "utilities.h"
34 34
 #include "util/delegate.h"
35 35
 
36 36
 namespace scc {

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

@@ -24,7 +24,7 @@
24 24
 #define _SYSC_REPORT_H_
25 25
 
26 26
 #include <sysc/utils/sc_report.h>
27
-#include "scc/utilities.h"
27
+#include "utilities.h"
28 28
 #include <util/logging.h>
29 29
 #include <sysc/kernel/sc_time.h>
30 30
 #include <iomanip>
@@ -77,6 +77,7 @@ protected:
77 77
 #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()
78 78
 #define SCWARN(...)   ::scc::ScLogger<::sc_core::SC_WARNING>(__FILE__,__LINE__,sc_core::SC_MEDIUM).type(__VA_ARGS__).get()
79 79
 #define SCERR(...)    ::scc::ScLogger<::sc_core::SC_ERROR>(__FILE__,__LINE__,sc_core::SC_MEDIUM).type(__VA_ARGS__).get()
80
+#define SCFATAL(...)    ::scc::ScLogger<::sc_core::SC_FATAL>(__FILE__,__LINE__,sc_core::SC_MEDIUM).type(__VA_ARGS__).get()
80 81
 
81 82
 }
82 83
 

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

@@ -24,7 +24,7 @@
24 24
 #define _SYSC_RESETTABLE_H_
25 25
 
26 26
 #include <vector>
27
-#include "scc/resource_access_if.h"
27
+#include "resource_access_if.h"
28 28
 
29 29
 namespace scc {
30 30
 

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

@@ -24,11 +24,11 @@
24 24
 #define _SYSC_ROUTER_H_
25 25
 
26 26
 #include "util/range_lut.h"
27
-#include "scc/utilities.h"
27
+#include "utilities.h"
28 28
 #include "scv4tlm/tlm_rec_initiator_socket.h"
29 29
 #include "scv4tlm/tlm_rec_target_socket.h"
30
-#include "scc/initiator_mixin.h"
31
-#include "scc/target_mixin.h"
30
+#include "initiator_mixin.h"
31
+#include "target_mixin.h"
32 32
 #include <sysc/utils/sc_vector.h>
33 33
 #include <tlm.h>
34 34
 #include <limits>

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

@@ -17,7 +17,7 @@
17 17
 #ifndef __SIGNAL_INITIATOR_MIXIN_H__
18 18
 #define __SIGNAL_INITIATOR_MIXIN_H__
19 19
 
20
-#include "scc/utilities.h"
20
+#include "utilities.h"
21 21
 #include <tlm/tlm_signal.h>
22 22
 #include <functional>
23 23
 #include <sstream>

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

@@ -16,7 +16,7 @@
16 16
 #ifndef __SIGNAL_TARGET_MIXIN_H__
17 17
 #define __SIGNAL_TARGET_MIXIN_H__
18 18
 
19
-#include "scc/utilities.h"
19
+#include "utilities.h"
20 20
 #include <tlm/tlm_signal.h>
21 21
 #include <functional>
22 22
 #include <sstream>

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

@@ -19,7 +19,7 @@
19 19
 
20 20
 #include <functional>
21 21
 #include <sstream>
22
-#include "scc/utilities.h"
22
+#include "utilities.h"
23 23
 #include <tlm>
24 24
 
25 25
 namespace scc {

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

@@ -21,7 +21,7 @@
21 21
 #endif
22 22
 
23 23
 #include <sstream>
24
-#include "scc/utilities.h"
24
+#include "utilities.h"
25 25
 #include <tlm>
26 26
 #include <tlm_utils/peq_with_get.h>
27 27
 

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

@@ -21,7 +21,7 @@
21 21
 #endif
22 22
 
23 23
 #include <sstream>
24
-#include "scc/utilities.h"
24
+#include "utilities.h"
25 25
 #include <tlm>
26 26
 #include <tlm_utils/peq_with_get.h>
27 27
 

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

@@ -8,7 +8,7 @@
8 8
 #ifndef _SCC_TIME2TICK_H_
9 9
 #define _SCC_TIME2TICK_H_
10 10
 
11
-#include <scc/utilities.h>
11
+#include "utilities.h"
12 12
 
13 13
 class time2tick: public sc_core::sc_module {
14 14
     SC_HAS_PROCESS(time2tick);

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

@@ -23,11 +23,11 @@
23 23
 #ifndef _SYSC_TLM_TARGET_H_
24 24
 #define _SYSC_TLM_TARGET_H_
25 25
 
26
-#include "scc/utilities.h"
26
+#include "utilities.h"
27 27
 #include "scv4tlm/tlm_rec_target_socket.h"
28 28
 #include "util/range_lut.h"
29
-#include "scc/resource_access_if.h"
30
-#include "scc/target_mixin.h"
29
+#include "resource_access_if.h"
30
+#include "target_mixin.h"
31 31
 #include <array>
32 32
 
33 33
 namespace scc {

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

@@ -23,7 +23,7 @@
23 23
 #ifndef _SCC_TRACER_H_
24 24
 #define _SCC_TRACER_H_
25 25
 
26
-#include "scc/utilities.h"
26
+#include "utilities.h"
27 27
 #ifdef WITH_SCV
28 28
 #include <scv.h>
29 29
 #endif

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

@@ -23,7 +23,7 @@
23 23
 #ifndef _SYSC_UTILITIES_H_
24 24
 #define _SYSC_UTILITIES_H_
25 25
 
26
-#include "scc/traceable.h"
26
+#include "traceable.h"
27 27
 
28 28
 // pragmas to disable the deprecated warnings for SystemC headers
29 29
 #pragma GCC diagnostic push