Rename handler to match behaviour

riscv-software-src · Sep 5, 2023 · d011760 · d011760
1 parent aff0333
commit d011760
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/core/LSU.cpp b/core/LSU.cpp
@@ -35,14 +35,16 @@ namespace olympia
         in_reorder_flush_.registerConsumerHandler
             (CREATE_SPARTA_HANDLER_WITH_DATA(LSU, handleFlush_, FlushManager::FlushingCriteria));
 
-        in_mmu_lookup_req_.registerConsumerHandler
-            (CREATE_SPARTA_HANDLER_WITH_DATA(LSU, getInstFromMMU_, MemoryAccessInfoPtr));
+        in_mmu_lookup_req_.registerConsumerHandler(
+            CREATE_SPARTA_HANDLER_WITH_DATA(LSU, handleMMUReadyReq_,
+                                            MemoryAccessInfoPtr));
 
         in_mmu_lookup_ack_.registerConsumerHandler
             (CREATE_SPARTA_HANDLER_WITH_DATA(LSU, getAckFromMMU_, MemoryAccessInfoPtr));
 
-        in_cache_lookup_req_.registerConsumerHandler
-            (CREATE_SPARTA_HANDLER_WITH_DATA(LSU, getInstFromCache_, MemoryAccessInfoPtr));
+        in_cache_lookup_req_.registerConsumerHandler(
+            CREATE_SPARTA_HANDLER_WITH_DATA(LSU, handleCacheReadyReq_,
+                                            MemoryAccessInfoPtr));
 
         in_cache_lookup_ack_.registerConsumerHandler
             (CREATE_SPARTA_HANDLER_WITH_DATA(LSU, getAckFromCache_, MemoryAccessInfoPtr));
@@ -273,7 +275,7 @@ namespace olympia
         out_cache_lookup_req_.send(mem_access_info_ptr);
     }
 
-    void LSU::getInstFromCache_(const MemoryAccessInfoPtr &memory_access_info_ptr)
+    void LSU::handleCacheReadyReq_(const MemoryAccessInfoPtr &memory_access_info_ptr)
     {
         auto inst_ptr = memory_access_info_ptr->getInstPtr();
         if (cache_pending_inst_flushed_) {
@@ -651,7 +653,7 @@ namespace olympia
         out_mmu_lookup_req_.send(mem_access_info_ptr);
     }
 
-    void LSU::getInstFromMMU_(const MemoryAccessInfoPtr &memory_access_info_ptr)
+    void LSU::handleMMUReadyReq_(const MemoryAccessInfoPtr &memory_access_info_ptr)
     {
         const auto &inst_ptr = memory_access_info_ptr->getInstPtr();
         if (mmu_pending_inst_flushed) {

diff --git a/core/LSU.hpp b/core/LSU.hpp
@@ -317,12 +317,12 @@ namespace olympia
 
         // Handle MMU access request
         void handleMMULookupReq_();
-        void getInstFromMMU_(const MemoryAccessInfoPtr &memory_access_info_ptr);
+        void handleMMUReadyReq_(const MemoryAccessInfoPtr &memory_access_info_ptr);
         void getAckFromMMU_(const MemoryAccessInfoPtr &updated_memory_access_info_ptr);
 
         // Handle cache access request
         void handleCacheLookupReq_();
-        void getInstFromCache_(const MemoryAccessInfoPtr &memory_access_info_ptr);
+        void handleCacheReadyReq_(const MemoryAccessInfoPtr &memory_access_info_ptr);
         void getAckFromCache_(const MemoryAccessInfoPtr &updated_memory_access_info_ptr);
 
         // Retire load/store instruction