From ddf63e2765a6b225d18c59321595e69e1a126e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Neuwirth?= <e0626638@student.tuwien.ac.at>
Date: Tue, 12 May 2009 23:00:03 +0200
Subject: adding tha rest

---
 ue3/mycpu/cinstruction.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ue3/mycpu/cinstruction.cpp')

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]));
 }
 
 
-- 
cgit v1.2.3