sim: highlight for instr

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

diff --git a/3b_sim/ccpu.cpp b/3b_sim/ccpu.cpp
index 3fee8752cf020539e12e78d511771c8ff6f9fc73..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,8 +41,15 @@ void CCpu::tick()
                throw string("Out of Instructions!");
        }
        if(this->conditionMet(instr->getCondition())) {
+               cout << color(green,black) << "Executing: " << color(white,black) << colorifyInstr(instr->toString()) << endl;
                instr->execInstr();
+               this->incPerfBy(instr->getClockCount());
+       }
+       else {
+               cout << color(red,black) << "Didn't Execute " << color(white,black) << colorifyInstr(instr->toString()) << "; condition wasn't met" << endl;
+               this->incPerf();
        }
+
 }
 
 bool CCpu::conditionMet(short cond)
@@ -80,6 +110,11 @@ bool CCpu::conditionMet(short cond)
 
 }
 
+CDat CCpu::getNextPC() const
+{
+       return m_pc_next;
+}
+
 CDat CCpu::getCurPC() const
 {
        return m_pc;
@@ -90,11 +125,47 @@ void CCpu::setNextPC(CDat val)
        m_pc_next = val;
 }
 
+CDat CCpu::getFlags() const {
+       CDat psw = 0;
+       psw += (this->m_Z ? 1 : 0);
+       psw += (this->m_O ? 2 : 0);
+       psw += (this->m_C ? 4 : 0);
+       psw += (this->m_S ? 8 : 0);
+       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);
-       this->m_C = false;
-       this->m_O = false;
+/*     this->m_C = false;
+       this->m_O = false; */
+}
+
+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 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)
@@ -107,12 +178,12 @@ void CCpu::updateFlags(bool z, bool o, bool c, bool s)
 
 CDat CCpu::getRegister(const int addr) const
 {
-       return m_reg.get(addr);
+       return m_reg.getDirect(addr);
 }
 
 void CCpu::setRegister(const int addr, CDat data)
 {
-       m_reg.set(addr, data);
+       m_reg.setDirect(addr, data);
 }
 
 CDat CCpu::getRAM(const int addr) const
@@ -144,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)
 {
 }