From 36a338af99585a7036834673e1d801dde157373f Mon Sep 17 00:00:00 2001
From: LYC <mail@lessthread.top>
Date: Mon, 28 Oct 2024 14:43:46 +0800
Subject: [PATCH] 2

---
 cache/Project1/Proj1-1/Proj1-1/src/Makefile |  4 ++--
 cache/Project1/Proj1-1/Proj1-1/src/cache.cc | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cache/Project1/Proj1-1/Proj1-1/src/Makefile b/cache/Project1/Proj1-1/Proj1-1/src/Makefile
index 6a330eb..2f5e676 100644
--- a/cache/Project1/Proj1-1/Proj1-1/src/Makefile
+++ b/cache/Project1/Proj1-1/Proj1-1/src/Makefile
@@ -5,10 +5,10 @@ WARN = -Wall
 CFLAGS = $(OPT) $(WARN) $(INC) $(LIB)
 
 # List all your .cc files here (source files, excluding header files)
-SIM_SRC = main.cc world.cc
+SIM_SRC = main.cc cache.cc
 
 # List corresponding compiled object files here (.o files)
-SIM_OBJ = main.o world.o
+SIM_OBJ = main.o cache.o
  
 #################################
 
diff --git a/cache/Project1/Proj1-1/Proj1-1/src/cache.cc b/cache/Project1/Proj1-1/Proj1-1/src/cache.cc
index dca466e..6c8c663 100644
--- a/cache/Project1/Proj1-1/Proj1-1/src/cache.cc
+++ b/cache/Project1/Proj1-1/Proj1-1/src/cache.cc
@@ -13,21 +13,21 @@ Cache::Cache(char *argv[])
     }
     if (this->size < 0)
     {
-        throw "Para blockSize Err.";
+        throw "Para Size Err.";
     }
-    if (this->Assoc < 1)
+    if (this->assoc < 1)
     {
-        throw "Para blockSize Err.";
+        throw "Para assoc Err.";
     }
 
     if (this->replicementPolicy != LRU && this->replicementPolicy != LFU)
     {
-        throw "Para blockSize Err.";
+        throw "Para replicementPolicy Err.";
     }
 
     if (this->writePolicy != WBWA && this->writePolicy != WTNA)
     {
-        throw "Para blockSize Err.";
+        throw "Para writePolicy Err.";
     }
 
     this->offset = log2_floor(this->blockSize);
@@ -39,7 +39,7 @@ Cache::Cache(char *argv[])
 
     this->L1.resize(this->getMaxIndex());
     for (auto &s : L1 ) 
-        s.block.resize(this->GetAssoc());
+        s.block.resize(this->getAssoc());
 }
 
 Cache::~Cache()
@@ -49,7 +49,7 @@ Cache::~Cache()
 uint32_t Cache::getMaxIndex(){
     return (1<<this->index);
 }
-uint32_t Cache::GetAssoc() {
+uint32_t Cache::getAssoc() {
         return this->assoc;
     }