1 files changed, 118 insertions, 94 deletions

diff --git a/ue4/mycpu/mycpu.cpp b/ue4/mycpu/mycpu.cpp
index 2d73177..ac4498a 100644
--- a/ue4/mycpu/mycpu.cpp
+++ b/ue4/mycpu/mycpu.cpp
@@ -12,20 +12,100 @@
  */
 
 #include <boost/program_options.hpp>
+#include <boost/lexical_cast.hpp>
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
 #include <stdlib.h>
 #include "cdat.h"
-#include "cdatn.h"
 #include "cdatset.h"
+#include "cdatn.h"
+#include "ccpu.h"
 #include "cmem.h"
 #include "cprogram.h"
-#include "ccpu.h"
+
+#define REGISTERS 256
 
 using namespace std;
 namespace po = boost::program_options;
 
+/* TODO */
+template<class T>
+void cpu_run(string& me, po::variables_map& vm, unsigned registers, T& datatype)
+{
+  CMem<T> memory;
+  /* optionally initialize memory from file */
+  if (vm.count("memory"))
+  {
+    string memoryfile(vm["memory"].as<string>());
+    ifstream file(memoryfile.c_str(), ios::in);
+    if (!file.is_open())
+      throw runtime_error("Unable to open memoryfile '" + memoryfile + "' for reading.");
+
+    try
+    {
+      memory.initialize(file, datatype);
+      file.close();
+    }
+    catch(CMemError& ex)
+    {
+      file.close();
+      std::stringstream sstr;
+      sstr << "Error while reading from memoryfile:" << endl << "  " << ex.what();
+      throw runtime_error(sstr.str());
+    }
+
+#if DEBUG
+    memory.dump(cerr);
+#endif
+  }
+
+  /* create program instance */
+  CProgram<T> program;
+  string programfile(vm["compile"].as<string>());
+  ifstream file(programfile.c_str(), ios::in);
+  if (!file.is_open())
+    throw runtime_error("Unable to open programfile '" + programfile + "' for reading.");
+
+  try
+  {
+    program.compile(file);
+    file.close();
+  }
+  catch(CProgramError& ex)
+  {
+    file.close();
+    std::stringstream sstr;
+    sstr << "Error while compiling programfile:" << endl << "  " << ex.what();
+    throw runtime_error(sstr.str());
+  }
+
+#if DEBUG
+  program.dump(cerr);
+#endif
+
+  /* execute the program */
+  CCPU<T> cpu(registers, datatype);
+  try
+  {
+    cpu.setMemory(&memory);
+    cpu.setProgram(&program);
+    cpu.run();
+#if DEBUG
+    //cpu.dumpRegisters(cerr);
+#endif
+  }
+  catch(CCPUError& ex)
+  {
+    std::stringstream sstr;
+    sstr << "Error while executing program:" << endl << "  " << ex.what();
+#if DEBUG
+    memory.dump(cerr);
+#endif
+    throw runtime_error(sstr.str());
+  }
+}
+
 /**
  * @func   main
  * @brief  program entry point
@@ -34,7 +114,8 @@ namespace po = boost::program_options;
  * @return 0 on success, not 0 otherwise
  * @globalvars none
  * @exception  none
- * @conditions none
+ * @pre  none
+ * @post none
  *
  * parse commandline options, create and initialize memory,
  * create cprogram instance, which parses the programfile and
@@ -50,7 +131,7 @@ int main(int argc, char* argv[])
   po::options_description desc("Allowed options");
   desc.add_options()
     ("help,h",    "this help message")
-    ("format,f",  po::value<string>(), "format")
+    ("format,f",  po::value<string>(), "input format")
     ("compile,c", po::value<string>(), "input programfile")
     ("memory,m",  po::value<string>(), "input memoryfile");
 
@@ -64,6 +145,7 @@ int main(int argc, char* argv[])
   catch(po::error& ex)
   {
     cerr << me << ": Error: " << ex.what() << endl;
+    return 1;
   }
 
   /* print usage upon request or missing params */
@@ -74,107 +156,49 @@ int main(int argc, char* argv[])
     return 0;
   }
 
-  /* create memory and optionally initialize memory from file */
-  
-  CMem *memory = NULL;
-  if (vm.count("format"))
+  /* create memory, program and cpu from templates */
+  try
   {
-    string format(vm["format"].as<string>());
-    if(format == "s")
-        memory = new CMem<CDatSet<int> >();
-    else
+    if (vm.count("format"))
     {
-      try
+      string format(vm["format"].as<string>());
+      if (format == "s")
       {
-        int bc = boost::lexical_cast<int>(format);
-        if (bc > 1 && bc < 33)
-          memory = new CMem<CDatN<int> >();
-      }   
-      catch(boost::bad_lexical_cast& ex)
+        CDatSet datatype(0);
+        cpu_run<CDatSet>(me, vm, REGISTERS, datatype);
+      }
+      else
       {
-        std::stringstream sstr;
-        sstr << "Illegal format: (" << format << "): " << ex.what();
-        throw std::runtime_error(sstr.str());
+        unsigned bc;
+        try
+        {
+          bc = boost::lexical_cast<unsigned>(format);
+        }
+        catch(boost::bad_lexical_cast& ex)
+        {
+          cerr << me << ": Paramater 'format' has invalid or unknown format." << endl;
+          return 1;
+        }
+
+        if (bc < 2 || bc > 31)
+        {
+          cerr << me << ": Paramater 'format' must be inbetween 2 and 32." << endl;
+          return 1;
+        }
+
+        CDatN datatype(0, bc);
+        cpu_run<CDatN>(me, vm, REGISTERS, datatype);
       }
     }
-  }
-  else
-   
-  
-  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)
+    else
     {
-      file.close();
-      cerr << me << ": Error while reading from memoryfile:" << endl
-           << "  " << ex.what() << endl;
-      return 1;
+      CDat<int> datatype(0);
+      cpu_run<CDat<int> >(me, vm, REGISTERS, datatype);
     }
-
-#if DEBUG
-    memory->dump(cerr);
-#endif
-  }
-
-  /* create program instance */
-  CProgram<CDat<int> > 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;
-  }
-
-  try
-  {
-    program.compile(file);
-    file.close();
-  }
-  catch(runtime_error& ex)
-  {
-    file.close();
-    cerr << me << ": Error while compiling programfile:" << endl
-         << "  " << ex.what() << endl;
-    return 1;
-  }
-
-#if DEBUG
-  program.dump(cerr);
-#endif
-
-
-  /* create cpu and execute the program */
-  try
-  {
-    CCPU<CDat<int> > cpu(256);
-    cpu.setMemory(memory);
-    cpu.setProgram(&program);
-    cpu.run();
-#if DEBUG
-    //cpu.dumpRegisters(cerr);
-#endif
   }
   catch(runtime_error& ex)
   {
-    cerr << me << ": Error while executing program:" << endl
-         << "  " << ex.what() << endl;
-#if DEBUG
-    memory->dump(cerr);
-#endif
+    cerr << me << ": " << ex.what() << endl;
     return 1;
   }