Merge pull request #68 from bdunahu/bdunahu

[WIP] Pipeline cleanup and revisited GUI storage display

1 files changed, 9 insertions, 13 deletions

diff --git a/inc/stage.h b/inc/stage.h
index 448c61a..16f1235 100644
--- a/inc/stage.h
+++ b/inc/stage.h
@@ -17,7 +17,6 @@
 
 #ifndef STAGE_H
 #define STAGE_H
-#include "accessor.h"
 #include "instrDTO.h"
 #include "pipe_spec.h"
 #include "response.h"
@@ -51,11 +50,17 @@ class Stage
 	 * ready to accept a new instruction object next cycle.
 	 * @return a DTO object containing the next instruction to be processed.
 	 *
-	 * Must set the status to WAIT when the current instruction is evicted..
+	 * Must set the status to READY when the current instruction is evicted..
 	 */
 	virtual InstrDTO *advance(Response p);
-
-	virtual std::vector<int> stage_info();
+	/**
+	 * @return the current instruction.
+	 */
+	InstrDTO *get_instr();
+	/**
+	 * Squashes the pipeline.
+	 */
+	void squash();
 
 	/* The following methods are made public so that they may be tested, and are
 	 * not to be called from outside classes during standard execution.
@@ -74,11 +79,6 @@ class Stage
 	void set_condition(CC c, bool v);
 
 	/**
-	 * Squashes the pipeline.
-	 */
-	void squash();
-
-	/**
 	 * The set of registers currently checked out.
 	 */
 	static std::deque<signed int> checked_out;
@@ -112,10 +112,6 @@ class Stage
 	 */
 	signed int dereference_register(signed int v);
 	/**
-	 * The name of the pipeline stage.
-	 */
-	Accessor id;
-	/**
 	 * The shared pool of general-purpose integer registers.
 	 */
 	static std::array<signed int, GPR_NUM> gprs;