From f8bd708a5caa6ef1e719ebd271ecd3b92109e9b3 Mon Sep 17 00:00:00 2001
From: niusiyuan <siyuan.niu@telecom-paristech.fr>
Date: Wed, 17 Jul 2019 15:48:18 +0200
Subject: [PATCH] fpga and html
---
simulators/c++2/src_simulator/TMLTransaction.cpp | 4 ++--
simulators/c++2/src_simulator/TMLTransaction.h | 2 ++
simulators/c++2/src_simulator/arch/FPGA.cpp | 1 -
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/simulators/c++2/src_simulator/TMLTransaction.cpp b/simulators/c++2/src_simulator/TMLTransaction.cpp
index c78a08f79f..66f2d39c8a 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 a4a3df15b4..f316cc112e 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 05cbcdc2ce..fdf85f7b9e 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();
--
GitLab