1 files changed, 94 insertions, 33 deletions

diff --git a/ue3/mycpu/mycpu.cpp b/ue3/mycpu/mycpu.cpp
index af6fe08..b25e721 100644
--- a/ue3/mycpu/mycpu.cpp
+++ b/ue3/mycpu/mycpu.cpp
@@ -1,17 +1,24 @@
 /**
  * @module mycpu
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
- * @brief  mycpu reads a program file and optional a memory file given as 
- *             commandline option.
- *             On error (e.g. unknown function) the program will terminate
- * @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 <iostream>
 #include <boost/program_options.hpp>
+#include <iostream>
+#include <fstream>
+#include <stdexcept>
+#include <stdlib.h>
 #include "ccpu.h"
+#include "cmem.h"
+#include "cprogram.h"
 
 using namespace std;
 namespace po = boost::program_options;
@@ -26,8 +33,10 @@ namespace po = boost::program_options;
  * @exception  none
  * @conditions none
  *
- * setup commandline options, parse them and pass scriptfile to scriptparser
- * instance. On error print error message to stderr.
+ * 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[])
@@ -37,9 +46,9 @@ int main(int argc, char* argv[])
   /* define commandline options */
   po::options_description desc("Allowed options");
   desc.add_options()
-    ("help,h", "this help message")
-    ("progfile,c", po::value<string>(), "program file")
-    ("memfile,m", po::value<string>(), "memory file");
+    ("help,h",    "this help message")
+    ("compile,c", po::value<string>(), "input programfile")
+    ("memory,m",  po::value<string>(), "input memoryfile");
 
   /* parse commandline options */
   po::variables_map vm;
@@ -50,43 +59,95 @@ int main(int argc, char* argv[])
   }
   catch(po::error& ex)
   {
-    cerr << "Error: " << ex.what() << endl;
+    cerr << me << ": Error: " << ex.what() << endl;
   }
 
   /* print usage upon request or missing params */
-  if (vm.count("help") || !vm.count("progfile"))
+  if (vm.count("help") || !vm.count("compile"))
   {
-    cout << "Usage: " << me << " -c <programfile> [ -m <memoryfile>]" << endl;
+    cout << "Usage: " << me << " -c <programfile> [-m <memoryfile>]" << endl;
     cout << desc << endl;
-    if ( vm.count("help"))
-      return 0;
+    return 0;
+  }
+
+  /* create memory and optionally initialize memory from file */
+  CMem memory;
+  if (vm.count("memory"))
+  {
+    string memoryfile(vm["memory"].as<string>());
+    ifstream file(memoryfile.c_str(), ios::in);
+    if (!file.is_open())
+    {
+      cerr << me << ": Unable to open memoryfile '" << memoryfile << "' for reading." << endl;
+      return 1;
+    }
+
+    try
+    {
+      memory.initialize(file);
+      file.close();
+    }
+    catch(runtime_error& ex)
+    {
+      file.close();
+      cerr << me << ": Error while reading from memoryfile:" << endl
+           << "  " << ex.what() << endl;
+      return 1;
+    }
+
+#if DEBUG
+    memory.dump(cerr);
+#endif
+  }
+
+  /* create program instance */
+  CProgram program;
+  string programfile(vm["compile"].as<string>());
+  ifstream file(programfile.c_str(), ios::in);
+  if (!file.is_open())
+  {
+    cerr << me << ": Unable to open programfile '" << programfile << "' for reading." << endl;
     return 1;
   }
-  
-  string memfile("");
-  if (vm.count("memfile"))
-    memfile = vm["memfile"].as<string>();
-  
-  CCPU cpu(vm["progfile"].as<string>(), memfile);
-  cpu.proceed();
- 
-/*  CScriptparser parser(vm["c"].as<string>());
+
   try
   {
-    parser.parse();
+    program.compile(file);
+    file.close();
   }
-  catch(CScriptparser::ParserError& ex)
+  catch(runtime_error& ex)
   {
-    cerr << me << ": Error while processing scriptfile: " << ex.what() << endl;
-    if (!ex.getLine().empty())
-      cerr << "Scriptline: '" << ex.getLine() << "'" << endl;
+    file.close();
+    cerr << me << ": Error while compiling programfile:" << endl
+         << "  " << ex.what() << endl;
     return 1;
   }
-  catch(exception& ex)
+
+#if DEBUG
+  program.dump(cerr);
+#endif
+
+
+  /* create cpu and execute the program */
+  try
+  {
+    CCPU cpu(256);
+    cpu.setMemory(&memory);
+    cpu.setProgram(&program);
+    cpu.run();
+#if DEBUG
+    //cpu.dumpRegisters(cerr);
+#endif
+  }
+  catch(runtime_error& ex)
   {
-    cerr << me << ": Unexpected exception: " << ex.what() << endl;
+    cerr << me << ": Error while executing program:" << endl
+         << "  " << ex.what() << endl;
+#if DEBUG
+    memory.dump(cerr);
+#endif
     return 1;
-  }*/
+  }
 
   return 0;
 }