copyleft: gplv3 added and set repo to public

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

diff --git a/3c_disasm/instr/ldi.cpp b/3c_disasm/instr/ldi.cpp
index 095a1447ffb75688ad7305bbd7e580eac3be97c4..1c90c72afc7c1da4849585054551ed531a9fdf04 100644 (file)
--- a/3c_disasm/instr/ldi.cpp
+++ b/3c_disasm/instr/ldi.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"
 
 
@@ -59,7 +80,19 @@ void Cldi::evalInstr()
 void Cldi::execInstr()
 {
        //cout << "should exec " << this->toString() << endl;
-       this->m_cpu->setRegister(this->m_rd, this->m_imm);
+       CDat val = this->m_cpu->getRegister(this->m_rd);
+       if(this->m_s == false) {
+               if(this->m_hl == false) {
+                       val &= 0xFFFF0000;
+               }
+               else {
+                       val &= 0x0000FFFF;
+               }
+               this->m_cpu->setRegister(this->m_rd, val + this->m_imm);
+       }
+       else {
+               this->m_cpu->setRegister(this->m_rd, this->m_imm);
+       }
 }
 
 std::string Cldi::toString()