diff --git a/.cproject b/.cproject
index a6091d6..bdca034 100755
--- a/.cproject
+++ b/.cproject
@@ -1,30 +1,30 @@
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -42,7 +42,7 @@
-
+
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index bb12a81..a597553 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/Bank.cpp b/Bank.cpp
index 1ea15d7..6df7f48 100755
--- a/Bank.cpp
+++ b/Bank.cpp
@@ -29,7 +29,9 @@ MemoryMapping::MemoryMapping(MappingType mappingTypeArg, unsigned numRanksArg, u
numBanks = numRanks * banksPerRank;
totalSize = static_cast(numBanks) * static_cast(rowsPerBank) * static_cast(blocksPerRow) * static_cast(blockSize);
-
+// cout << totalSize;
+// cout << flush;
+// getchar();
//these 5 assignments depend on the address mapping used
if (mappingType == ROW_RANK_BANK_COL){
blockOffset = 0;
diff --git a/CPU.cpp b/CPU.cpp
index 44eaa9e..7d33fd3 100755
--- a/CPU.cpp
+++ b/CPU.cpp
@@ -838,6 +838,8 @@ bool CPU::readNextEntry(){
} else {
if (reader->readEntry(&firstEntry)){
addrint firstByteBlockAddress = firstEntry.address & ~offsetMask;
+ //cout << firstEntry.address << "\t" << firstByteBlockAddress;
+ //cout <second.count++;
}
+ //res = Set::NO_EVICTION;
if (res == Set::NO_EVICTION){
misses_without_eviction++;
ret = MISS_WITHOUT_EVICTION;
diff --git a/HybridMemory.cpp b/HybridMemory.cpp
index 26a2991..fbc6810 100755
--- a/HybridMemory.cpp
+++ b/HybridMemory.cpp
@@ -4,11 +4,16 @@
* See the file LICENSE.txt for copying permission.
*/
-#include "HybridMemory.H"
+#include "include/HybridMemory.H"
-#include
-#include
+#include
#include
+#include
+#include