From b87f192702f5a02be473c9b05b8b34f1dc7e4296 Mon Sep 17 00:00:00 2001
From: Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com>
Date: Sun, 9 Mar 2025 11:39:59 -0400
Subject: Implement dram load

---
 inc/cache.h   | 2 +-
 inc/dram.h    | 8 +++++++-
 inc/storage.h | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'inc')

diff --git a/inc/cache.h b/inc/cache.h
index f1fb942..d470e6c 100644
--- a/inc/cache.h
+++ b/inc/cache.h
@@ -18,7 +18,7 @@ class Cache : public Storage
 	~Cache();
 
 	Response write(Accessor accessor, signed int data, int address) override;
-	Response read(Accessor accessor, int address) override;
+	Response read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) override;
 };
 
 #endif /* CACHE_H_INCLUDED */
diff --git a/inc/dram.h b/inc/dram.h
index cfac799..ec35e3f 100644
--- a/inc/dram.h
+++ b/inc/dram.h
@@ -16,7 +16,13 @@ class Dram : public Storage
 	~Dram();
 
 	Response write(Accessor accessor, signed int data, int address) override;
-	Response read(Accessor accessor, int address) override;
+	Response read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) override;
+
+	private:
+	void do_read(std::array<signed int, LINE_SIZE>& data_line, int address){
+		int line = address / LINE_SIZE;
+		data_line = this->data->at(line);
+	}
 };
 
 #endif /* DRAM_H_INCLUDED */
diff --git a/inc/storage.h b/inc/storage.h
index 4bf4591..1fb41b0 100644
--- a/inc/storage.h
+++ b/inc/storage.h
@@ -32,7 +32,7 @@ class Storage
 	 * @return a status code reflecting the state of the request, and the
 	 * data being returned.
 	 */
-	virtual Response read(Accessor accessor, int address) = 0;
+	virtual Response read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) = 0;
 	/**
 	 * Sidedoor view of `lines` of memory starting at `base`.
 	 * @param The base line to start getting memory from.
-- 
cgit v1.2.3


From 035eba9d7a3b1c68b57bf954d0e3983d6e5f11e5 Mon Sep 17 00:00:00 2001
From: Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com>
Date: Sun, 9 Mar 2025 12:49:31 -0400
Subject: Code review comments

---
 inc/dram.h          | 5 +----
 src/storage/dram.cc | 5 +++++
 tests/dram.cc       | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'inc')

diff --git a/inc/dram.h b/inc/dram.h
index ec35e3f..1061d6b 100644
--- a/inc/dram.h
+++ b/inc/dram.h
@@ -19,10 +19,7 @@ class Dram : public Storage
 	Response read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) override;
 
 	private:
-	void do_read(std::array<signed int, LINE_SIZE>& data_line, int address){
-		int line = address / LINE_SIZE;
-		data_line = this->data->at(line);
-	}
+	void do_read(std::array<signed int, LINE_SIZE>& data_line, int address);
 };
 
 #endif /* DRAM_H_INCLUDED */
diff --git a/src/storage/dram.cc b/src/storage/dram.cc
index 43c092d..0db4c35 100644
--- a/src/storage/dram.cc
+++ b/src/storage/dram.cc
@@ -38,6 +38,11 @@ Response Dram::write(Accessor accessor, signed int data, int address)
 	return r;
 }
 
+void Dram::do_read(std::array<signed int, LINE_SIZE>& data_line, int address){
+	int line = address / LINE_SIZE;
+	data_line = this->data->at(line);
+}
+
 Response Dram::read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) { 
 	Response r = WAIT;
 	if (this->requester == IDLE)
diff --git a/tests/dram.cc b/tests/dram.cc
index 484b459..95ef90a 100644
--- a/tests/dram.cc
+++ b/tests/dram.cc
@@ -2,7 +2,6 @@
 #include "definitions.h"
 #include <array>
 #include <catch2/catch_test_macros.hpp>
-#include <iostream>
 
 TEST_CASE("Construct singleton dram", "[dram]")
 {
-- 
cgit v1.2.3