trying merging cpu-mm with default branch

1 files changed, 75 insertions, 58 deletions

diff --git a/ue3/mycpu/cmem.h b/ue3/mycpu/cmem.h
index 356c9c0..5045c34 100644
--- a/ue3/mycpu/cmem.h
+++ b/ue3/mycpu/cmem.h
@@ -1,92 +1,109 @@
 /**
  * @module cmem
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
- * @brief  class for providing 256 registers.
- * @date   11.05.2009
+ * @brief  Memory template and memory definition for CCPU
+ * @date   10.05.2009
  */
 
 #ifndef CMEM_H
-#define CMEM_H
+#define CMEM_H 1
 
+#include <vector>
+#include <istream>
+#include <sstream>
 #include <stdexcept>
-#include <string>
-
-#include <set>
+#include <boost/lexical_cast.hpp>
 #ifdef DEBUG
 # include <iostream>
+# include <iomanip>
 #endif
-  #include "cdat.h"
-
+#include "cdat.h"
 
-#define MAX_REGISTER 256;
 /**
- * @class CMem
+ * @class CVectorMem
  *
- * Parses a simple line based scriptfile with some limitations:
- * first function (starting a block) must be a read-command,
- * last must be a write-command (ending this block).
- *
- * read- and write-commands have hard coded parameters, number#1 being a filetype.
- * Classes handling certain filetypes must be of type CFile.
- * Custom functions will be passed to CFile::callFunc().
- *
- * On error ParserError will be thrown.
+ * Extends std::vector template for use as memory for CCPU.
  */
-class CMem
+template <class T, class Allocator=std::allocator<T> >
+class CVectorMem
+  : public std::vector<T, Allocator>
 {
   public:
+    using std::vector<T, Allocator>::size;
+    using std::vector<T, Allocator>::at;
 
     /**
-     * @method CMem
-     * @brief  Default ctor
-     * @param  memoryfile filename 
-     * @return -
+     * @method initialize
+     * @brief  initialize the vector with the content of istream. istream is
+     *         read per line. empty lines will add unitialized elements.
+     * @param  in  inputstream to read from
+     * @return void
      * @globalvars none
-     * @exception  bad_alloc
+     * @exception  std::runtime_error
      * @conditions none
      */
-    CMem(const std::string& memfile);
+    void initialize(std::istream& in)
+    {
+      if (!in.good())
+        return;
+
+      std::string line;
+      unsigned i = 0;
+      while (!in.eof() && in.good())
+      {
+        ++i;
+        std::getline(in, line);
 
+        /* skip last line if it's empty */
+        if (line.empty() && in.eof())
+          break;
+
+        T value;
+        try
+        {
+          if (!line.empty())
+            value = boost::lexical_cast<T>(line);
+        }
+        catch(boost::bad_lexical_cast& ex)
+        {
+          std::stringstream sstr;
+          sstr << "Unable to convert input (line " << i << "): " << ex.what();
+          throw std::runtime_error(sstr.str());
+        }
+
+        push_back(value);
+      }
+    }
+
+#if DEBUG
     /**
-     * @method ~CMem
-     * @brief  Default dtor
-     * @param  -
-     * @return -
+     * @method dump
+     * @brief  dumps contents of vector to outputstream
+     * @param  out  outputstream to write to
+     * @return void
      * @globalvars none
      * @exception  none
      * @conditions none
      */
-    ~CMem();
-
-    CDat& getRegister(const std::string reg);
-    
-    std::string getMemAt(const std::string addr);
-    
-    void setMemAt(const std::string addr, const CDat& value);
-    
-#ifdef DEBUG
-    /**
-     * @method dump
-     * @brief  Dumps the resgister contnent to ostream
-     * @param  out output stream
-     * @return -
-     * @globalvars
-     * @exception
-     * @conditions
-     */
-    void dump(std::ostream& out);
+    void dump(std::ostream& out)
+    {
+      out << "[MEMORY DUMP]" << std::endl;
+      for(unsigned i = 0; i < size(); ++i)
+      {
+        out << "[" << std::setw(4) << std::setfill('0') << i << "]  "
+            << at(i) << std::endl;
+      }
+    }
 #endif
-
-
-  private:
-  
-    unsigned int getRegNr(const std::string reg);
-    
-    /* members */
-    std::string m_memfile;
-    std::vector<CDat> m_registers;
 };
 
+/**
+ * @class CMem
+ *
+ * Memory definition for CCPU
+ */
+typedef CVectorMem<CDat> CMem;
+
 #endif
 
 /* vim: set et sw=2 ts=2: */