X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=3b_sim%2Fccpu.cpp;h=6bfb65481fd61162ddcb9afd2ec3a9f14f102de1;hb=7e9aca29a7c71af64c052e9271bace4e1f52bf24;hp=3fee8752cf020539e12e78d511771c8ff6f9fc73;hpb=12d2a7c14a42e01b6caf2a097db32404a403d213;p=calu.git

diff --git a/3b_sim/ccpu.cpp b/3b_sim/ccpu.cpp
index 3fee875..6bfb654 100644
--- a/3b_sim/ccpu.cpp
+++ b/3b_sim/ccpu.cpp
@@ -18,8 +18,15 @@ void CCpu::tick()
 		throw string("Out of Instructions!");
 	}
 	if(this->conditionMet(instr->getCondition())) {
+		cout << "Executing: " << instr->toString() << endl;
 		instr->execInstr();
+		this->incPerfBy(instr->getClockCount());
 	}
+	else {
+		cout << "Didn't Execute " << instr->toString() << "; condition wasn't met" << endl;
+		this->incPerf();
+	}
+
 }
 
 bool CCpu::conditionMet(short cond)
@@ -80,6 +87,11 @@ bool CCpu::conditionMet(short cond)
 
 }
 
+CDat CCpu::getNextPC() const
+{
+	return m_pc_next;
+}
+
 CDat CCpu::getCurPC() const
 {
 	return m_pc;
@@ -90,11 +102,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 +155,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 +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)
 {
 }