Merge branch 'master' into 'minh-help'
# Conflicts: # src/main/java/ui/window/JDialogCPUNode.java
No related branches found
No related tags found
Showing
- MPSoC/Makefile.forsoclib 2 additions, 2 deletionsMPSoC/Makefile.forsoclib
- build.txt 1 addition, 1 deletionbuild.txt
- modeling/DIPLODOCUS/SmartCardProtocol.xml 315 additions, 315 deletionsmodeling/DIPLODOCUS/SmartCardProtocol.xml
- simulators/c++2/src_simulator/TMLTransaction.cpp 1 addition, 1 deletionsimulators/c++2/src_simulator/TMLTransaction.cpp
- simulators/c++2/src_simulator/TMLTransaction.h 15 additions, 0 deletionssimulators/c++2/src_simulator/TMLTransaction.h
- simulators/c++2/src_simulator/app/TMLChannel.cpp 4 additions, 2 deletionssimulators/c++2/src_simulator/app/TMLChannel.cpp
- simulators/c++2/src_simulator/app/TMLbrbwChannel.cpp 1 addition, 0 deletionssimulators/c++2/src_simulator/app/TMLbrbwChannel.cpp
- simulators/c++2/src_simulator/arch/Bus.cpp 8 additions, 1 deletionsimulators/c++2/src_simulator/arch/Bus.cpp
- simulators/c++2/src_simulator/arch/CPU.h 107 additions, 1 deletionsimulators/c++2/src_simulator/arch/CPU.h
- simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp 169 additions, 78 deletionssimulators/c++2/src_simulator/arch/MultiCoreCPU.cpp
- simulators/c++2/src_simulator/arch/MultiCoreCPU.h 16 additions, 2 deletionssimulators/c++2/src_simulator/arch/MultiCoreCPU.h
- simulators/c++2/src_simulator/arch/SchedulableDevice.cpp 9 additions, 2 deletionssimulators/c++2/src_simulator/arch/SchedulableDevice.cpp
- simulators/c++2/src_simulator/arch/SchedulableDevice.h 4 additions, 1 deletionsimulators/c++2/src_simulator/arch/SchedulableDevice.h
- simulators/c++2/src_simulator/arch/SingleCoreCPU.cpp 1 addition, 1 deletionsimulators/c++2/src_simulator/arch/SingleCoreCPU.cpp
- simulators/c++2/src_simulator/sim/Simulator.cpp 133 additions, 30 deletionssimulators/c++2/src_simulator/sim/Simulator.cpp
- src/main/java/syscamstranslator/SysCAMSSpecification.java 9 additions, 0 deletionssrc/main/java/syscamstranslator/SysCAMSSpecification.java
- src/main/java/syscamstranslator/SysCAMSTBlockDE.java 8 additions, 2 deletionssrc/main/java/syscamstranslator/SysCAMSTBlockDE.java
- src/main/java/syscamstranslator/SysCAMSTBlockTDF.java 43 additions, 55 deletionssrc/main/java/syscamstranslator/SysCAMSTBlockTDF.java
- src/main/java/syscamstranslator/SysCAMSTPortTDF.java 10 additions, 0 deletionssrc/main/java/syscamstranslator/SysCAMSTPortTDF.java
- src/main/java/syscamstranslator/toSysCAMS/Header.java 1 addition, 1 deletionsrc/main/java/syscamstranslator/toSysCAMS/Header.java
Loading
Please register or sign in to comment