Merge pull request #36 from bdunahu/bdunahu

Add fetch stage implementation, tests, program loading, DTO object
Base classes plus base tests for Instruction Fetch stage with a default program

2 files changed, 15 insertions, 0 deletions

diff --git a/inc/dram.h b/inc/dram.h
index 0799015..102ec0f 100644
--- a/inc/dram.h
+++ b/inc/dram.h
@@ -29,6 +29,11 @@ class Dram : public Storage
 	Response
 	read_word(Accessor accessor, int address, signed int &data) override;
 
+	/**
+	 * TODO This will accept a file at a later date.
+	 */
+	void load(std::vector<signed int> program);
+
   private:
 	/**
 	 * Helper for all access methods.
diff --git a/src/storage/dram.cc b/src/storage/dram.cc
index 371503d..f90f8db 100644
--- a/src/storage/dram.cc
+++ b/src/storage/dram.cc
@@ -56,6 +56,16 @@ Response Dram::read_word(Accessor accessor, int address, signed int &data)
 	});
 }
 
+// TODO load a file instead and test this method
+void Dram::load(std::vector<signed int> program) {
+	unsigned long i;
+	for (i = 0; i < program.size(); ++i) {
+		int line, word;
+		get_memory_index(i, line, word);
+		this->data->at(line).at(word) = program[i];
+	}
+}
+
 Response Dram::process(
 	Accessor accessor,
 	int address,