1 files changed, 32 insertions, 5 deletions

diff --git a/ue4/mycpu/mycpu.cpp b/ue4/mycpu/mycpu.cpp
index 6c9f71a..2d73177 100644
--- a/ue4/mycpu/mycpu.cpp
+++ b/ue4/mycpu/mycpu.cpp
@@ -17,6 +17,8 @@
 #include <stdexcept>
 #include <stdlib.h>
 #include "cdat.h"
+#include "cdatn.h"
+#include "cdatset.h"
 #include "cmem.h"
 #include "cprogram.h"
 #include "ccpu.h"
@@ -73,7 +75,32 @@ int main(int argc, char* argv[])
   }
 
   /* create memory and optionally initialize memory from file */
-  CMem<CDat<int> > memory;
+  
+  CMem *memory = NULL;
+  if (vm.count("format"))
+  {
+    string format(vm["format"].as<string>());
+    if(format == "s")
+        memory = new CMem<CDatSet<int> >();
+    else
+    {
+      try
+      {
+        int bc = boost::lexical_cast<int>(format);
+        if (bc > 1 && bc < 33)
+          memory = new CMem<CDatN<int> >();
+      }   
+      catch(boost::bad_lexical_cast& ex)
+      {
+        std::stringstream sstr;
+        sstr << "Illegal format: (" << format << "): " << ex.what();
+        throw std::runtime_error(sstr.str());
+      }
+    }
+  }
+  else
+   
+  
   if (vm.count("memory"))
   {
     string memoryfile(vm["memory"].as<string>());
@@ -86,7 +113,7 @@ int main(int argc, char* argv[])
 
     try
     {
-      memory.initialize(file);
+      memory->initialize(file);
       file.close();
     }
     catch(runtime_error& ex)
@@ -98,7 +125,7 @@ int main(int argc, char* argv[])
     }
 
 #if DEBUG
-    memory.dump(cerr);
+    memory->dump(cerr);
 #endif
   }
 
@@ -134,7 +161,7 @@ int main(int argc, char* argv[])
   try
   {
     CCPU<CDat<int> > cpu(256);
-    cpu.setMemory(&memory);
+    cpu.setMemory(memory);
     cpu.setProgram(&program);
     cpu.run();
 #if DEBUG
@@ -146,7 +173,7 @@ int main(int argc, char* argv[])
     cerr << me << ": Error while executing program:" << endl
          << "  " << ex.what() << endl;
 #if DEBUG
-    memory.dump(cerr);
+    memory->dump(cerr);
 #endif
     return 1;
   }