diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2009-04-19 04:25:01 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2009-04-19 04:25:01 -0700 |
commit | 3e5f4876630169e92b3ad736d747bcba1b79c062 (patch) | |
tree | cc6f7aa2f13331839567c1b5844ea2d8412df163 /src/cpu/inorder | |
parent | ca8598147835cc3bf4cb6125b4f32cbd941f1ae7 (diff) | |
download | gem5-3e5f4876630169e92b3ad736d747bcba1b79c062.tar.xz |
Memory: Rename LOCKED for load locked store conditional to LLSC.
Diffstat (limited to 'src/cpu/inorder')
-rw-r--r-- | src/cpu/inorder/resources/cache_unit.cc | 6 |
1 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 57bcb10ef..ceaaf3532 100644 --- a/src/cpu/inorder/resources/cache_unit.cc +++ b/src/cpu/inorder/resources/cache_unit.cc @@ -355,7 +355,7 @@ CacheUnit::doDataAccess(DynInstPtr inst) Request *memReq = cache_req->dataPkt->req; - if (cache_req->dataPkt->isWrite() && memReq->isLocked()) { + if (cache_req->dataPkt->isWrite() && memReq->isLlsc()) { assert(cache_req->inst->isStoreConditional()); DPRINTF(InOrderCachePort, "Evaluating Store Conditional access\n"); do_access = TheISA::handleLockedWrite(cpu, memReq); @@ -395,7 +395,7 @@ CacheUnit::doDataAccess(DynInstPtr inst) cacheStatus = cacheWaitResponse; cacheBlocked = false; } - } else if (!do_access && memReq->isLocked()){ + } else if (!do_access && memReq->isLlsc()){ // Store-Conditional instructions complete even if they "failed" assert(cache_req->inst->isStoreConditional()); cache_req->setCompleted(true); @@ -471,7 +471,7 @@ CacheUnit::processCacheCompletion(PacketPtr pkt) if (inst->isLoad()) { assert(cache_pkt->isRead()); - if (cache_pkt->req->isLocked()) { + if (cache_pkt->req->isLlsc()) { DPRINTF(InOrderCachePort, "[tid:%u]: Handling Load-Linked for [sn:%u]\n", tid, inst->seqNum); |