From 6b145feb8b2e89acf9e79a6bf83c50bb023b51a2 Mon Sep 17 00:00:00 2001
From: Lukas Steiner <lsteiner@rhrk.uni-kl.de>
Date: Wed, 9 Jun 2021 10:12:05 +0200
Subject: [PATCH] Bugfix: Initialize vectors in DDR5 checker properly.

---
 .../src/controller/checker/CheckerDDR5.cpp       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp b/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp
index f9220256..b567b9bf 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp
+++ b/DRAMSys/library/src/controller/checker/CheckerDDR5.cpp
@@ -65,18 +65,18 @@ CheckerDDR5::CheckerDDR5()
     last4ActivatesPhysical = std::vector<std::queue<sc_time>>(memSpec->numberOfPhysicalRanks);
 
     lastBurstLengthByCommandAndDimmRank = std::vector<std::vector<uint8_t>>
-            (4, std::vector<uint8_t>(memSpec->numberOfDIMMRanks));
+            (Command::WRA + 1, std::vector<uint8_t>(memSpec->numberOfDIMMRanks));
     lastBurstLengthByCommandAndPhysicalRank = std::vector<std::vector<uint8_t>>
-            (4, std::vector<uint8_t>(memSpec->numberOfPhysicalRanks));
+            (Command::WRA + 1, std::vector<uint8_t>(memSpec->numberOfPhysicalRanks));
     lastBurstLengthByCommandAndLogicalRank = std::vector<std::vector<uint8_t>>
-            (4, std::vector<uint8_t>(memSpec->numberOfLogicalRanks));
+            (Command::WRA + 1, std::vector<uint8_t>(memSpec->numberOfLogicalRanks));
     lastBurstLengthByCommandAndBankGroup = std::vector<std::vector<uint8_t>>
-            (4, std::vector<uint8_t>(memSpec->numberOfBankGroups));
+            (Command::WRA + 1, std::vector<uint8_t>(memSpec->numberOfBankGroups));
     lastBurstLengthByCommandAndBank = std::vector<std::vector<uint8_t>>
-            (4, std::vector<uint8_t>(memSpec->numberOfBanks));
-    lastBurstLengthByCommand = std::vector<uint8_t>(4);
+            (Command::WRA + 1, std::vector<uint8_t>(memSpec->numberOfBanks));
+    lastBurstLengthByCommand = std::vector<uint8_t>(Command::WRA + 1);
     lastBurstLengthByCommandAndBankInGroup = std::vector<std::vector<uint8_t>>
-            (4, std::vector<uint8_t>(memSpec->numberOfRanks * memSpec->banksPerGroup));
+            (Command::WRA + 1, std::vector<uint8_t>(memSpec->numberOfRanks * memSpec->banksPerGroup));
 
     cmdLengthDiff = memSpec->cmdMode * memSpec->tCK;
 
@@ -840,7 +840,7 @@ void CheckerDDR5::insert(Command command, tlm_generic_payload *payload)
     if (command.isCasCommand())
     {
         lastBurstLengthByCommandAndDimmRank[command][dimmRank.ID()] = burstLength;
-        lastBurstLengthByCommandAndPhysicalRank[command][physicalRank.ID()] = burstLength;
+        lastBurstLengthByCommandAndPhysicalRank[command ][physicalRank.ID()] = burstLength;
         lastBurstLengthByCommandAndLogicalRank[command][logicalRank.ID()] = burstLength;
         lastBurstLengthByCommandAndBankGroup[command][bankGroup.ID()] = burstLength;
         lastBurstLengthByCommandAndBank[command][bank.ID()] = burstLength;