Skip to content

Commit 4f27c76

Browse files
eyckeyck
committed
Merge branch 'develop' into main
2 parents ee3719d + 803a6bb commit 4f27c76

7 files changed

Lines changed: 19 additions & 18 deletions

File tree

‎src/bus_interfaces/axi/pin/ace_initiator.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ template <typename CFG> inline void axi::pin::ace_initiator<CFG>::setup_callback
359359
if(fsm_hndl->beat_count == 0) {
360360
aw_fifo.push_back({fsm_hndl->trans.get(), false});
361361
}
362-
wdata_fifo.push_back({fsm_hndl->trans.get(), false, wdata_fifo.num_avail()>0, fsm_hndl->beat_count});
362+
wdata_fifo.push_back({fsm_hndl->trans.get(), false, wdata_fifo.num_avail() > 0, fsm_hndl->beat_count});
363363
if(pipelined_wrreq && !wdata_fifo.num_avail())
364364
schedule(EndPartReqE, fsm_hndl->trans, sc_core::SC_ZERO_TIME);
365365
};
@@ -385,7 +385,7 @@ template <typename CFG> inline void axi::pin::ace_initiator<CFG>::setup_callback
385385
}
386386
/* for Evict Trans, only addr on aw_t, response on b_t() */
387387
if(!axi::is_dataless(fsm_hndl->trans->get_extension<ace_extension>())) {
388-
wdata_fifo.push_back({fsm_hndl->trans.get(), true, wdata_fifo.num_avail()>0, fsm_hndl->beat_count});
388+
wdata_fifo.push_back({fsm_hndl->trans.get(), true, wdata_fifo.num_avail() > 0, fsm_hndl->beat_count});
389389
if(pipelined_wrreq && !wdata_fifo.num_avail())
390390
schedule(EndReqE, fsm_hndl->trans, sc_core::SC_ZERO_TIME);
391391
}

‎src/bus_interfaces/axi/pin/ace_lite_initiator.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ template <typename CFG> inline void axi::pin::ace_lite_initiator<CFG>::setup_cal
337337
if(fsm_hndl->beat_count == 0) {
338338
aw_fifo.push_back({fsm_hndl->trans.get(), false});
339339
}
340-
wdata_fifo.push_back({fsm_hndl->trans.get(), false, wdata_fifo.num_avail()>0, fsm_hndl->beat_count});
340+
wdata_fifo.push_back({fsm_hndl->trans.get(), false, wdata_fifo.num_avail() > 0, fsm_hndl->beat_count});
341341
if(pipelined_wrreq && !wdata_fifo.num_avail())
342342
schedule(EndPartReqE, fsm_hndl->trans, sc_core::SC_ZERO_TIME);
343343
};
@@ -358,7 +358,7 @@ template <typename CFG> inline void axi::pin::ace_lite_initiator<CFG>::setup_cal
358358
}
359359
/* for dataless trans, no data on wdata_t*/
360360
if(!axi::is_dataless(fsm_hndl->trans->get_extension<ace_extension>())) {
361-
wdata_fifo.push_back({fsm_hndl->trans.get(), true, wdata_fifo.num_avail()>0, fsm_hndl->beat_count});
361+
wdata_fifo.push_back({fsm_hndl->trans.get(), true, wdata_fifo.num_avail() > 0, fsm_hndl->beat_count});
362362
if(pipelined_wrreq && !wdata_fifo.num_avail())
363363
schedule(EndReqE, fsm_hndl->trans, sc_core::SC_ZERO_TIME);
364364
}

‎src/bus_interfaces/axi/pin/axi4_initiator.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ template <typename CFG> inline void axi::pin::axi4_initiator<CFG>::setup_callbac
279279
if(fsm_hndl->beat_count == 0) {
280280
aw_fifo.push_back({fsm_hndl->trans.get(), false});
281281
}
282-
wdata_fifo.push_back({fsm_hndl->trans.get(), false, wdata_fifo.num_avail()>0, fsm_hndl->beat_count});
282+
wdata_fifo.push_back({fsm_hndl->trans.get(), false, wdata_fifo.num_avail() > 0, fsm_hndl->beat_count});
283283
if(pipelined_wrreq && !wdata_fifo.num_avail())
284284
schedule(EndPartReqE, fsm_hndl->trans, sc_core::SC_ZERO_TIME);
285285
};
@@ -298,7 +298,7 @@ template <typename CFG> inline void axi::pin::axi4_initiator<CFG>::setup_callbac
298298
if(fsm_hndl->beat_count == 0) {
299299
aw_fifo.push_back({fsm_hndl->trans.get(), false});
300300
}
301-
wdata_fifo.push_back({fsm_hndl->trans.get(), true, wdata_fifo.num_avail()>0, fsm_hndl->beat_count});
301+
wdata_fifo.push_back({fsm_hndl->trans.get(), true, wdata_fifo.num_avail() > 0, fsm_hndl->beat_count});
302302
if(pipelined_wrreq && !wdata_fifo.num_avail())
303303
schedule(EndReqE, fsm_hndl->trans, sc_core::SC_ZERO_TIME);
304304
}

‎src/sysc/scc/ordered_semaphore.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ ordered_semaphore::ordered_semaphore(const char* name_, unsigned init_value_, bo
8282
report_error(sc_core::SC_ID_INVALID_SEMAPHORE_VALUE_);
8383
}
8484
if(value_traceable)
85-
value_ref.reset(new scc::sc_ref_variable<int>(std::string(basename())+"_count", value, true));
85+
value_ref.reset(new scc::sc_ref_variable<int>(std::string(basename()) + "_count", value, true));
8686
}
8787

8888
// interface methods
@@ -94,7 +94,8 @@ auto ordered_semaphore::wait(unsigned priority) -> int {
9494
sc_core::wait(free_evt);
9595
}
9696
--value;
97-
if(value_ref) value_ref->notify();
97+
if(value_ref)
98+
value_ref->notify();
9899
return value;
99100
}
100101

@@ -105,7 +106,8 @@ auto ordered_semaphore::trywait() -> int {
105106
return -1;
106107
}
107108
--value;
108-
if(value_ref) value_ref->notify();
109+
if(value_ref)
110+
value_ref->notify();
109111
return value;
110112
}
111113

@@ -116,7 +118,8 @@ auto ordered_semaphore::post() -> int {
116118
SCCWARN(SCMOD) << "post() called on entirely free semaphore!";
117119
} else {
118120
++value;
119-
if(value_ref) value_ref->notify();
121+
if(value_ref)
122+
value_ref->notify();
120123
}
121124
if(value > 0)
122125
free_evt.notify(sc_core::SC_ZERO_TIME);

‎src/sysc/scc/ordered_semaphore.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
#pragma once
1818

19-
#include <sysc/communication/sc_semaphore_if.h>
20-
#include <sysc/kernel/sc_event.h>
21-
#include <sysc/kernel/sc_object.h>
2219
#include "sc_variable.h"
2320
#include "traceable.h"
2421
#include <array>
2522
#include <deque>
23+
#include <sysc/communication/sc_semaphore_if.h>
24+
#include <sysc/kernel/sc_event.h>
25+
#include <sysc/kernel/sc_object.h>
2626
#include <sysc/kernel/sc_process_handle.h>
2727

2828
#ifndef SC_API

‎src/sysc/scc/report.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,7 @@ static void configure_logging() {
423423
}
424424
}
425425

426-
void scc::reinit_logging() {
427-
reinit_logging(log_cfg.level);
428-
}
426+
void scc::reinit_logging() { reinit_logging(log_cfg.level); }
429427

430428
void scc::reinit_logging(scc::log level) {
431429
if(log_cfg.install_handler)

‎src/sysc/scc/sc_variable.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,10 @@ template <typename T> struct sc_ref_variable : public sc_variable_b {
433433
* @param name the name
434434
* @param value the variable reference to be wrapped
435435
*/
436-
sc_ref_variable(const std::string& name, const T& value, bool active_notification=false)
436+
sc_ref_variable(const std::string& name, const T& value, bool active_notification = false)
437437
: sc_variable_b(name.c_str())
438438
, value(value)
439-
, active_notification(active_notification){}
439+
, active_notification(active_notification) {}
440440

441441
virtual ~sc_ref_variable() = default;
442442
/**

0 commit comments

Comments
 (0)