diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-19 19:00:43 -0400 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-19 19:00:43 -0400 |
| commit | 9cf063eb8e0b9d4af40f0e8fe609f9135be899f5 (patch) | |
| tree | 6c001f86099f6e84dc70849c52101b3b1c6b3bd1 /src/mem/cache/cache_impl.hh | |
| parent | 39d24f7241e0645bd4cf1e71d37be9b4e913cb9b (diff) | |
| parent | bf917535f835b296d6fd88d3c63f3b692ffb1509 (diff) | |
| download | gem5-9cf063eb8e0b9d4af40f0e8fe609f9135be899f5.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
--HG--
extra : convert_revision : c6611b32537918f5bf183788227ddf69a9a9a069
Diffstat (limited to 'src/mem/cache/cache_impl.hh')
| -rw-r--r-- | src/mem/cache/cache_impl.hh | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh index 8683352db..b5d7e1960 100644 --- a/src/mem/cache/cache_impl.hh +++ b/src/mem/cache/cache_impl.hh @@ -86,11 +86,6 @@ doAtomicAccess(Packet *pkt, bool isCpuSide) { if (isCpuSide) { - //Temporary solution to LL/SC - if (pkt->isWrite() && (pkt->req->isLocked())) { - pkt->req->setScResult(1); - } - probe(pkt, true, NULL); //TEMP ALWAYS SUCCES FOR NOW pkt->result = Packet::Success; @@ -116,11 +111,6 @@ doFunctionalAccess(Packet *pkt, bool isCpuSide) //TEMP USE CPU?THREAD 0 0 pkt->req->setThreadContext(0,0); - //Temporary solution to LL/SC - if (pkt->isWrite() && (pkt->req->isLocked())) { - assert("Can't handle LL/SC on functional path\n"); - } - probe(pkt, false, memSidePort); //TEMP ALWAYS SUCCESFUL FOR NOW pkt->result = Packet::Success; |