1 files changed, 46 insertions, 4 deletions

diff --git a/ue4/mycpu/cinstruction.h b/ue4/mycpu/cinstruction.h
index 4cc69de..8c35d2c 100644
--- a/ue4/mycpu/cinstruction.h
+++ b/ue4/mycpu/cinstruction.h
@@ -2,7 +2,7 @@
  * @module cinstruction
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
  * @brief  Abstract class for displays
- * @date   13.05.2009
+ * @date   26.05.2009
  */
 
 #ifndef CINSTRUCTION_H
@@ -10,8 +10,14 @@
 
 #include <iostream>
 #include <list>
+#include <sstream>
+#include <stdexcept>
+#include <boost/lexical_cast.hpp>
+#include <assert.h>
+#include "ccpu.h"
 
 /* forward declare CCPU */
+template <class T>
 class CCPU;
 
 /**
@@ -19,6 +25,7 @@ class CCPU;
  *
  * Abstract class for displays
  */
+template <class T>
 class CInstruction
 {
   public:
@@ -70,7 +77,7 @@ class CInstruction
      * @exception  std::runtime_error
      * @conditions none
      */
-    virtual CInstruction& operator()(CCPU *cpu)
+    virtual CInstruction& operator()(CCPU<T> *cpu)
     {
       execute(cpu);
       return *this;
@@ -142,7 +149,7 @@ class CInstruction
      * @exception  std::runtime_error
      * @conditions none
      */
-    virtual void checkRegister(CCPU *cpu, const unsigned regidx);
+    virtual void checkRegister(CCPU<T> *cpu, const unsigned regidx);
 
     /**
      * @method factory
@@ -176,7 +183,7 @@ class CInstruction
      * @exception  std::runtime_error
      * @conditions none
      */
-    virtual void execute(CCPU *cpu) = 0;
+    virtual void execute(CCPU<T> *cpu) = 0;
 
   protected:
     /* members */
@@ -184,6 +191,41 @@ class CInstruction
     std::string m_name;
 };
 
+/*----------------------------------------------------------------------------*/
+
+template<class T>
+const unsigned CInstruction<T>::parseRegister(const std::string& str)
+{
+  unsigned reg;
+  if (str.length() < 2 || str[0] != 'r')
+    throw std::runtime_error("Invalid syntax of register");
+
+  try
+  {
+    reg = boost::lexical_cast<unsigned>(str.substr(1));
+  }
+  catch(boost::bad_lexical_cast& ex)
+  {
+    throw std::runtime_error("Invalid syntax of register");
+  }
+
+  return reg;
+}
+
+/*----------------------------------------------------------------------------*/
+
+template<class T>
+inline void CInstruction<T>::checkRegister(CCPU<T> *cpu, const unsigned regidx)
+{
+  assert(cpu != NULL);
+  if (regidx >= cpu->getRegisterCount())
+  {
+    std::stringstream sstr;
+    sstr << "Register R" << regidx << " doesn't exist (out of bound)";
+    throw std::runtime_error(sstr.str());
+  }
+}
+
 #endif
 
 /* vim: set et sw=2 ts=2: */