1 files changed, 4 insertions, 4 deletions

diff --git a/ue3/mycpu/cinstruction.cpp b/ue3/mycpu/cinstruction.cpp
index 3cbb033..12c5c74 100644
--- a/ue3/mycpu/cinstruction.cpp
+++ b/ue3/mycpu/cinstruction.cpp
@@ -49,15 +49,15 @@ void CDiv::exec(CMem& mem, vector<string>& instr)
 
 void CLoad::exec(CMem& mem, vector<string>& instr)
 {
-        istringstream stmp ("22");
-         stmp >> mem.getRegister(instr[1]);
-        cout <<mem.getRegister(instr[1])<<" "<<  mem.getMem(instr[2])<<endl;
+        istringstream stmp (mem.getMemAt(instr[2]));
+        stmp >> mem.getRegister(instr[1]);
+
 }
 
 
 void CStore::exec(CMem& mem, vector<string>& instr)
 {
-        mem.setMem(instr[2], mem.getRegister(instr[1]));
+        mem.setMemAt(instr[2], mem.getRegister(instr[1]));
 }