From 55bbaf632df43ac3bfd223daec85ee3b14a0f419 Mon Sep 17 00:00:00 2001
From: Derek Christ <derek.christ@iese.fraunhofer.de>
Date: Fri, 19 May 2023 10:09:58 +0200
Subject: [PATCH] Fix incorrect copyright disclaimer in Cache

---
 src/simulator/simulator/Cache.cpp       | 72 ++++++++++++++++++-------
 src/simulator/simulator/Cache.h         |  2 +-
 src/simulator/simulator/MemoryManager.h |  1 +
 3 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/src/simulator/simulator/Cache.cpp b/src/simulator/simulator/Cache.cpp
index c40ce13c..325e929d 100644
--- a/src/simulator/simulator/Cache.cpp
+++ b/src/simulator/simulator/Cache.cpp
@@ -1,3 +1,39 @@
+/*
+ * Copyright (c) 2022, Technische Universität Kaiserslautern
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors:
+ *    Lukas Steiner
+ *    Derek Christ
+ */
+
 #include "Cache.h"
 #include "MemoryManager.h"
 
@@ -368,29 +404,27 @@ Cache::CacheLine *Cache::evictLine(Cache::index_t index)
         // There are still hits in hitQueue to the oldest line -> do not evict it
         return nullptr;
     }
-    else
+
+    if (oldestLine.valid && oldestLine.dirty)
     {
-        if (oldestLine.valid && oldestLine.dirty)
-        {
-            auto &wbTrans = memoryManager.allocate(lineSize);
-            wbTrans.acquire();
-            wbTrans.set_address(encodeAddress(index, oldestLine.tag));
-            wbTrans.set_write();
-            wbTrans.set_data_length(lineSize);
-            wbTrans.set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
+        auto &wbTrans = memoryManager.allocate(lineSize);
+        wbTrans.acquire();
+        wbTrans.set_address(encodeAddress(index, oldestLine.tag));
+        wbTrans.set_write();
+        wbTrans.set_data_length(lineSize);
+        wbTrans.set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
 
-            if (storageEnabled)
-                std::copy(oldestLine.dataPtr, oldestLine.dataPtr + lineSize, wbTrans.get_data_ptr());
+        if (storageEnabled)
+            std::copy(oldestLine.dataPtr, oldestLine.dataPtr + lineSize, wbTrans.get_data_ptr());
 
-            writeBuffer.emplace_back(index, oldestLine.tag, &wbTrans);
-        }
-
-        oldestLine.allocated = false;
-        oldestLine.valid = false;
-        oldestLine.dirty = false;
-
-        return &oldestLine;
+        writeBuffer.emplace_back(index, oldestLine.tag, &wbTrans);
     }
+
+    oldestLine.allocated = false;
+    oldestLine.valid = false;
+    oldestLine.dirty = false;
+
+    return &oldestLine;
 }
 
 /// Align address to cache line size
diff --git a/src/simulator/simulator/Cache.h b/src/simulator/simulator/Cache.h
index 3236d54f..978ff17f 100644
--- a/src/simulator/simulator/Cache.h
+++ b/src/simulator/simulator/Cache.h
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Authors:
- *    Christian Malek
+ *    Lukas Steiner
  *    Derek Christ
  */
 
diff --git a/src/simulator/simulator/MemoryManager.h b/src/simulator/simulator/MemoryManager.h
index 52c760a1..7cbe33f1 100644
--- a/src/simulator/simulator/MemoryManager.h
+++ b/src/simulator/simulator/MemoryManager.h
@@ -32,6 +32,7 @@
  * Authors:
  *    Robert Gernhardt
  *    Matthias Jung
+ *    Derek Christ
  */
 
 #ifndef MEMORYMANAGER_H