1 files changed, 16 insertions, 9 deletions

diff --git a/ue3/mycpu/mycpu.cpp b/ue3/mycpu/mycpu.cpp
index 08861a4..b25e721 100644
--- a/ue3/mycpu/mycpu.cpp
+++ b/ue3/mycpu/mycpu.cpp
@@ -1,10 +1,14 @@
 /**
  * @module mycpu
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
- * @brief  TODO
- * @date   11.05.2009
+ * @brief  mycpu executes a programfile (in simple assembler) by parsing the
+ *         programfile first. This creates a vector of instructions, which will
+ *         be executed in linear order (except jumps) afterwards. In order to
+ *         initialize the memory of the cpu before execution an optional
+ *         memoryfile can be passed as commandline option.
+ * @date   13.05.2009
  * @par Exercise
- *      3
+ *      4
  */
 
 #include <boost/program_options.hpp>
@@ -29,7 +33,11 @@ namespace po = boost::program_options;
  * @exception  none
  * @conditions none
  *
- * TODO
+ * parse commandline options, create and initialize memory,
+ * create cprogram instance, which parses the programfile and
+ * execute CCPU::run()
+ * On error print error message to stderr.
+ * Unknown commandline options will print a usage message.
  */
 int main(int argc, char* argv[])
 {
@@ -88,7 +96,7 @@ int main(int argc, char* argv[])
     }
 
 #if DEBUG
-    memory.dump(cout);
+    memory.dump(cerr);
 #endif
   }
 
@@ -116,7 +124,7 @@ int main(int argc, char* argv[])
   }
 
 #if DEBUG
-  program.dump(cout);
+  program.dump(cerr);
 #endif
 
 
@@ -128,7 +136,7 @@ int main(int argc, char* argv[])
     cpu.setProgram(&program);
     cpu.run();
 #if DEBUG
-    //cpu.dumpRegisters(cout);
+    //cpu.dumpRegisters(cerr);
 #endif
   }
   catch(runtime_error& ex)
@@ -136,8 +144,7 @@ int main(int argc, char* argv[])
     cerr << me << ": Error while executing program:" << endl
          << "  " << ex.what() << endl;
 #if DEBUG
-    memory.dump(cout);
-    //cpu.dumpRegisters(cout);
+    memory.dump(cerr);
 #endif
     return 1;
   }