sim: highlight for instr

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

diff --git a/3b_sim/ccpu.cpp b/3b_sim/ccpu.cpp
index 4974fcc64d78dfbf4fc7b30f7bc9d1eef1748e90..9cf728bcca924f9875797fab4e41ba46ba4c66e0 100644 (file)
--- a/3b_sim/ccpu.cpp
+++ b/3b_sim/ccpu.cpp
@@ -6,6 +6,29 @@
 
 //void registerExtension() {};
 
+const char* expression = "(;.*)|(r0)|(rX)|(r1[0-5])|(r[1-5])|(r[6-9])|(0x[a-fA-F0-9]+)|([-]?\\d+)";
+const char* format = "(?1$&)"
+                                       //Return-Register: violett
+                                       "(?2\033[0m\033[35m$&\033[0m\\3:)"
+                                       // Callee-saved Register: rot
+                                       "(?4\033[0m\033[31m$&\033[0m\\3:)"
+                                       //Argument-Register: gruen
+                                       "(?5\033[0m\033[32m$&\033[0m\\3:)"
+                                       // Temporary Register: gelb
+                                       "(?6\033[0m\033[33m$&\033[0m\\3:)"
+                                       // Zahlenwerte: tuerkis
+                                       "(?7\033[0m\033[36m$&\033[0m\\3:)"
+                                       "(?8\033[0m\033[36m$&\033[0m\\3:)";
+
+
+string CCpu::colorifyInstr(string instr)
+{
+       boost::regex e;
+       e.assign(expression);
+       return boost::regex_replace(instr, e, format, boost::match_default | boost::format_all);
+}
+
+
 void CCpu::tick()
 {
        // signal extensions
@@ -18,11 +41,13 @@ void CCpu::tick()
                throw string("Out of Instructions!");
        }
        if(this->conditionMet(instr->getCondition())) {
-               cout << "Executing: " << instr->toString() << endl;
+               cout << color(green,black) << "Executing: " << color(white,black) << colorifyInstr(instr->toString()) << endl;
                instr->execInstr();
+               this->incPerfBy(instr->getClockCount());
        }
        else {
-               cout << "Didn't Execute " << instr->toString() << "; condition wasn't met" << endl;
+               cout << color(red,black) << "Didn't Execute " << color(white,black) << colorifyInstr(instr->toString()) << "; condition wasn't met" << endl;
+               this->incPerf();
        }
 
 }
@@ -109,6 +134,13 @@ CDat CCpu::getFlags() const {
        return psw;
 }
 
+void CCpu::setFlags(CDat psw) {
+       this->m_Z = ((psw & 0x1) != 0);
+       this->m_O = ((psw & 0x2) != 0);
+       this->m_C = ((psw & 0x4) != 0);
+       this->m_S = ((psw & 0x8) != 0);
+}
+
 void CCpu::updateFlags(CDat val) {
        this->m_Z = (val == 0);
        this->m_S = ((val >> (BIT_LEN-1)) & 0x1);
@@ -120,8 +152,20 @@ void CCpu::updateFlags(CDatd val, CDat a, CDat b) {
        this->m_Z = (val == 0);
        this->m_S = ((val >> (BIT_LEN-1)) & 0x1);
        this->m_C = ((val >> (BIT_LEN)) & 0x1);
-       bool v = (((a ^ b) >> (BIT_LEN-1)) & 0x1) ? true : false;
-       this->m_O = (this->m_S != v);
+       bool a_31 = ((a >> (BIT_LEN-1)) & 0x1);
+       bool b_31 = ((b >> (BIT_LEN-1)) & 0x1);
+       bool val_31 = ((val >> (BIT_LEN-1)) & 0x1);
+       this->m_O = ((a_31 && b_31 && !val_31) || (!a_31 && !b_31 && val_31));
+}
+
+void CCpu::updateCarry(bool c)
+{
+       this->m_C = c;
+}
+
+bool CCpu::getCarry()
+{
+       return this->m_C;
 }
 
 void CCpu::updateFlags(bool z, bool o, bool c, bool s)
@@ -171,7 +215,28 @@ void CCpu::setStack(const int val)
        this->m_stack = val;
 }
 
-CCpu::CCpu(int regs, int ram, int prog) : m_Z(false), m_S(false), m_C(false), m_O(false), m_pc(0), m_pc_next(0), m_reg(regs), m_ram(ram), m_prog(prog), m_stack(0)
+CDat CCpu::getPerf() const
+{
+       return this->m_perf;
+}
+
+void CCpu::setPerf(CDat val)
+{
+       this->m_perf = val;
+}
+
+void CCpu::incPerf()
+{
+       this->m_perf++;
+}
+
+void CCpu::incPerfBy(short inc)
+{
+       this->m_perf += inc;
+}
+
+
+CCpu::CCpu(int regs, int ram, int prog) : m_Z(false), m_S(false), m_C(false), m_O(false), m_pc(0), m_pc_next(0), m_perf(0), m_reg(regs), m_ram(ram), m_prog(prog), m_stack(0)
 {
 }