derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix readability-misleading-indentation warnings

Browse Source
This commit is contained in:
Derek Christ
2023-05-17 12:02:35 +02:00
parent 32e828d254
commit 3ce54b8faa
1 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
src/libdramsys/DRAMSys/controller/BankMachine.cpp
View File

@@ -171,7 +171,7 @@ void BankMachineOpen::evaluate()
if (!(sleeping || blocked))
{
tlm_generic_payload* newPayload = scheduler.getNextRequest(*this);
tlm_generic_payload *newPayload = scheduler.getNextRequest(*this);
if (newPayload == nullptr)
return;
@@ -180,27 +180,27 @@ void BankMachineOpen::evaluate()
{
if (ControllerExtension::getRow(*newPayload) == openRow)
currentPayload = newPayload;
}
else
{
currentPayload = newPayload;
}
}
else
{
currentPayload = newPayload;
}
if (state == State::Precharged) // bank precharged
nextCommand = Command::ACT;
else if (state == State::Activated)
if (state == State::Precharged) // bank precharged
nextCommand = Command::ACT;
else if (state == State::Activated)
{
if (ControllerExtension::getRow(*currentPayload) == openRow) // row hit
{
if (ControllerExtension::getRow(*currentPayload) == openRow) // row hit
{
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RD;
else
nextCommand = Command::WR;
}
else // row miss
nextCommand = Command::PREPB;
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RD;
else
nextCommand = Command::WR;
}
else // row miss
nextCommand = Command::PREPB;
}
}
}
@@ -213,7 +213,7 @@ void BankMachineClosed::evaluate()
if (!(sleeping || blocked))
{
tlm_generic_payload* newPayload = scheduler.getNextRequest(*this);
tlm_generic_payload *newPayload = scheduler.getNextRequest(*this);
if (newPayload == nullptr)
return;
@@ -222,22 +222,22 @@ void BankMachineClosed::evaluate()
{
if (ControllerExtension::getRow(*newPayload) == openRow)
currentPayload = newPayload;
}
else
{
currentPayload = newPayload;
}
}
else
{
currentPayload = newPayload;
}
if (state == State::Precharged) // bank precharged
nextCommand = Command::ACT;
else if (state == State::Activated)
{
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RDA;
else
nextCommand = Command::WRA;
}
if (state == State::Precharged) // bank precharged
nextCommand = Command::ACT;
else if (state == State::Activated)
{
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RDA;
else
nextCommand = Command::WRA;
}
}
}
@@ -250,7 +250,7 @@ void BankMachineOpenAdaptive::evaluate()
if (!(sleeping || blocked))
{
tlm_generic_payload* newPayload = scheduler.getNextRequest(*this);
tlm_generic_payload *newPayload = scheduler.getNextRequest(*this);
if (newPayload == nullptr)
return;
@@ -259,39 +259,39 @@ void BankMachineOpenAdaptive::evaluate()
{
if (ControllerExtension::getRow(*newPayload) == openRow)
currentPayload = newPayload;
}
else
{
currentPayload = newPayload;
}
}
else
{
currentPayload = newPayload;
}
if (state == State::Precharged) // bank precharged
nextCommand = Command::ACT;
else if (state == State::Activated)
if (state == State::Precharged) // bank precharged
nextCommand = Command::ACT;
else if (state == State::Activated)
{
if (ControllerExtension::getRow(*currentPayload) == openRow) // row hit
{
if (ControllerExtension::getRow(*currentPayload) == openRow) // row hit
if (scheduler.hasFurtherRequest(bank, currentPayload->get_command()) &&
!scheduler.hasFurtherRowHit(bank, openRow, currentPayload->get_command()))
{
if (scheduler.hasFurtherRequest(bank, currentPayload->get_command())
&& !scheduler.hasFurtherRowHit(bank, openRow, currentPayload->get_command()))
{
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RDA;
else
nextCommand = Command::WRA;
}
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RDA;
else
{
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RD;
else
nextCommand = Command::WR;
}
nextCommand = Command::WRA;
}
else
{
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RD;
else
nextCommand = Command::WR;
}
else // row miss
nextCommand = Command::PREPB;
}
else // row miss
nextCommand = Command::PREPB;
}
}
}
@@ -305,7 +305,7 @@ void BankMachineClosedAdaptive::evaluate()
if (!(sleeping || blocked))
{
tlm_generic_payload* newPayload = scheduler.getNextRequest(*this);
tlm_generic_payload *newPayload = scheduler.getNextRequest(*this);
if (newPayload == nullptr)
return;
@@ -314,38 +314,38 @@ void BankMachineClosedAdaptive::evaluate()
{
if (ControllerExtension::getRow(*newPayload) == openRow)
currentPayload = newPayload;
}
else
{
currentPayload = newPayload;
}
}
else
{
currentPayload = newPayload;
}
if (state == State::Precharged) // bank precharged
nextCommand = Command::ACT;
else if (state == State::Activated)
if (state == State::Precharged) // bank precharged
nextCommand = Command::ACT;
else if (state == State::Activated)
{
if (ControllerExtension::getRow(*currentPayload) == openRow) // row hit
{
if (ControllerExtension::getRow(*currentPayload) == openRow) // row hit
if (scheduler.hasFurtherRowHit(bank, openRow, currentPayload->get_command()))
{
if (scheduler.hasFurtherRowHit(bank, openRow, currentPayload->get_command()))
{
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RD;
else
nextCommand = Command::WR;
}
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RD;
else
{
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RDA;
else
nextCommand = Command::WRA;
}
nextCommand = Command::WR;
}
else
{
assert(currentPayload->is_read() || currentPayload->is_write());
if (currentPayload->is_read())
nextCommand = Command::RDA;
else
nextCommand = Command::WRA;
}
else // row miss, can happen when RD/WR mode is switched
nextCommand = Command::PREPB;
}
else // row miss, can happen when RD/WR mode is switched
nextCommand = Command::PREPB;
}
}
}