sim: highlight for instr

[calu.git] / 3b_sim / ccpu.hpp

diff --git a/3b_sim/ccpu.hpp b/3b_sim/ccpu.hpp
index e428f630dd637dcf0e5cdbcb5c53af1ed0140316..4a8724004733e5812d3006f57bb4ede00e7ad5c5 100644 (file)
--- a/3b_sim/ccpu.hpp
+++ b/3b_sim/ccpu.hpp
@@ -5,8 +5,11 @@
 #include "cmem.hpp"
 #include "cpmem.hpp"
 
+#include "ccolor.h"
+
 class Iinstr;
 
+#include <boost/regex.hpp>
 #include "Iinstr.hpp"
 
 
@@ -15,7 +18,7 @@ class CCpu {
 
                bool m_Z, m_S, m_C, m_O;
 
-               CDat m_pc, m_pc_next;
+               CDat m_pc, m_pc_next, m_perf;
                CMem<CDat> m_reg, m_ram;
                CPMem<Iinstr*> m_prog;
 
@@ -34,17 +37,35 @@ class CCpu {
                Iinstr* getProg(const int) const;
                void setProg(const int, Iinstr*);
 
+               CDat getPerf() const;
+               void setPerf(CDat);
+               void incPerf();
+               void incPerfBy(short);
+
                CDat getCurPC() const;
+               CDat getNextPC() const;
                void setNextPC(CDat);
 
+               CDat getFlags() const;
+               void setFlags(CDat);
+               /* will only change zero and sign */
                void updateFlags(CDat);
+               /* will change all flags */
+               void updateFlags(CDatd, CDat, CDat);
+               /* will change all flags */
                void updateFlags(bool z, bool o, bool c, bool s);
+               /* will change carry */
+               void updateCarry(bool c);
+
+               bool getCarry();
 
                bool conditionMet(short);
 
                int getStack() const;
                void setStack(const int);
 
+               string colorifyInstr(string instr);
+
                CCpu(int,int,int);
 
 };