1 files changed, 17 insertions, 30 deletions

diff --git a/ue3/mycpu/cinstruction.h b/ue3/mycpu/cinstruction.h
index 57fcff1..40e9ddc 100644
--- a/ue3/mycpu/cinstruction.h
+++ b/ue3/mycpu/cinstruction.h
@@ -62,45 +62,32 @@ class CInstruction
     }
 
     /**
-     * @method getName
-     * @brief  returns instruction name
-     * @param  -
-     * @return name of instruction
-     * @globalvars none
-     * @exception  none
-     * @conditions none
-     */
-    virtual const std::string& getName()
-    {
-      return m_name;
-    }
-
-    /**
-     * @method isLabel
-     * @brief  returns true if the instruction defines a label
-     * @param  -
-     * @return true if the instruction defines a label
+     * @method operator()
+     * @brief  implementation of operator (CCPU)
+     * @param  cpu  pointer to cpu
+     * @return -
      * @globalvars none
-     * @exception  none
+     * @exception  std::runtime_error
      * @conditions none
      */
-    virtual const bool isLabel()
+    virtual CInstruction& operator()(CCPU *cpu)
     {
-      return false;
+      execute(cpu);
+      return *this;
     }
 
     /**
-     * @method getLabelName
-     * @brief  returns labelname if the instruction defines a label
+     * @method getName
+     * @brief  returns instruction name
      * @param  -
-     * @return labelname if the instruction defines a label
+     * @return name of instruction
      * @globalvars none
      * @exception  none
      * @conditions none
      */
-    virtual const std::string getLabelName()
+    virtual const std::string& getName()
     {
-      return "";
+      return m_name;
     }
 
     /**
@@ -139,7 +126,7 @@ class CInstruction
      * @param  str  register in assembler syntax
      * @return registernumber
      * @globalvars none
-     * @exception  runtime_error
+     * @exception  std::runtime_error
      * @conditions none
      */
     virtual const unsigned parseRegister(const std::string& str);
@@ -152,7 +139,7 @@ class CInstruction
      * @param  regidx  registernumber
      * @return -
      * @globalvars none
-     * @exception  runtime_error
+     * @exception  std::runtime_error
      * @conditions none
      */
     virtual void checkRegister(CCPU *cpu, const unsigned regidx);
@@ -175,7 +162,7 @@ class CInstruction
      * @param  params  list of parameters of this instruction
      * @return -
      * @globalvars none
-     * @exception  runtime_error
+     * @exception  std::runtime_error
      * @conditions none
      */
     virtual void compile(std::list<std::string>& params) = 0;
@@ -186,7 +173,7 @@ class CInstruction
      * @param  cpu  pointer to cpu
      * @return -
      * @globalvars none
-     * @exception  runtime_error
+     * @exception  std::runtime_error
      * @conditions none
      */
     virtual void execute(CCPU *cpu) = 0;