From 64ca41b287dfda14a87c9d8a94c11b09a4c83e42 Mon Sep 17 00:00:00 2001
From: Kacper <kacper.neumann19@imperial.ac.uk>
Date: Sun, 7 Jun 2020 22:35:29 +0100
Subject: [PATCH] Resolved ISA conflict

---
 InstructionGenerator.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/InstructionGenerator.cpp b/InstructionGenerator.cpp
index e136bdd..e3d2aa9 100644
--- a/InstructionGenerator.cpp
+++ b/InstructionGenerator.cpp
@@ -217,7 +217,6 @@ string getInstructionHex(string instruction){
       binary+="010101";
     }else if(opcode=="ADO"){
       binary+="010110";
-      rs1="R0";
       rs2="R0";
     }else if(opcode=="SUB"){
       binary+="011000";
@@ -225,7 +224,6 @@ string getInstructionHex(string instruction){
       binary+="011001";
     }else if(opcode=="SBO"){
       binary+="011010";
-      rs1="R0";
       rs2="R0";
     }else if(opcode=="MUL"){
       binary+="011100";