copyleft: gplv3 added and set repo to public

[calu.git] / 3c_disasm / instr / add.cpp

diff --git a/3c_disasm/instr/add.cpp b/3c_disasm/instr/add.cpp
index f196794d3d45a82e50ff298d25d83a9100e94ccd..29a3e52eb3498a9609fea17c13fde95d22de19ae 100644 (file)
--- a/3c_disasm/instr/add.cpp
+++ b/3c_disasm/instr/add.cpp
@@ -1,3 +1,24 @@
+/*   `Deep Thought', a softcore CPU implemented on a FPGA
+
+    Copyright (C) 2010 Markus Hofstaetter <markus.manrow@gmx.at>
+    Copyright (C) 2010 Martin Perner <e0725782@student.tuwien.ac.at>
+    Copyright (C) 2010 Stefan Rebernig <stefan.rebernig@gmail.com>
+    Copyright (C) 2010 Manfred Schwarz <e0725898@student.tuwien.ac.at>
+    Copyright (C) 2010 Bernhard Urban <lewurm@gmail.com>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
 #include "../Iinstr.hpp"
 
 class Cadd : public Iinstr {
@@ -58,10 +79,14 @@ void Cadd::evalInstr()
 
 void Cadd::execInstr()
 {
-       cout << "should exec " << this->toString() << endl;
-       CDat val = this->m_cpu->getRegister(m_ra) + this->m_cpu->getRegister(m_rb);
+       //cout << "should exec " << this->toString() << endl;
+       CDat ra = this->m_cpu->getRegister(m_ra);
+       CDat rb = this->m_cpu->getRegister(m_rb);
+       CDatd val = ra + rb;
        this->m_cpu->setRegister(m_rd, val);
-       this->m_cpu->updateFlags(val);
+       if(!this->m_d) {
+               this->m_cpu->updateFlags(val, ra, rb);
+       }
 }
 
 std::string Cadd::toString()
@@ -72,6 +97,6 @@ std::string Cadd::toString()
        if(m_d) op << 'D';
        if(m_c) op << 'C';
 
-       op << " r" << m_rd << ", r" << m_ra << ", r" << m_rb;
+       op << this->getConditionFlag() << " r" << m_rd << ", r" << m_ra << ", r" << m_rb;
        return op.str();
 }