From b87fa0973b7a3ec08b08e86a2505e68879455b0e Mon Sep 17 00:00:00 2001
From: Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com>
Date: Tue, 11 Mar 2025 11:45:50 -0400
Subject: Resolving conflicts

---
 inc/cache.h         | 2 +-
 inc/dram.h          | 5 +----
 src/storage/dram.cc | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/inc/cache.h b/inc/cache.h
index bc37f54..20a40c2 100644
--- a/inc/cache.h
+++ b/inc/cache.h
@@ -25,7 +25,7 @@ class Cache : public Storage
 	Response read(
 		Accessor accessor,
 		int address,
-		std::array<signed int, LINE_SIZE> &data) override;
+		std::array<signed int, LINE_SIZE> &data_line) override;
 	Response read_word(Accessor accessor, int address, signed int &data) override;
 
 	/**
diff --git a/inc/dram.h b/inc/dram.h
index 427500c..7774040 100644
--- a/inc/dram.h
+++ b/inc/dram.h
@@ -21,10 +21,8 @@ class Dram : public Storage
 	Response read(
 		Accessor accessor,
 		int address,
-		std::array<signed int, LINE_SIZE> &data) override;
+		std::array<signed int, LINE_SIZE> &data_line) override;
 	Response write_line(Accessor accessor, std::array<signed int, LINE_SIZE> data_line, int address) override;
-
-	Response read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) override;
 	Response read_word(Accessor accessor, int address, signed int &data) override;
 
 	private:
@@ -40,7 +38,6 @@ class Dram : public Storage
 	 * Helper for `read` a line
 	 */
 	void do_read(std::array<signed int, LINE_SIZE> &data_line, int address);
-	void do_read(std::array<signed int, LINE_SIZE>& data_line, int address);
 	/**
 	 * Helper for reading a word.
 	 */
diff --git a/src/storage/dram.cc b/src/storage/dram.cc
index be360a4..76c4f90 100644
--- a/src/storage/dram.cc
+++ b/src/storage/dram.cc
@@ -94,7 +94,7 @@ Response Dram::write(Accessor accessor, signed int data, int address)
 	return r;
 }
 
-Response Dram::read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) { 
+Response Dram::read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data_line) { 
 	Response r = WAIT;
 
 	if (this->requester == IDLE)
@@ -102,7 +102,7 @@ Response Dram::read(Accessor accessor, int address, std::array<signed int, LINE_
 
 	if (this->requester == accessor) {
 		if (this->wait_time == 0) {
-			this->do_read(data, address);
+			this->do_read(data_line, address);
 			r = OK;
 		}
 	}
-- 
cgit v1.2.3