From 56ce8acd412747b728b7ad02537a3afd202ae8e8 Mon Sep 17 00:00:00 2001 From: Korey Sewell Date: Fri, 4 Feb 2011 00:08:21 -0500 Subject: inorder: overload find-req fn no need to have separate function name findSplitRequest, just overload the function --- src/cpu/inorder/resources/cache_unit.cc | 4 ++-- src/cpu/inorder/resources/cache_unit.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu/inorder/resources/cache_unit.cc b/src/cpu/inorder/resources/cache_unit.cc index 9f3c99356..03f1c1527 100644 --- a/src/cpu/inorder/resources/cache_unit.cc +++ b/src/cpu/inorder/resources/cache_unit.cc @@ -267,7 +267,7 @@ CacheUnit::findRequest(DynInstPtr inst) } ResReqPtr -CacheUnit::findSplitRequest(DynInstPtr inst, int idx) +CacheUnit::findRequest(DynInstPtr inst, int idx) { map::iterator map_it = reqMap.begin(); map::iterator map_end = reqMap.end(); @@ -915,7 +915,7 @@ CacheUnit::processCacheCompletion(PacketPtr pkt) // Cast to correct request type CacheRequest *cache_req = dynamic_cast( - findSplitRequest(cache_pkt->cacheReq->getInst(), cache_pkt->instIdx)); + findRequest(cache_pkt->cacheReq->getInst(), cache_pkt->instIdx)); if (!cache_req) { panic("[tid:%u]: [sn:%i]: Can't find slot for cache access to " diff --git a/src/cpu/inorder/resources/cache_unit.hh b/src/cpu/inorder/resources/cache_unit.hh index 69c1dbd9e..ece06be83 100644 --- a/src/cpu/inorder/resources/cache_unit.hh +++ b/src/cpu/inorder/resources/cache_unit.hh @@ -124,7 +124,7 @@ class CacheUnit : public Resource unsigned cmd); ResReqPtr findRequest(DynInstPtr inst); - ResReqPtr findSplitRequest(DynInstPtr inst, int idx); + ResReqPtr findRequest(DynInstPtr inst, int idx); void requestAgain(DynInstPtr inst, bool &try_request); -- cgit v1.2.3