Merge pull request #42 from bdunahu/bdunahu

Add tests for EX, rest of (non-vector) instructions

1 files changed, 21 insertions, 19 deletions

diff --git a/src/sim/id.cc b/src/sim/id.cc
index 36addbb..edf74e2 100644
--- a/src/sim/id.cc
+++ b/src/sim/id.cc
@@ -8,25 +8,6 @@
 
 ID::ID(Stage *stage) : Stage(stage) { this->id = DCDE; }
 
-void ID::get_instr_fields(
-	signed int &s1, signed int &s2, signed int &s3, Mnemonic &m)
-{
-	unsigned int type;
-	this->split_instr(s1, type, m);
-
-	switch (type) {
-	case 0b00:
-		this->decode_R_type(s1, s2, s3);
-		break;
-	case 0b01:
-		this->decode_I_type(s1, s2, s3);
-		break;
-	case 0b10:
-		this->decode_J_type(s1, s2);
-		break;
-	}
-}
-
 void ID::split_instr(signed int &raw, unsigned int &type, Mnemonic &m)
 {
 	unsigned int opcode, opcode_size;
@@ -80,6 +61,27 @@ void ID::advance_helper()
 	}
 }
 
+void ID::get_instr_fields(
+	signed int &s1, signed int &s2, signed int &s3, Mnemonic &m)
+{
+	unsigned int type;
+	this->split_instr(s1, type, m);
+
+	switch (type) {
+	case 0b00:
+		this->decode_R_type(s1, s2, s3);
+		break;
+	case 0b01:
+		this->decode_I_type(s1, s2, s3);
+		break;
+	case 0b10:
+		this->decode_J_type(s1, s2);
+		break;
+	case 0b11:
+		this->status = OK;
+	}
+}
+
 void ID::decode_R_type(signed int &s1, signed int &s2, signed int &s3)
 {
 	unsigned int s0b, s1b, s2b;