Merge pull request #14 from bdunahu/bdunahuer

Storage.view + Dram.store methods, tests

1 files changed, 8 insertions, 7 deletions

diff --git a/src/storage/cache.cc b/src/storage/cache.cc
index 34bdc5f..bbefb2a 100644
--- a/src/storage/cache.cc
+++ b/src/storage/cache.cc
@@ -1,8 +1,11 @@
-#include <cache.h>
+#include "cache.h"
+#include "definitions.h"
+#include "response.h"
+#include <bits/stdc++.h>
 
 Cache::Cache(int lines, Storage *lower, int delay)
 {
-	this->data = new std::vector<std::array<unsigned int, 4>>;
+	this->data = new std::vector<std::array<signed int, LINE_SIZE>>;
 	this->data->resize(lines);
 	this->lower = lower;
 	this->delay = delay;
@@ -11,11 +14,9 @@ Cache::Cache(int lines, Storage *lower, int delay)
 
 Cache::~Cache() { delete this->data; }
 
-Response *Cache::write(Accessor accessor, signed int data, int address)
+Response Cache::write(Accessor accessor, signed int data, int address)
 {
-	return new Response();
+	return WAIT;
 }
 
-Response *Cache::read(Accessor accessor, int address) { return nullptr; }
-
-int **Cache::view(int base, int lines) { return nullptr; }
+Response Cache::read(Accessor accessor, int address) { return WAIT; }