From 9f51e068890eedc5ed978295a29f1c9895ba7def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Ha=CC=88user?= <mhaeuser@posteo.de>
Date: Sat, 25 Nov 2023 16:59:03 +0100
Subject: [PATCH] [WIP] simulator: drop always-true conditions
---
simulators/c++2/src_simulator/app/TMLTask.cpp | 2 +-
simulators/c++2/src_simulator/arch/CPU.cpp | 6 +++---
simulators/c++2/src_simulator/arch/FPGA.cpp | 6 +++---
simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp | 2 +-
simulators/c++2/src_simulator/arch/SchedulableDevice.cpp | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/simulators/c++2/src_simulator/app/TMLTask.cpp b/simulators/c++2/src_simulator/app/TMLTask.cpp
index aa68d60680..7cd34c5d0f 100644
--- a/simulators/c++2/src_simulator/app/TMLTask.cpp
+++ b/simulators/c++2/src_simulator/app/TMLTask.cpp
@@ -574,7 +574,7 @@ void TMLTask::schedule2HTML(std::ofstream& myfile) const {
isBlankTooBig = true;
changeCssClass = true;
}
- if ( aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) ){
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()){
listScale.push_back(aBlanks+1);
tempString << tempBlanks+1;
if (beg + 1 > listScaleTime.back()) {
diff --git a/simulators/c++2/src_simulator/arch/CPU.cpp b/simulators/c++2/src_simulator/arch/CPU.cpp
index 01e591c63f..3808fd7c61 100644
--- a/simulators/c++2/src_simulator/arch/CPU.cpp
+++ b/simulators/c++2/src_simulator/arch/CPU.cpp
@@ -267,7 +267,7 @@ std::cout << std::endl << "---- CPU HTML ----- " << std::endl;
- if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()))
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())
{
listScale.push_back(aBlanks + 1);
std::cout << "ListScale: " << (aBlanks + 1) << std::endl;
@@ -518,7 +518,7 @@ void CPU::HW2HTML(std::ofstream &myfile) const
isBlankTooBig = true;
changeCssClass = true;
}
- if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()))
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())
{
listScale.push_back(aBlanks + 1);
tempString << tempBlanks + 1;
@@ -699,7 +699,7 @@ void CPU::schedule2HTML(std::ofstream &myfile) const
isBlankTooBig = true;
changeCssClass = true;
}
- if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()))
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())
{
listScale.push_back(aBlanks + 1);
tempString << tempBlanks + 1;
diff --git a/simulators/c++2/src_simulator/arch/FPGA.cpp b/simulators/c++2/src_simulator/arch/FPGA.cpp
index 7e9b9e9df7..e43da25d6a 100644
--- a/simulators/c++2/src_simulator/arch/FPGA.cpp
+++ b/simulators/c++2/src_simulator/arch/FPGA.cpp
@@ -859,7 +859,7 @@ std::map<TMLTask *, std::string> FPGA::HWTIMELINE2HTML(std::ostringstream &myfil
{
tempReconfigIdle << " ";
}
- if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()))
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())
{
listScale.push_back(aBlanks + 1);
tempString << tempBlanks + 1;
@@ -1074,7 +1074,7 @@ void FPGA::HW2HTML(std::ofstream &myfile)
isBlankTooBig = true;
changeCssClass = true;
}
- if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()))
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())
{
listScale.push_back(aBlanks + 1);
tempString << tempBlanks + 1;
@@ -1238,7 +1238,7 @@ void FPGA::schedule2HTML(std::ofstream &myfile)
changeCssClass = true;
}
- if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()))
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())
{
listScale.push_back(aBlanks + 1);
tempString << tempBlanks + 1;
diff --git a/simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp b/simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp
index 118e6de0b7..fbe97a71b3 100644
--- a/simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp
+++ b/simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp
@@ -611,7 +611,7 @@ std::cout << std::endl << "---- Multicore HTML ----- " << std::endl;
isBlankTooBig = true;
changeCssClass = true;
}
- if ( aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) ){
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()){
listScale.push_back(aBlanks+1);
std::cout << "ListScale: " << (aBlanks+1) << '\n';
diff --git a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
index 75f15d1f40..240425701f 100644
--- a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
+++ b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp
@@ -400,7 +400,7 @@ std::map<TMLTask *, std::string> SchedulableDevice::HWTIMELINE2HTML(std::ostring
isBlankTooBig = true;
changeCssClass = true;
}
- if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()))
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())
{
// std::cout << "Case blank #1: assign transaction " << aCurrTrans->toShortString() << std::endl;
listScale.push_back(aBlanks + 1);
@@ -647,7 +647,7 @@ void SchedulableDevice::HW2HTML(std::ofstream &myfile) const
isBlankTooBig = true;
changeCssClass = true;
}
- if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()))
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())
{
listScale.push_back(aBlanks + 1);
tempString << tempBlanks + 1;
@@ -834,7 +834,7 @@ void SchedulableDevice::schedule2HTML(std::ofstream &myfile) const
isBlankTooBig = true;
changeCssClass = true;
}
- if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()))
+ if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())
{
listScale.push_back(aBlanks + 1);
--
GitLab