Bug fixes

2 files changed, 20 insertions, 11 deletions

diff --git a/src/ex.cc b/src/ex.cc
index 03a4e59..6dfe44f 100644
--- a/src/ex.cc
+++ b/src/ex.cc
@@ -183,14 +183,10 @@ void EX::advance_helper()
 			break;
 
 		case ADDV:
-			if(v_len ==0){
-
-			} else {
-				for(int i=0;i<v_len;i++){
-					this->set_condition(OF, ADDITION_OF_GUARD(v1[i],v2[i]));
-					this->set_condition(UF, ADDITION_UF_GUARD(v1[i],v2[i]));
-					v1[i] = v1[i] + v2[i];
-				}		
+			for(int i=0;i<v_len;i++){
+				this->set_condition(OF, ADDITION_OF_GUARD(v1[i],v2[i]));
+				this->set_condition(UF, ADDITION_UF_GUARD(v1[i],v2[i]));
+				v1[i] = v1[i] + v2[i];
 			}
 			break;
 		case SUBV:
@@ -234,8 +230,16 @@ void EX::advance_helper()
 		case NOP:
 			break;			
 		
-	}	
-		
+	}
+	if(this->is_vector_type(m)) {
+		if(this->curr_instr->mnemonic != LOADV && this->curr_instr->mnemonic != STOREV){
+			this->curr_instr->operands.vector.slot_one = v1;	
+		} else {
+			this->curr_instr->operands.load_store_vector.base_addr = v_base_addr;
+		}	 
+	} else{
+		this->curr_instr->operands.integer.slot_one = s1;
+	}
 	this->status = OK;
 }
 
diff --git a/src/id.cc b/src/id.cc
index 7db67c4..4358150 100644
--- a/src/id.cc
+++ b/src/id.cc
@@ -253,6 +253,7 @@ void ID::decode_I_type(signed int &s1)
 		s1 = GET_MID_BITS(s1, s0b, s1b);
 		break;
 	default:
+		this->curr_instr->operands.integer.slot_three = s3;
 		s2 = GET_MID_BITS(s1, s0b, s1b);
 		s1 = GET_LS_BITS(s1, s0b);
 	}
@@ -312,6 +313,10 @@ void ID::decode_J_type(signed int &s1)
 		[[fallthrough]];
 	default:
 		this->status = this->read_guard(s1);
-		this->curr_instr->operands.integer.slot_one = s1;
+		if(this->status == OK){
+			this->curr_instr->operands.integer.slot_one = s1;
+			this->curr_instr->operands.integer.slot_two = s2;
+			this->curr_instr->operands.integer.slot_three = s3;	
+		}
 	}
 }