some changes

1 files changed, 14 insertions, 8 deletions

diff --git a/ue3/mycpu/cinstruction.cpp b/ue3/mycpu/cinstruction.cpp
index 2c8dedf..3cbb033 100644
--- a/ue3/mycpu/cinstruction.cpp
+++ b/ue3/mycpu/cinstruction.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <sstream>
 #include <vector>
 #include <map>
 #include "cinstruction.h"
@@ -28,6 +29,7 @@ void CSub::exec(CMem& mem, vector<string>& instr)
 {
         mem.getRegister(instr[1]) = mem.getRegister(instr[2]) - 
                                                                                                                                                                                                 mem.getRegister(instr[3]);
+
 }
 
 
@@ -47,7 +49,9 @@ void CDiv::exec(CMem& mem, vector<string>& instr)
 
 void CLoad::exec(CMem& mem, vector<string>& instr)
 {
-        mem.getRegister(instr[1]) = mem.getMem(instr[2]);
+        istringstream stmp ("22");
+         stmp >> mem.getRegister(instr[1]);
+        cout <<mem.getRegister(instr[1])<<" "<<  mem.getMem(instr[2])<<endl;
 }
 
 
@@ -57,17 +61,18 @@ void CStore::exec(CMem& mem, vector<string>& instr)
 }
 
 
-void CTest::test(CMem& mem, vector<string>& instr, bool& f_zero, bool& f_sign)
+void CTest::exec(CMem& mem, vector<string>& instr)
 {
         if(mem.getRegister(instr[1]) == 0)      
                 f_zero = true;
         else 
                 f_zero = false;
                 
-        if(mem.getRegister(instr[1]) <= 0)
+        if(mem.getRegister(instr[1]) < 0)
                 f_sign = true;
         else 
                 f_sign = false;
+        
 }
 
 
@@ -76,26 +81,27 @@ void CTest::test(CMem& mem, vector<string>& instr, bool& f_zero, bool& f_sign)
 
 void CJumpa::exec(CMem& mem, vector<string>& instr)
 {
-        mem.getRegister(instr[0]) = (int) m_jumpaddr[instr[1]];
+        mem.getRegister("R0") = (int) m_jumpaddr[instr[1]];
 }
 
 
-void CJumpz::exec(CMem& mem, vector<string>& instr, bool& f_zero)
+void CJumpz::exec(CMem& mem, vector<string>& instr)
 {
         if(f_zero)
-                mem.getRegister(instr[0]) =     (int) m_jumpaddr[instr[1]];
+                mem.getRegister("R0") = (int) m_jumpaddr[instr[1]];
 }
 
 
-void CJumps::exec(CMem& mem, vector<string>& instr, bool& f_sign)
+void CJumps::exec(CMem& mem, vector<string>& instr)
 {
         if(f_sign)
-                mem.getRegister(instr[0]) =     (int) m_jumpaddr[instr[1]];
+                mem.getRegister("R0") =         (int) m_jumpaddr[instr[1]];
 }
 
 
 void CWrite::exec(CMem& mem, vector<string>& instr)
 {
+
         if(instr[1] == "WDEZ")
                 cout << mem.getRegister(instr[2]) << endl;
         else if (instr[1] == "WHEX")