From 3e5f4876630169e92b3ad736d747bcba1b79c062 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 19 Apr 2009 04:25:01 -0700 Subject: Memory: Rename LOCKED for load locked store conditional to LLSC. --- src/cpu/ozone/lw_lsq_impl.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/cpu/ozone/lw_lsq_impl.hh') diff --git a/src/cpu/ozone/lw_lsq_impl.hh b/src/cpu/ozone/lw_lsq_impl.hh index 00e52e039..3943dab2d 100644 --- a/src/cpu/ozone/lw_lsq_impl.hh +++ b/src/cpu/ozone/lw_lsq_impl.hh @@ -589,7 +589,7 @@ OzoneLWLSQ::writebackStores() MemCmd command = req->isSwap() ? MemCmd::SwapReq : - (req->isLocked() ? MemCmd::WriteReq : MemCmd::StoreCondReq); + (req->isLlsc() ? MemCmd::WriteReq : MemCmd::StoreCondReq); PacketPtr data_pkt = new Packet(req, command, Packet::Broadcast); data_pkt->dataStatic(inst->memData); @@ -606,7 +606,7 @@ OzoneLWLSQ::writebackStores() inst->seqNum); // @todo: Remove this SC hack once the memory system handles it. - if (req->isLocked()) { + if (req->isLlsc()) { if (req->isUncacheable()) { req->setExtraData(2); } else { @@ -664,7 +664,7 @@ OzoneLWLSQ::writebackStores() if (result != MA_HIT && dcacheInterface->doEvents()) { store_event->miss = true; typename BackEnd::LdWritebackEvent *wb = NULL; - if (req->isLocked()) { + if (req->isLlsc()) { wb = new typename BackEnd::LdWritebackEvent(inst, be); store_event->wbEvent = wb; @@ -691,7 +691,7 @@ OzoneLWLSQ::writebackStores() // DPRINTF(Activity, "Active st accessing mem hit [sn:%lli]\n", // inst->seqNum); - if (req->isLocked()) { + if (req->isLlsc()) { // Stx_C does not generate a system port // transaction in the 21264, but that might be // hard to accomplish in this model. -- cgit v1.2.3