disasm/sim: changed interface, branch => br, features++

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

diff --git a/3b_sim/cmem.cpp b/3b_sim/cmem.cpp
index 90886a23eb4e1fdc929f51f42d0af7b87925ec84..22c80e6722b2b5f0340bd290133d96c5b57540af 100644 (file)
--- a/3b_sim/cmem.cpp
+++ b/3b_sim/cmem.cpp
@@ -2,7 +2,7 @@
 
 using namespace std;
 
-template <class T>
+template <typename T>
 void CMem<T>::set(const MEMORY_ADDRESS address, const T& data)
 {
        if(address >= MAX_MEMORY) {
@@ -23,13 +23,16 @@ void CMem<T>::set(const MEMORY_ADDRESS address, const T& data)
        m_memory.erase(iter);
 }
 
-template <class T>
-void CMem<T>::get(const MEMORY_ADDRESS address, T& value) const
+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());
        }
-       value = m_memory[address];
+       return m_memory[address];
 }
+
+
+template class CMem<int>;