copyleft: gplv3 added and set repo to public

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

diff --git a/3b_sim/cpmem.cpp b/3b_sim/cpmem.cpp
index 31205e61f17a75e557c4ac2f730fe7871362d0b7..3da939cfd0f99ff2fc330b36cabad9b75e5997db 100644 (file)
--- a/3b_sim/cpmem.cpp
+++ b/3b_sim/cpmem.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/>. */
+
 
 //i'm sorry
 //pervert forwarding
@@ -18,7 +39,7 @@ void CPMem<T>::set(const MEMORY_ADDRESS address, const T data)
                throw out_of_range(error.str());
        }
 
-       MEMORY_ADDRESS temp = address;
+       MEMORY_ADDRESS temp = (address & (~(BYTE_COUNT-1))) / BYTE_COUNT;
        auto iter = m_memory.begin();
        while(temp > 0) {
                ++iter;
@@ -38,7 +59,8 @@ T CPMem<T>::get(const MEMORY_ADDRESS address) const
                error << "memoryaddress " << address << " out of range";
                throw out_of_range(error.str());
        }
-       return m_memory[address];
+       MEMORY_ADDRESS temp = (address & (~(BYTE_COUNT-1))) / BYTE_COUNT;
+       return m_memory[temp];
 }
 
 template <typename T>