1 files changed, 83 insertions, 45 deletions

diff --git a/ue4/mycpu/ccpu.h b/ue4/mycpu/ccpu.h
index 545b870..7257a87 100644
--- a/ue4/mycpu/ccpu.h
+++ b/ue4/mycpu/ccpu.h
@@ -16,13 +16,37 @@
 # include <iostream>
 # include <iomanip>
 #endif
-#include "cdat.h"
+
+/**
+ * @class CCPUError
+ *
+ * Exception thrown by implemententations of CCPU
+ */
+class CCPUError
+ : public std::invalid_argument
+{
+  public:
+    /**
+     * @method CCPUError
+     * @brief  Default exception ctor
+     * @param  what  message to pass along
+     * @return -
+     * @globalvars none
+     * @exception  none
+     * @pre  none
+     * @post none
+     */
+    CCPUError(const std::string& what)
+      : std::invalid_argument(what)
+    {}
+};
+
 #include "cmem.h"
 #include "displays.h"
 #include "cprogram.h"
 
 /* forward declare CProgram */
-template <class T=CDat<int>, int width=0>
+template <class T>
 class CProgram;
 
 /**
@@ -31,7 +55,7 @@ class CProgram;
  * CPU implementation. Used as a container for memory and instructions.
  * Implements a run method to execute the program (= the instructions).
  */
-template<class T=CDat<int>, int width=0>
+template <class T>
 class CCPU
 {
   typedef typename std::set<CDisplay<T> *>::iterator displayiterator;
@@ -44,9 +68,10 @@ class CCPU
      * @return -
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
-    CCPU(const unsigned cnt);
+    CCPU(const unsigned cnt, T& datatype);
 
     /**
      * @method ~CCPU
@@ -55,7 +80,8 @@ class CCPU
      * @return -
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     ~CCPU();
 
@@ -66,7 +92,8 @@ class CCPU
      * @return number of registers
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     const unsigned getRegisterCount() const
     {
@@ -75,14 +102,15 @@ class CCPU
 
     /**
      * @method getRegisters
-     * @brief  get pointer to registers array
+     * @brief  get reference to registers vector
      * @param  -
-     * @return pointer to registers array
+     * @return reference to registers vector
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
-    T *getRegisters() const
+    std::vector<T> &getRegisters()
     {
       return m_registers;
     }
@@ -94,7 +122,8 @@ class CCPU
      * @return -
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     void setMemory(CMem<T> *memory)
     {
@@ -108,7 +137,8 @@ class CCPU
      * @return pointer to memory
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     CMem<T> *getMemory() const
     {
@@ -122,7 +152,8 @@ class CCPU
      * @return -
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     void setProgram(const CProgram<T> *program)
     {
@@ -136,7 +167,8 @@ class CCPU
      * @return pointer to program
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     const CProgram<T> *getProgram()
     {
@@ -150,7 +182,8 @@ class CCPU
      * @return reference to set of pointers to displays
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     const std::set<CDisplay<T> *>& getDisplays()
     {
@@ -164,7 +197,8 @@ class CCPU
      * @return -
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     void setFlagZero(const bool value)
     {
@@ -178,7 +212,8 @@ class CCPU
      * @return value of zero flag
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     const bool getFlagZero()
     {
@@ -192,7 +227,8 @@ class CCPU
      * @return -
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     void setFlagSign(const bool value)
     {
@@ -206,7 +242,8 @@ class CCPU
      * @return value of sign flag
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     const bool getFlagSign()
     {
@@ -219,8 +256,9 @@ class CCPU
      * @param  -
      * @return -
      * @globalvars none
-     * @exception  std::runtime_error
-     * @conditions none
+     * @exception  CCPUError
+     * @pre  none
+     * @post none
      */
     void run();
 
@@ -232,14 +270,16 @@ class CCPU
      * @return void
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     void dumpRegisters(std::ostream& out);
 #endif
 
   private:
     /* members */
-    T *m_registers;
+    T m_datatype;
+    std::vector<T> m_registers;
     unsigned m_regcnt;
     CMem<T> *m_memory;
     const CProgram<T> *m_program;
@@ -250,15 +290,10 @@ class CCPU
 
 /*----------------------------------------------------------------------------*/
 
-template<class T, int width>
-CCPU<T, width>::CCPU(const unsigned cnt)
-  : m_regcnt(cnt), m_memory(NULL), m_program(NULL), m_flagzero(false), m_flagsign(false)
+template <class T>
+CCPU<T>::CCPU(const unsigned cnt, T& datatype)
+  : m_datatype(datatype), m_registers(cnt, T(m_datatype) = 0), m_regcnt(cnt), m_memory(NULL), m_program(NULL), m_flagzero(false), m_flagsign(false)
 {
-  /* create registers */
-  m_registers = new T[cnt];
-  for(unsigned i = 0; i < cnt; ++i)
-    m_registers[i] = 0;
-
   /* create displays */
   m_displays.insert(new CDisplayWDEZ<T>);
   m_displays.insert(new CDisplayWHEX<T>);
@@ -266,13 +301,9 @@ CCPU<T, width>::CCPU(const unsigned cnt)
 
 /*----------------------------------------------------------------------------*/
 
-template<class T, int width>
+template <class T>
 CCPU<T>::~CCPU()
 {
-  /* delete registers */
-  delete[] m_registers;
-  m_registers = NULL;
-
   /* delete displays */
   for (displayiterator it = m_displays.begin() ; it != m_displays.end(); ++it)
     delete *it;
@@ -280,15 +311,15 @@ CCPU<T>::~CCPU()
 
 /*----------------------------------------------------------------------------*/
 
-template<class T, int width>
+template <class T>
 void CCPU<T>::run()
 {
   if (m_memory == NULL)
-    throw std::runtime_error("CPU has no memory");
+    throw CCPUError("CPU has no memory");
   if (m_program == NULL)
-    throw std::runtime_error("CPU has no program to execute");
+    throw CCPUError("CPU has no program to execute");
   if (m_regcnt == 0)
-    throw std::runtime_error("CPU has no registers");
+    throw CCPUError("CPU has no registers");
 
   bool run = true;
   while(run)
@@ -301,18 +332,25 @@ void CCPU<T>::run()
 
     /* pc is out of bound */
     if (pc > m_program->size())
-      throw std::runtime_error("Programcounter is out of bound");
+      throw CCPUError("Programcounter is out of bound");
 
     /* execute instruction */
-    (*m_program->at(pc))(this);
-    ++m_registers[0];
+    try
+    {
+      (*m_program->at(pc))(this);
+      ++m_registers[0];
+    }
+    catch(CInstructionError& ex)
+    {
+      throw CCPUError(ex.what());
+    }
   }
 }
 
 /*----------------------------------------------------------------------------*/
 
 #if DEBUG
-template<class T, int width>
+template <class T>
 void CCPU<T>::dumpRegisters(std::ostream& out)
 {
   out << "[REGISTER DUMP]" << std::endl;