SystemC/SystemC-Components-Test
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

applies clang format

Browse Source
This commit is contained in:
Eyck Jentzsch 2024-12-11 09:18:37 +01:00
parent bc2ba8161d
commit 56024ae892
3 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.cproject
View File

@ -14,7 +14,7 @@
</extensions> </extensions>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cmake4eclipse.mbs.toolchain.cmake.134761605" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="org.eclipse.cdt.build.core.emptycfg"> <configuration artifactName="${ProjName}" buildProperties="" description="" id="cmake4eclipse.mbs.toolchain.cmake.134761605" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cmake4eclipse.mbs.toolchain.cmake.134761605.1159094612" name="/" resourcePath=""> <folderInfo id="cmake4eclipse.mbs.toolchain.cmake.134761605.1159094612" name="/" resourcePath="">
<toolChain id="cmake4eclipse.mbs.toolchain.cmake.1883503430" name="CMake driven" superClass="cmake4eclipse.mbs.toolchain.cmake"> <toolChain id="cmake4eclipse.mbs.toolchain.cmake.1883503430" name="CMake driven" superClass="cmake4eclipse.mbs.toolchain.cmake">
<targetPlatform id="cmake4eclipse.mbs.targetPlatform.cmake.1279728098" name="Any Platform" superClass="cmake4eclipse.mbs.targetPlatform.cmake"/> <targetPlatform id="cmake4eclipse.mbs.targetPlatform.cmake.1279728098" name="Any Platform" superClass="cmake4eclipse.mbs.targetPlatform.cmake"/>
@ -106,6 +106,42 @@
</defs> </defs>
</storageModule> </storageModule>
</cconfiguration> </cconfiguration>
<cconfiguration id="cmake4eclipse.mbs.toolchain.cmake.134761605.1553356977">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cmake4eclipse.mbs.toolchain.cmake.134761605.1553356977" moduleId="org.eclipse.cdt.core.settings" name="Debug11">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cmake4eclipse.mbs.toolchain.cmake.134761605.1553356977" name="Debug11" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cmake4eclipse.mbs.toolchain.cmake.134761605.1553356977." name="/" resourcePath="">
<toolChain id="cmake4eclipse.mbs.toolchain.cmake.1268942750" name="CMake driven" superClass="cmake4eclipse.mbs.toolchain.cmake">
<targetPlatform id="cmake4eclipse.mbs.targetPlatform.cmake.447510296" name="Any Platform" superClass="cmake4eclipse.mbs.targetPlatform.cmake"/>
<builder buildPath="/SystemC-Components-Test/build/Debug" id="cmake4eclipse.mbs.builder.956572391" keepEnvironmentInBuildfile="false" name="CMake Builder" superClass="cmake4eclipse.mbs.builder"/>
<tool id="cmake4eclipse.mbs.toolchain.tool.dummy.1929323583" name="CMake" superClass="cmake4eclipse.mbs.toolchain.tool.dummy">
<inputType id="cmake4eclipse.mbs.inputType.c.673602273" superClass="cmake4eclipse.mbs.inputType.c"/>
<inputType id="cmake4eclipse.mbs.inputType.cpp.68902696" superClass="cmake4eclipse.mbs.inputType.cpp"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
<storageModule buildDir="build/${ConfigName}" dirtyTs="1733905053019" moduleId="de.marw.cmake4eclipse.mbs.settings">
<options otherArguments="--preset DebugCXX11"/>
<defs>
<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
<def name="BUILD_SCC_DOCUMENTATION" type="BOOL" val="OFF"/>
<def name="ENABLE_CLANG_TIDY" type="STRING" val="OFF"/>
</defs>
</storageModule>
</cconfiguration>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="SystemC-Components-Test.null.276784792" name="SystemC-Components-Test"/> <project id="SystemC-Components-Test.null.276784792" name="SystemC-Components-Test"/>
@ -115,6 +151,7 @@
<configuration configurationName="ClangTidy"> <configuration configurationName="ClangTidy">
<resource resourceType="PROJECT" workspacePath="/SystemC-Components-Test"/> <resource resourceType="PROJECT" workspacePath="/SystemC-Components-Test"/>
</configuration> </configuration>
<configuration configurationName="RelWithDebInfo"/>
<configuration configurationName="Default"> <configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/SystemC-Components-Test"/> <resource resourceType="PROJECT" workspacePath="/SystemC-Components-Test"/>
</configuration> </configuration>

2
scc

@ -1 +1 @@
Subproject commit 8b9784da1cd849e86df6a22b55bdaeec3572d762 Subproject commit f1d5dc53353c9094480004073bd30986299b3f2f

24
tests/cxs_tlm/sc_main.cpp
View File

@ -1,10 +1,10 @@
#define SC_INCLUDE_FX #define SC_INCLUDE_FX
#include <cxs/tlm_network_cxs.h>
#include <scc/cci_util.h> #include <scc/cci_util.h>
#include <scc/configurer.h> #include <scc/configurer.h>
#include <scc/observer.h> #include <scc/observer.h>
#include <scc/sc_variable.h> #include <scc/sc_variable.h>
#include <scc/tracer.h> #include <scc/tracer.h>
#include <cxs/tlm_network_cxs.h>
#include <string> #include <string>
#include <systemc> #include <systemc>
@ -12,10 +12,10 @@ using namespace sc_dt;
using namespace std; using namespace std;
using namespace cxs; using namespace cxs;
enum {PHIT_WIDTH=664}; enum { PHIT_WIDTH = 664 };
struct testbench : public sc_core::sc_module, struct testbench : public sc_core::sc_module,
public tlm::nw::tlm_network_fw_transport_if<tlm_network_cxs_types>, public tlm::nw::tlm_network_fw_transport_if<tlm_network_cxs_types>,
public tlm::nw::tlm_network_bw_transport_if<tlm_network_cxs_types> { public tlm::nw::tlm_network_bw_transport_if<tlm_network_cxs_types> {
using transaction_type = tlm_network_cxs_types::tlm_payload_type; using transaction_type = tlm_network_cxs_types::tlm_payload_type;
using phase_type = tlm_network_cxs_types::tlm_phase_type; using phase_type = tlm_network_cxs_types::tlm_phase_type;
@ -46,19 +46,17 @@ public tlm::nw::tlm_network_bw_transport_if<tlm_network_cxs_types> {
auto phase{tlm::nw::REQUEST}; auto phase{tlm::nw::REQUEST};
auto status = isck->nb_transport_fw(*trans_ptr, phase, t); auto status = isck->nb_transport_fw(*trans_ptr, phase, t);
if(status == tlm::TLM_UPDATED) { if(status == tlm::TLM_UPDATED) {
sc_assert(phase==tlm::nw::CONFIRM); sc_assert(phase == tlm::nw::CONFIRM);
} }
wait(target_received_evt); wait(target_received_evt);
sc_core::sc_stop(); sc_core::sc_stop();
} }
void b_transport(transaction_type& trans, sc_core::sc_time& t) override { void b_transport(transaction_type& trans, sc_core::sc_time& t) override { SCCINFO(SCMOD) << "Received blocking transaction"; }
SCCINFO(SCMOD)<<"Received blocking transaction";
}
tlm::tlm_sync_enum nb_transport_fw(transaction_type& trans, phase_type& phase, sc_core::sc_time& t) override { tlm::tlm_sync_enum nb_transport_fw(transaction_type& trans, phase_type& phase, sc_core::sc_time& t) override {
if(phase==tlm::nw::INDICATION) { if(phase == tlm::nw::INDICATION) {
SCCINFO(SCMOD)<<"Received non-blocking transaction with phase " << phase.get_name(); SCCINFO(SCMOD) << "Received non-blocking transaction with phase " << phase.get_name();
target_received_evt.notify(sc_core::SC_ZERO_TIME); target_received_evt.notify(sc_core::SC_ZERO_TIME);
phase = tlm::nw::RESPONSE; phase = tlm::nw::RESPONSE;
return tlm::TLM_UPDATED; return tlm::TLM_UPDATED;
@ -67,15 +65,13 @@ public tlm::nw::tlm_network_bw_transport_if<tlm_network_cxs_types> {
} }
tlm::tlm_sync_enum nb_transport_bw(transaction_type& trans, phase_type& phase, sc_core::sc_time& t) override { tlm::tlm_sync_enum nb_transport_bw(transaction_type& trans, phase_type& phase, sc_core::sc_time& t) override {
if(phase==tlm::nw::CONFIRM) { if(phase == tlm::nw::CONFIRM) {
return tlm::TLM_ACCEPTED; return tlm::TLM_ACCEPTED;
} }
throw std::runtime_error("illegal response in backward path"); throw std::runtime_error("illegal response in backward path");
} }
unsigned int transport_dbg(transaction_type& trans) override { unsigned int transport_dbg(transaction_type& trans) override { return 0; }
return 0;
}
sc_core::sc_event target_received_evt; sc_core::sc_event target_received_evt;
}; };