sim: arith. fixes, optimized mem access

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

diff --git a/3b_sim/cmem.cpp b/3b_sim/cmem.cpp
index 4b49a081b5560d49871f68786e5f728c1c1dc94d..3b8010dcc6f6ef399a98dd3975600b51e078036f 100644 (file)
--- a/3b_sim/cmem.cpp
+++ b/3b_sim/cmem.cpp
@@ -11,7 +11,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 +25,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;