Merge zizzer:/bk/newmem

into  zeep.pool:/z/saidi/work/m5.newmem

src/cpu/simple/atomic.cc:
    merge steve's changes in.

--HG--
extra : convert_revision : a17eda37cd63c9380af6fe68b0aef4b1e1974231

diff --cc src/arch/alpha/isa/mem.isa
Simple merge

diff --cc src/arch/alpha/locked_mem.hh
Simple merge

diff --cc src/cpu/simple/atomic.cc
index 6a536fbcd17377fd5950d4e12e6865fff13560b3,6904ed936261322e0e695177d5edce7c0e7a63cd..0728675363a3a2db6effa2bb210f76cdc9ed342a
--- 1/src/cpu/simple/atomic.cc
--- 2/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@@ -401,8 -418,20 +418,11 @@@ AtomicSimpleCPU::write(T data, Addr add
  #endif
          }
  
-         if (res) {
+         if (req->isSwap()) {
+             assert(res);
+             *res = pkt->get<T>();
 -        }
 -
 -        if (req->isLocked()) {
 -            uint64_t scResult = req->getExtraData();
 -            if (scResult != 0) {
 -                // clear failure counter
 -                thread->setStCondFailures(0);
 -            }
 -            if (res) {
 -                *res = req->getExtraData();
 -            }
++        } else if (res) {
 +            *res = req->getScResult();
          }
      }
  

diff --cc src/cpu/simple/base.hh
Simple merge