From bb783837ba1a82a5d65a6333f539e8a13edc30e8 Mon Sep 17 00:00:00 2001
From: "Lukas Steiner (2)" <lsteiner@rhrk.uni-kl.de>
Date: Tue, 4 Feb 2020 15:42:54 +0100
Subject: [PATCH] Removed nextRow in BankMachine.

---
 .../library/src/controller/BankMachine.cpp    | 22 +++++--------------
 DRAMSys/library/src/controller/BankMachine.h  |  1 -
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/DRAMSys/library/src/controller/BankMachine.cpp b/DRAMSys/library/src/controller/BankMachine.cpp
index 543fec2c..714abe2d 100644
--- a/DRAMSys/library/src/controller/BankMachine.cpp
+++ b/DRAMSys/library/src/controller/BankMachine.cpp
@@ -55,7 +55,7 @@ void BankMachine::updateState(Command command)
     if (command == Command::ACT)
     {
         currentState = BmState::Activated;
-        currentRow = nextRow;
+        currentRow = DramExtension::getRow(currentPayload);
     }
     else if (command == Command::PRE || command == Command::PREA)
         currentState = BmState::Precharged;
@@ -124,16 +124,14 @@ sc_time BankMachineOpen::start()
             return sc_max_time() - sc_time_stamp();
     }
     sc_time delay;
-    DramExtension extension = DramExtension::getExtension(currentPayload);
     if (currentState == BmState::Precharged) // row miss
     {
         delay = checker->delayToSatisfyConstraints(Command::ACT, rank, bankgroup, bank);
         nextCommand = Command::ACT;
-        nextRow = extension.getRow();
     }
     else if (currentState == BmState::Activated)
     {
-        if (extension.getRow() == currentRow) // row hit
+        if (DramExtension::getRow(currentPayload) == currentRow) // row hit
         {
             if (currentPayload->get_command() == TLM_READ_COMMAND)
             {
@@ -152,7 +150,6 @@ sc_time BankMachineOpen::start()
         {
             delay = checker->delayToSatisfyConstraints(Command::PRE, rank, bankgroup, bank);
             nextCommand = Command::PRE;
-            nextRow = extension.getRow();
         }
     }
     timeToSchedule = sc_time_stamp() + delay;
@@ -175,16 +172,14 @@ sc_time BankMachineClosed::start()
             return sc_max_time() - sc_time_stamp();
     }
     sc_time delay;
-    DramExtension extension = DramExtension::getExtension(currentPayload);
     if (currentState == BmState::Precharged) // row miss
     {
         delay = checker->delayToSatisfyConstraints(Command::ACT, rank, bankgroup, bank);
         nextCommand = Command::ACT;
-        nextRow = extension.getRow();
     }
     else if (currentState == BmState::Activated)
     {
-        if (extension.getRow() == currentRow) // row hit
+        if (DramExtension::getRow(currentPayload) == currentRow) // row hit
         {
             if (currentPayload->get_command() == TLM_READ_COMMAND)
             {
@@ -203,7 +198,6 @@ sc_time BankMachineClosed::start()
         {
             delay = checker->delayToSatisfyConstraints(Command::PRE, rank, bankgroup, bank);
             nextCommand = Command::PRE;
-            nextRow = extension.getRow();
         }
     }
     timeToSchedule = sc_time_stamp() + delay;
@@ -226,16 +220,14 @@ sc_time BankMachineOpenAdaptive::start()
             return sc_max_time() - sc_time_stamp();
     }
     sc_time delay;
-    DramExtension extension = DramExtension::getExtension(currentPayload);
     if (currentState == BmState::Precharged) // row miss
     {
         delay = checker->delayToSatisfyConstraints(Command::ACT, rank, bankgroup, bank);
         nextCommand = Command::ACT;
-        nextRow = extension.getRow();
     }
     else if (currentState == BmState::Activated)
     {
-        if (extension.getRow() == currentRow) // row hit
+        if (DramExtension::getRow(currentPayload) == currentRow) // row hit
         {
             if (scheduler->hasRequest(bank) && !scheduler->hasRowHit(bank, currentRow))
             {
@@ -272,7 +264,6 @@ sc_time BankMachineOpenAdaptive::start()
         {
             delay = checker->delayToSatisfyConstraints(Command::PRE, rank, bankgroup, bank);
             nextCommand = Command::PRE;
-            nextRow = extension.getRow();
         }
     }
     timeToSchedule = sc_time_stamp() + delay;
@@ -295,16 +286,14 @@ sc_time BankMachineClosedAdaptive::start()
             return sc_max_time() - sc_time_stamp();
     }
     sc_time delay;
-    DramExtension extension = DramExtension::getExtension(currentPayload);
     if (currentState == BmState::Precharged) // row miss
     {
         delay = checker->delayToSatisfyConstraints(Command::ACT, rank, bankgroup, bank);
         nextCommand = Command::ACT;
-        nextRow = extension.getRow();
     }
     else if (currentState == BmState::Activated)
     {
-        if (extension.getRow() == currentRow) // row hit
+        if (DramExtension::getRow(currentPayload) == currentRow) // row hit
         {
             if (scheduler->hasRowHit(bank, currentRow))
             {
@@ -341,7 +330,6 @@ sc_time BankMachineClosedAdaptive::start()
         {
             delay = checker->delayToSatisfyConstraints(Command::PRE, rank, bankgroup, bank);
             nextCommand = Command::PRE;
-            nextRow = extension.getRow();
             SC_REPORT_FATAL("BankMachine", "Should never be reached for this policy");
         }
     }
diff --git a/DRAMSys/library/src/controller/BankMachine.h b/DRAMSys/library/src/controller/BankMachine.h
index 1e8e8d2c..e7f0e4b1 100644
--- a/DRAMSys/library/src/controller/BankMachine.h
+++ b/DRAMSys/library/src/controller/BankMachine.h
@@ -77,7 +77,6 @@ protected:
     SchedulerIF *scheduler;
     CheckerIF *checker;
     Command nextCommand;
-    Row nextRow;
     BmState currentState = BmState::Precharged;
     Row currentRow;
     sc_time timeToSchedule = sc_max_time();