[sim] color up your simulator

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

diff --git a/3b_sim/ccpu.cpp b/3b_sim/ccpu.cpp
index fb480f48fec4843aa2f9121f199d9a27023c0f10..873f1b7af8160baf9907fe600981e3226f24c0cd 100644 (file)
--- a/3b_sim/ccpu.cpp
+++ b/3b_sim/ccpu.cpp
@@ -18,11 +18,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) << 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) << instr->toString() << "; condition wasn't met" << endl;
+               this->incPerf();
        }
 
 }
@@ -109,6 +111,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 +129,10 @@ 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)
@@ -181,7 +192,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)
 {
 }