diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-04-09 07:59:57 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-04-09 07:59:57 +0000 |
| commit | f53d2ccbfc63f1a7de13f7772e72814b4f94f47a (patch) | |
| tree | fa04e9a6796153a5139731e332648c4250db1dfe /src/cpu/base_dyn_inst.hh | |
| parent | 85f9213b8ae93a1cf9c712415668efb2d053638b (diff) | |
| parent | 97e8111b465c96e6e103fc6549f8921ca0f74da3 (diff) | |
| download | gem5-f53d2ccbfc63f1a7de13f7772e72814b4f94f47a.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : 1396ed5b264d29377ef9793a763225a93181f65f
Diffstat (limited to 'src/cpu/base_dyn_inst.hh')
| -rw-r--r-- | src/cpu/base_dyn_inst.hh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cpu/base_dyn_inst.hh b/src/cpu/base_dyn_inst.hh index 6c6d90076..eed05c2f1 100644 --- a/src/cpu/base_dyn_inst.hh +++ b/src/cpu/base_dyn_inst.hh @@ -877,6 +877,11 @@ BaseDynInst<Impl>::write(T data, Addr addr, unsigned flags, uint64_t *res) effAddrValid = true; physEffAddr = req->getPaddr(); memReqFlags = req->getFlags(); + + if (req->isCondSwap()) { + assert(res); + req->setExtraData(*res); + } #if 0 if (cpu->system->memctrl->badaddr(physEffAddr)) { fault = TheISA::genMachineCheckFault(); |