s3e: fix build break

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

diff --git a/3b_sim/cmem.cpp b/3b_sim/cmem.cpp
index 22c80e6722b2b5f0340bd290133d96c5b57540af..c96c1006efeba1eba64c6d86d51baa5158e876c3 100644 (file)
--- a/3b_sim/cmem.cpp
+++ b/3b_sim/cmem.cpp
@@ -1,9 +1,30 @@
+/*   `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 "cmem.hpp"
 
 using namespace std;
 
 template <typename T>
-void CMem<T>::set(const MEMORY_ADDRESS address, const T& data)
+void CMem<T>::set(const MEMORY_ADDRESS address, const T data)
 {
        if(address >= MAX_MEMORY) {
                stringstream error;
@@ -11,7 +32,7 @@ void CMem<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;
@@ -25,6 +46,39 @@ void CMem<T>::set(const MEMORY_ADDRESS address, const T& data)
 
 template <typename T>
 T CMem<T>::get(const MEMORY_ADDRESS address) const
+{
+       if(address >= MAX_MEMORY) {
+               stringstream error;
+               error << "memoryaddress " << address << " out of range";
+               throw out_of_range(error.str());
+       }
+       MEMORY_ADDRESS temp = (address & (~(BYTE_COUNT-1))) / BYTE_COUNT;
+       return m_memory[temp];
+}
+
+template <typename T>
+void CMem<T>::setDirect(const MEMORY_ADDRESS address, const T data)
+{
+       if(address >= MAX_MEMORY) {
+               stringstream error;
+               error << "memoryaddress " << address << " out of range";
+               throw out_of_range(error.str());
+       }
+
+       MEMORY_ADDRESS temp = address;
+       auto iter = m_memory.begin();
+       while(temp > 0) {
+               ++iter;
+               temp--;
+       }
+
+       iter = m_memory.insert(iter, data);
+       ++iter;
+       m_memory.erase(iter);
+}
+
+template <typename T>
+T CMem<T>::getDirect(const MEMORY_ADDRESS address) const
 {
        if(address >= MAX_MEMORY) {
                stringstream error;
@@ -35,4 +89,4 @@ T CMem<T>::get(const MEMORY_ADDRESS address) const
 }
 
 
-template class CMem<int>;
+template class CMem<CDat>;