diff --git a/simulators/c++2/src_simulator/TMLTransaction.cpp b/simulators/c++2/src_simulator/TMLTransaction.cpp index c78a08f79fe10344eadccf81855376e412de3974..66f2d39c8a408ad82ef9cac1d420691acced1296 100755 --- a/simulators/c++2/src_simulator/TMLTransaction.cpp +++ b/simulators/c++2/src_simulator/TMLTransaction.cpp @@ -74,7 +74,7 @@ std::string TMLTransaction::toString() const{ std::ostringstream outp; //std::cout << "kernel:transaction: toString" << std::endl; //std::cout << "kernel:transaction: toString" << _command->toString() << std::endl; - outp << _command->toString() << std::endl << "Transaction runnable:" << _runnableTime << " len:" << _length << " start:" << _startTime << " vLength:" << _virtualLength; + outp << _command->toString() << std::endl << "Transaction runnable:" << _runnableTime << " len:" << _length << " start:" << _startTime << " vLength:" << _virtualLength << " params:" << lastParams ; if (_channel!=0) outp << " Ch: " << _channel->toShortString(); return outp.str(); } @@ -84,7 +84,7 @@ std::string TMLTransaction::toShortString() const{ if (_command==0) outp << "System State ID: " << _virtualLength; else{ - outp << _command->toShortString() << " t:" << _startTime << " l:" << _length << " (vl:"<< _virtualLength << ")"; + outp << _command->toShortString() << " t:" << _startTime << " l:" << _length << " (vl:"<< _virtualLength << ")" << " params:" << lastParams ; if (_channel!=0) outp << " Ch: " << _channel->toShortString(); } return outp.str(); diff --git a/simulators/c++2/src_simulator/TMLTransaction.h b/simulators/c++2/src_simulator/TMLTransaction.h index a4a3df15b468b092ad6952ffaea8f8b271e4aa77..f316cc112e6e842c396a3f66b738371e693c00a0 100644 --- a/simulators/c++2/src_simulator/TMLTransaction.h +++ b/simulators/c++2/src_simulator/TMLTransaction.h @@ -259,6 +259,8 @@ class TMLTransaction { inline void setEndState (bool f) { _endState=f;} inline bool getEndState () {return _endState;} void toXML(std::ostringstream& glob, int deviceID, std::string deviceName, ID uniqueID) const; + // Params of the transaction + std::string lastParams; protected: diff --git a/simulators/c++2/src_simulator/arch/FPGA.cpp b/simulators/c++2/src_simulator/arch/FPGA.cpp index 05cbcdc2cea45479a072aa7c10d023964c638792..fdf85f7b9eb9860bdf92ad186db4ad82c4d8f57b 100644 --- a/simulators/c++2/src_simulator/arch/FPGA.cpp +++ b/simulators/c++2/src_simulator/arch/FPGA.cpp @@ -587,7 +587,6 @@ void FPGA::HW2HTML(std::ofstream& myfile) { // Issue #4 - TMLTask* task = aCurrTrans->getCommand()->getTask(); // std::cout<<"what is this task?"<<task->toString()<<std::endl; const std::string cellClass = determineHTMLCellClass( nextCellClassIndex ); std::string aCurrTransName=aCurrTrans->toShortString();