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/simple/atomic.cc | |
| parent | ca8598147835cc3bf4cb6125b4f32cbd941f1ae7 (diff) | |
| download | gem5-3e5f4876630169e92b3ad736d747bcba1b79c062.tar.xz | |
Memory: Rename LOCKED for load locked store conditional to LLSC.
Diffstat (limited to 'src/cpu/simple/atomic.cc')
| -rw-r--r-- | src/cpu/simple/atomic.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc index 3ce0ba172..045b0160f 100644 --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -322,7 +322,7 @@ AtomicSimpleCPU::read(Addr addr, T &data, unsigned flags) // Now do the access. if (fault == NoFault) { Packet pkt = Packet(req, - req->isLocked() ? MemCmd::LoadLockedReq : MemCmd::ReadReq, + req->isLlsc() ? MemCmd::LoadLockedReq : MemCmd::ReadReq, Packet::Broadcast); pkt.dataStatic(dataPtr); @@ -338,7 +338,7 @@ AtomicSimpleCPU::read(Addr addr, T &data, unsigned flags) assert(!pkt.isError()); - if (req->isLocked()) { + if (req->isLlsc()) { TheISA::handleLockedRead(thread, req); } } @@ -462,7 +462,7 @@ AtomicSimpleCPU::write(T data, Addr addr, unsigned flags, uint64_t *res) MemCmd cmd = MemCmd::WriteReq; // default bool do_access = true; // flag to suppress cache access - if (req->isLocked()) { + if (req->isLlsc()) { cmd = MemCmd::StoreCondReq; do_access = TheISA::handleLockedWrite(thread, req); } else if (req->isSwap()) { |