From 95d09e12792cf5ececd32b8dc84f2cd090c496ef Mon Sep 17 00:00:00 2001
From: bd <bdunahu@operationnull.com>
Date: Tue, 22 Apr 2025 20:49:26 -0400
Subject: Remove the accessor object

---
 src/sim/controller.cc | 2 --
 src/sim/dum.cc        | 8 +-------
 src/sim/ex.cc         | 2 --
 src/sim/id.cc         | 3 +--
 src/sim/if.cc         | 3 ---
 src/sim/instrDTO.cc   | 1 -
 src/sim/mm.cc         | 3 ---
 src/sim/stage.cc      | 6 ------
 src/sim/wb.cc         | 3 ---
 9 files changed, 2 insertions(+), 29 deletions(-)

(limited to 'src/sim')

diff --git a/src/sim/controller.cc b/src/sim/controller.cc
index 59fbbb7..1c379ec 100644
--- a/src/sim/controller.cc
+++ b/src/sim/controller.cc
@@ -31,8 +31,6 @@ Controller::Controller(Stage *stage, Storage *storage, bool is_pipelined)
 	this->checked_out = {};
 	this->gprs = {0};
 	this->gprs.at(2) = MEM_WORDS; // set the stack pointer
-	// grant side-door access
-	this->id = SIDE;
 }
 
 void Controller::run_for(int number)
diff --git a/src/sim/dum.cc b/src/sim/dum.cc
index 744c110..fd3b7a6 100644
--- a/src/sim/dum.cc
+++ b/src/sim/dum.cc
@@ -16,13 +16,10 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "dum.h"
-#include "accessor.h"
 #include "instrDTO.h"
 #include "response.h"
 #include "stage.h"
 
-DUM::DUM(Stage *stage) : Stage(stage) { this->id = IDLE; }
-
 InstrDTO *DUM::advance(Response p)
 {
 	InstrDTO *r = nullptr;
@@ -38,7 +35,4 @@ InstrDTO *DUM::advance(Response p)
 
 void DUM::advance_helper() {}
 
-void DUM::set_curr_instr(InstrDTO *d)
-{
-	this->curr_instr = d;
-}
+void DUM::set_curr_instr(InstrDTO *d) { this->curr_instr = d; }
diff --git a/src/sim/ex.cc b/src/sim/ex.cc
index d345ecf..117002c 100644
--- a/src/sim/ex.cc
+++ b/src/sim/ex.cc
@@ -16,7 +16,6 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "ex.h"
-#include "accessor.h"
 #include "instrDTO.h"
 #include "pipe_spec.h"
 #include "response.h"
@@ -32,7 +31,6 @@
 
 EX::EX(Stage *stage) : Stage(stage)
 {
-	this->id = EXEC;
 	instr_map = {
 
 		/* R type instructions */
diff --git a/src/sim/id.cc b/src/sim/id.cc
index cdbaba9..b2bc0e5 100644
--- a/src/sim/id.cc
+++ b/src/sim/id.cc
@@ -16,14 +16,13 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "id.h"
-#include "accessor.h"
 #include "instr.h"
 #include "instrDTO.h"
 #include "logger.h"
 #include "response.h"
 #include "stage.h"
 
-ID::ID(Stage *stage) : Stage(stage) { this->id = DCDE; }
+ID::ID(Stage *stage) : Stage(stage) { }
 
 void ID::split_instr(signed int &raw, unsigned int &type, Mnemonic &m)
 {
diff --git a/src/sim/if.cc b/src/sim/if.cc
index e8e7272..054c77c 100644
--- a/src/sim/if.cc
+++ b/src/sim/if.cc
@@ -16,13 +16,10 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "if.h"
-#include "accessor.h"
 #include "instrDTO.h"
 #include "response.h"
 #include "stage.h"
 
-IF::IF(Stage *stage) : Stage(stage) { this->id = FETCH; }
-
 InstrDTO *IF::advance(Response p)
 {
 	InstrDTO *r = nullptr;
diff --git a/src/sim/instrDTO.cc b/src/sim/instrDTO.cc
index 00b6d5f..cb093bb 100644
--- a/src/sim/instrDTO.cc
+++ b/src/sim/instrDTO.cc
@@ -16,7 +16,6 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "instrDTO.h"
-#include "accessor.h"
 
 InstrDTO::InstrDTO()
 {
diff --git a/src/sim/mm.cc b/src/sim/mm.cc
index e1057d5..3df1578 100644
--- a/src/sim/mm.cc
+++ b/src/sim/mm.cc
@@ -16,13 +16,10 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "mm.h"
-#include "accessor.h"
 #include "instrDTO.h"
 #include "response.h"
 #include "stage.h"
 
-MM::MM(Stage *stage) : Stage(stage) { this->id = MEM; }
-
 void MM::advance_helper()
 {
 	signed int data;
diff --git a/src/sim/stage.cc b/src/sim/stage.cc
index 35c6936..b7be595 100644
--- a/src/sim/stage.cc
+++ b/src/sim/stage.cc
@@ -45,12 +45,6 @@ InstrDTO *Stage::advance(Response p)
 	InstrDTO *s = nullptr;
 	Response n;
 
-	// std::cout << "advance: " << this->id << ": " << this->curr_instr << "?: "
-	// << p << ": " << this->checked_out.size() << ": "; if (curr_instr)
-	// 	std::cout << curr_instr->get_mnemonic();
-	// for (long unsigned int i = 0; i < this->checked_out.size(); ++i)
-	// 	std::cout << this->checked_out[i] << " ";
-	// std::cout << std::endl;
 	if (this->curr_instr && this->curr_instr->is_squashed() == 1)
 		this->status = OK;
 	if (this->curr_instr && this->status != OK) {
diff --git a/src/sim/wb.cc b/src/sim/wb.cc
index 0348b51..55591b6 100644
--- a/src/sim/wb.cc
+++ b/src/sim/wb.cc
@@ -16,15 +16,12 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "wb.h"
-#include "accessor.h"
 #include "instrDTO.h"
 #include "response.h"
 #include "stage.h"
 #include <array>
 #include <algorithm>
 
-WB::WB(Stage *stage) : Stage(stage) { this->id = WRITE; }
-
 void WB::advance_helper()
 {
 	if (this->curr_instr->get_mnemonic() != NOP &&
-- 
cgit v1.2.3