Merge remote-tracking branch 'origin/master' into vector_ext

3 files changed, 8 insertions, 11 deletions

diff --git a/inc/id.h b/inc/id.h
index 3c9c66b..e8e9c36 100644
--- a/inc/id.h
+++ b/inc/id.h
@@ -56,8 +56,6 @@ class ID : public Stage
 
 	Response set_vlen();
 
-	std::vector<int> stage_info() override;
-
   private:
 	/**
 	 * Helper for `get_instr_fields`
diff --git a/inc/if.h b/inc/if.h
index c374145..f0eb6e2 100644
--- a/inc/if.h
+++ b/inc/if.h
@@ -28,8 +28,6 @@ class IF : public Stage
 
 	InstrDTO *advance(Response p) override;
 
-	std::vector<int> stage_info() override;
-
   private:
 	void advance_helper() override;
 };
diff --git a/inc/stage.h b/inc/stage.h
index dde103b..4e0c252 100644
--- a/inc/stage.h
+++ b/inc/stage.h
@@ -53,8 +53,14 @@ class Stage
 	 * 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.
@@ -73,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;