Eyck Jentzsch 4 months ago
parent
commit
6558b1815b
4 changed files with 7 additions and 4 deletions
  1. 2
    0
      incl/scc.h
  2. 0
    2
      incl/scc/traceable.h
  3. 3
    2
      incl/scv4tlm/tlm_rec_target_socket.h
  4. 2
    0
      src/scv_tr_sqlite/scv_tr_sqlite.cpp

+ 2
- 0
incl/scc.h View File

@@ -36,8 +36,10 @@
36 36
 #include "scc/signal_initiator_mixin.h"
37 37
 #include "scc/signal_target_mixin.h"
38 38
 #include "scc/tagged_target_mixin.h"
39
+#ifdef WITH_CCI
39 40
 #include "scc/configurable_tracer.h"
40 41
 #include "scc/configurer.h"
42
+#endif
41 43
 #include "scc/ext_attribute.h"
42 44
 #include "scc/initiator_mixin.h"
43 45
 #include "scc/memory.h"

+ 0
- 2
incl/scc/traceable.h View File

@@ -17,8 +17,6 @@
17 17
 #ifndef _SCC_TRACABLE_H_
18 18
 #define _SCC_TRACABLE_H_
19 19
 
20
-#include <cci_cfg/cci_param_typed.h>
21
-
22 20
 namespace scc {
23 21
 /**
24 22
  * interface defining a traceable component, this overlaps with the trace function of sc_core::sc_object

+ 3
- 2
incl/scv4tlm/tlm_rec_target_socket.h View File

@@ -80,7 +80,7 @@ public:
80 80
                              POL
81 81
 #endif
82 82
                              >(name)
83
-    , recorder(gen_name(name, "tx").c_str()) {
83
+    , recorder(gen_name(name, "tx").c_str(), fw_port, this->get_base_port()) {
84 84
     }
85 85
 
86 86
     virtual ~tlm_rec_target_socket() = default;
@@ -105,7 +105,7 @@ public:
105 105
         export_type *exp = &this->get_base_export();
106 106
         if (this == exp) {
107 107
             export_type::bind(recorder); // non-virtual function call
108
-            recorder.fw_port(ifs);
108
+            fw_port(ifs);
109 109
             recorder.bw_port(this->get_base_port());
110 110
         } else {
111 111
             exp->bind(ifs);
@@ -121,6 +121,7 @@ public:
121 121
     }
122 122
 
123 123
 protected:
124
+    sc_core::sc_port<fw_interface_type> fw_port;
124 125
     scv4tlm::tlm2_recorder<TYPES> recorder;
125 126
 };
126 127
 #endif

+ 2
- 0
src/scv_tr_sqlite/scv_tr_sqlite.cpp View File

@@ -20,7 +20,9 @@
20 20
 #include <stdexcept>
21 21
 #include <string>
22 22
 #include <vector>
23
+#ifndef FMT_HEADER_ONLY
23 24
 #define FMT_HEADER_ONLY
25
+#endif
24 26
 #include <fmt/format.h>
25 27
 // clang-format off
26 28
 #include "scv/scv_util.h"