1 files changed, 46 insertions, 39 deletions

diff --git a/ue3/mycpu/cinstruction.h b/ue3/mycpu/cinstruction.h
index d393e09..7d929a5 100644
--- a/ue3/mycpu/cinstruction.h
+++ b/ue3/mycpu/cinstruction.h
@@ -30,8 +30,11 @@ class CInstruction
 {
   public:
        
-        
-
+    CInstruction()
+    {}    
+    CInstruction(std::map<std::string, unsigned int>& jumpaddr)
+         : m_jumpaddr(jumpaddr)
+    {}
 
     /**
      * @method ~CInstruction
@@ -48,7 +51,8 @@ class CInstruction
     
      virtual void exec(CMem& mem, std::vector<std::string>& instr) = 0;
 
-   
+   protected:
+      std::map<std::string, unsigned int> m_jumpaddr;
 
    
 };
@@ -59,12 +63,18 @@ class CInstruction
 class CFlagInstruction : public CInstruction
 {
   public:
+    public: 
+      CFlagInstruction(bool& zero, bool& sign) 
+        : f_zero(zero), f_sign(sign)
+      {}
+      CFlagInstruction(bool& zero, bool& sign, std::map<std::string, unsigned int>& jumpaddr) 
+        : CInstruction::CInstruction(jumpaddr), f_zero(zero), f_sign(sign)
+      {} 
+      virtual void exec(CMem& mem, std::vector<std::string>& instr) = 0;
     
-    void exec(CMem& mem, std::vector<std::string>& instr)
-    {}
-    virtual void exec(CMem& mem, std::vector<std::string>& instr, bool& flag) = 0;
-    
- 
+    protected:
+      bool &f_zero,  &f_sign;
+      
 };
 
 
@@ -72,14 +82,14 @@ class CFlagInstruction : public CInstruction
 class CInc : public CInstruction
 {
   public:
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
 class CDec : public CInstruction
 {
   public:
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
@@ -87,7 +97,7 @@ class CDec : public CInstruction
 class CAdd : public CInstruction
 {
   public:
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
@@ -95,7 +105,7 @@ class CAdd : public CInstruction
 class CSub : public CInstruction
 {
   public:
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
@@ -103,7 +113,7 @@ class CSub : public CInstruction
 class CMul : public CInstruction
 {
   public:
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
+     void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
@@ -111,7 +121,7 @@ class CMul : public CInstruction
 class CDiv : public CInstruction
 {
   public:
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
@@ -119,7 +129,7 @@ class CDiv : public CInstruction
 class CLoad : public CInstruction
 {
   public:
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
@@ -127,16 +137,17 @@ class CLoad : public CInstruction
 class CStore : public CInstruction
 {
   public:
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 class CTest : public CFlagInstruction
 {
-  public: 
-    void exec(CMem& mem, std::vector<std::string>& instr, bool& flag)
+  public:
+    CTest(bool& zero, bool& sign) 
+      : CFlagInstruction::CFlagInstruction(zero, sign)
     {}
-    virtual void test(CMem& mem, std::vector<std::string>& instr, 
-      bool& f_zero, bool& f_sign);
+  
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
@@ -152,36 +163,32 @@ class CLabel : public CInstruction
 class CJumpa : public CInstruction
 {
   public:
-    CJumpa(std::map<std::string, unsigned int>& jumpaddr)
-         : m_jumpaddr(jumpaddr)
-         {}
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
-    protected:
-      std::map<std::string, unsigned int> m_jumpaddr;
+   CJumpa(std::map<std::string, unsigned int>& jumpaddr) 
+        : CInstruction::CInstruction(jumpaddr)
+    {}
+    void exec(CMem& mem, std::vector<std::string>& instr);
+
 };
 
 
 class CJumpz : public CFlagInstruction
 {
+  
   public:
-    CJumpz(std::map<std::string, unsigned int>& jumpaddr)
-         : m_jumpaddr(jumpaddr)
-         {}
-    virtual void exec(CMem& mem, std::vector<std::string>& instr, bool& f_zero);
-    protected:
-      std::map<std::string, unsigned int> m_jumpaddr;
+    CJumpz(bool& zero, bool& sign, std::map<std::string, unsigned int>& jumpaddr) 
+        : CFlagInstruction::CFlagInstruction(zero, sign, jumpaddr)
+    {}
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
 class CJumps : public CFlagInstruction
 {
   public:
-    CJumps(std::map<std::string, unsigned int>& jumpaddr)
-         : m_jumpaddr(jumpaddr)
-         {}
-    virtual void exec(CMem& mem, std::vector<std::string>& instr, bool& f_sign);
-    protected:
-      std::map<std::string, unsigned int> m_jumpaddr;
+    CJumps(bool& zero ,bool& sign, std::map<std::string, unsigned int>& jumpaddr) 
+      : CFlagInstruction::CFlagInstruction(zero, sign, jumpaddr)
+    {}
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 
@@ -189,7 +196,7 @@ class CJumps : public CFlagInstruction
 class CWrite : public CInstruction
 {
   public:
-    virtual void exec(CMem& mem, std::vector<std::string>& instr);
+    void exec(CMem& mem, std::vector<std::string>& instr);
 };
 
 #endif