From: Martin Perner <martin@perner.cc>
Date: Wed, 3 Nov 2010 17:56:44 +0000 (+0100)
Subject: sim: added special moves
X-Git-Tag: bootrom_v1~180
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=calu.git;a=commitdiff_plain;h=69964280107c6139062349844f99ef80bc6f68be

sim: added special moves
---

diff --git a/3b_sim/ccpu.cpp b/3b_sim/ccpu.cpp
index fb480f4..04dd595 100644
--- a/3b_sim/ccpu.cpp
+++ b/3b_sim/ccpu.cpp
@@ -109,6 +109,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);
diff --git a/3b_sim/ccpu.hpp b/3b_sim/ccpu.hpp
index 0dd8b1b..86940a2 100644
--- a/3b_sim/ccpu.hpp
+++ b/3b_sim/ccpu.hpp
@@ -39,6 +39,7 @@ class CCpu {
 		void setNextPC(CDat);
 
 		CDat getFlags() const;
+		void setFlags(CDat);
 		/* will only change zero and sign */
 		void updateFlags(CDat);
 		/* will change all flags */
diff --git a/3c_disasm/instr/movf.cpp b/3c_disasm/instr/movf.cpp
new file mode 100644
index 0000000..d2c0a35
--- /dev/null
+++ b/3c_disasm/instr/movf.cpp
@@ -0,0 +1,79 @@
+#include "../Iinstr.hpp"
+
+class Cmovf : public Iinstr {
+	private:
+		bool m_type;
+	public:
+		Cmovf();
+		void evalInstr();
+		void execInstr();
+		std::string toString();
+		Iinstr* getNew();
+};
+
+/**
+ * Name:      create_instruction
+ * Purpose:   if compiled as shared library, this functions creates the 
+              instruction object
+
+ * Returns:   pointer to instruction object
+ */
+extern "C" Iinstr* create_instruction() {
+    return new Cmovf();
+}
+
+Iinstr* Cmovf::getNew() {
+	return new Cmovf();
+}
+
+/**
+ * Name:      destroy_instruction
+ * Purpose:   if compiled as shared library, this functions destoys the 
+              instruction object
+
+ * Parameter: IInstruction - the instruction object to delete
+ */
+extern "C" void destroy_instruction(Iinstr* p) {
+    delete p;
+}
+
+Cmovf::Cmovf() : m_type(0)
+{
+	opcode = B5(01100);
+	name = "movf";
+}
+
+void Cmovf::evalInstr()
+{
+	this->m_type = argbits[18];
+	if(this->m_type) {
+		name = "movpf";
+	}
+	else {
+		name = "movsf";
+	}
+	
+	argbits >>= 19;
+	m_rd = this->getRegister(argbits);
+}
+
+void Cmovf::execInstr()
+{
+	//cout << "should exec " << this->toString() << endl;
+	CDat val;
+	if(this->m_type) {
+		val = this->m_cpu->getFlags();
+	}
+	else {
+		val = this->m_cpu->getStack();
+	}
+	this->m_cpu->setRegister(this->m_rd, val);
+}
+
+std::string Cmovf::toString()
+{
+	stringstream op;
+	op << this->getName();
+	op << " r" << m_rd;
+	return op.str();
+}
diff --git a/3c_disasm/instr/movt.cpp b/3c_disasm/instr/movt.cpp
new file mode 100644
index 0000000..416812a
--- /dev/null
+++ b/3c_disasm/instr/movt.cpp
@@ -0,0 +1,78 @@
+#include "../Iinstr.hpp"
+
+class Cmovt : public Iinstr {
+	private:
+		bool m_type;
+	public:
+		Cmovt();
+		void evalInstr();
+		void execInstr();
+		std::string toString();
+		Iinstr* getNew();
+};
+
+/**
+ * Name:      create_instruction
+ * Purpose:   if compiled as shared library, this functions creates the 
+              instruction object
+
+ * Returns:   pointer to instruction object
+ */
+extern "C" Iinstr* create_instruction() {
+    return new Cmovt();
+}
+
+Iinstr* Cmovt::getNew() {
+	return new Cmovt();
+}
+
+/**
+ * Name:      destroy_instruction
+ * Purpose:   if compiled as shared library, this functions destoys the 
+              instruction object
+
+ * Parameter: IInstruction - the instruction object to delete
+ */
+extern "C" void destroy_instruction(Iinstr* p) {
+    delete p;
+}
+
+Cmovt::Cmovt() : m_type(0)
+{
+	opcode = B5(01101);
+	name = "movt";
+}
+
+void Cmovt::evalInstr()
+{
+	this->m_type = argbits[18];
+	if(this->m_type) {
+		name = "movpt";
+	}
+	else {
+		name = "movst";
+	}
+	
+	argbits >>= 19;
+	m_rd = this->getRegister(argbits);
+}
+
+void Cmovt::execInstr()
+{
+	//cout << "should exec " << this->toString() << endl;
+	CDat val = this->m_cpu->getRegister(this->m_rd);
+	if(this->m_type) {
+		this->m_cpu->setFlags(val);
+	}
+	else {
+		this->m_cpu->setStack(val);
+	}
+}
+
+std::string Cmovt::toString()
+{
+	stringstream op;
+	op << this->getName();
+	op << " r" << m_rd;
+	return op.str();
+}