Merge pull request #37 from bdunahu/bdunahu

Instr, InstrDTO gets/sets, other structures required for decode

-- tests as we move forward
-- base classes
-- decode stage implemented

1 files changed, 34 insertions, 2 deletions

diff --git a/src/sim/stage.cc b/src/sim/stage.cc
index 0d48774..62a7fd6 100644
--- a/src/sim/stage.cc
+++ b/src/sim/stage.cc
@@ -1,11 +1,43 @@
 #include "stage.h"
+#include "utils.h"
+#include <array>
+#include <deque>
 
-Stage::Stage(Stage *next) {
+Stage::Stage(Stage *next)
+{
 	this->next = next;
+	this->curr_instr = nullptr;
+	this->status = OK;
+	this->checked_out = {};
 }
 
+Stage::~Stage() { delete this->next; };
+
 std::array<int, GPR_NUM> Stage::gprs;
-int Stage::pc;
+std::array<int, V_NUM> Stage::vrs;
+std::deque<signed int> Stage::checked_out;
+unsigned int Stage::pc;
 Storage *Stage::storage;
 bool Stage::is_pipelined;
 int Stage::clock_cycle;
+
+signed int Stage::dereference_register(signed int v)
+{
+	signed int r;
+
+	if (v < 0 || v >= GPR_NUM + V_NUM) {
+		throw std::out_of_range(string_format(
+			"instruction tried to access register %d, which does "
+			"not exist",
+			v));
+	}
+
+	r = (v >= GPR_NUM) ? this->vrs[v % GPR_NUM] : this->gprs[v];
+	return r;
+}
+
+bool Stage::is_checked_out(signed int r)
+{
+	return std::find(this->checked_out.begin(), this->checked_out.end(), r) !=
+		   this->checked_out.end();
+}