From 58168102bce8c41282c90d211e0abf8c6d9a8535 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Fri, 14 Jun 2019 18:14:13 +0200
Subject: [PATCH] Slight update on simulator
---
simulators/c++2/src_simulator/app/TMLChoiceCommand.cpp | 5 +++++
simulators/c++2/src_simulator/sim/Simulator.cpp | 2 ++
2 files changed, 7 insertions(+)
diff --git a/simulators/c++2/src_simulator/app/TMLChoiceCommand.cpp b/simulators/c++2/src_simulator/app/TMLChoiceCommand.cpp
index 3b48c725c8..5b9b74a403 100755
--- a/simulators/c++2/src_simulator/app/TMLChoiceCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLChoiceCommand.cpp
@@ -51,17 +51,22 @@ TMLChoiceCommand::TMLChoiceCommand(ID iID, TMLTask* iTask, RangeFuncPointer iRan
TMLCommand* TMLChoiceCommand::getNextCommand() const{
ParamType aMin, aMax;
//return _nextCommand[(_task->*_rangeFunc)(aMin, aMax)];
+ // std::cout << "In choice command" << "\n";
+ //std::cout << toString() << "\n";
unsigned int aNextIndex = (_task->*_rangeFunc)(aMin, aMax);
_coveredBranchMap |= (1 << aNextIndex);
return _nextCommand[aNextIndex];
}
TMLCommand* TMLChoiceCommand::prepareNextTransaction(){
+
+ //std::cout << "Preparing next transaction in choice\n";
if (_simComp->getStopFlag()){
_simComp->setStoppedOnAction();
_task->setCurrCommand(this);
return this; //for command which generates transactions this is returned anyway by prepareTransaction
}
+ //std::cout << "Preparing next command in choice" << "\n";
TMLCommand* aNextCommand=getNextCommand();
_task->setCurrCommand(aNextCommand);
_execTimes++;
diff --git a/simulators/c++2/src_simulator/sim/Simulator.cpp b/simulators/c++2/src_simulator/sim/Simulator.cpp
index cbf742a387..ce4a6c7f16 100644
--- a/simulators/c++2/src_simulator/sim/Simulator.cpp
+++ b/simulators/c++2/src_simulator/sim/Simulator.cpp
@@ -82,6 +82,8 @@ TMLTransaction* Simulator::getTransLowestEndTime(SchedulableDevice*& oResultDevi
//for(CPUList::const_iterator i=_simComp->getCPUIterator(false); i != _simComp->getCPUIterator(true); ++i){
for(CPUList::const_iterator i=_simComp->getCPUList().begin(); i != _simComp->getCPUList().end(); ++i){
aTempDevice=*i;
+
+ //std::cout << "Preparing next transaction" << aTempDevice->toString() << "\n";
aTempTrans=aTempDevice->getNextTransaction();
if (aTempTrans!=0 && aTempTrans->getVirtualLength()>0){
#ifdef DEBUG_KERNEL
--
GitLab