diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-12 13:22:36 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-12 13:22:36 -0500 |
| commit | b9005f35621c564fb70b60223352732eb9cde955 (patch) | |
| tree | 0e1dc7cbbefbcf829a0c0cae92095c6255299915 /src/mem/physical.hh | |
| parent | ad17b3265178deacb2dce7a98033575c0e98f518 (diff) | |
| parent | b5a4d95811db487d946200bf103e2af376db7690 (diff) | |
| download | gem5-b9005f35621c564fb70b60223352732eb9cde955.tar.xz | |
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
Diffstat (limited to 'src/mem/physical.hh')
| -rw-r--r-- | src/mem/physical.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mem/physical.hh b/src/mem/physical.hh index af88bcaa0..f7200b502 100644 --- a/src/mem/physical.hh +++ b/src/mem/physical.hh @@ -131,7 +131,7 @@ class PhysicalMemory : public MemObject // no locked addrs: nothing to check, store_conditional fails bool isLocked = req->isLocked(); if (isLocked) { - req->setScResult(0); + req->setExtraData(0); } return !isLocked; // only do write if not an sc } else { @@ -148,6 +148,7 @@ class PhysicalMemory : public MemObject public: Addr new_page(); uint64_t size() { return params()->addrRange.size(); } + uint64_t start() { return params()->addrRange.start; } struct Params { |