misc: Substitute pointer to Request with aliased RequestPtr
Every usage of Request* in the code has been replaced with the RequestPtr alias. This is a preparing patch for when RequestPtr will be the typdefed to a smart pointer to Request rather then a raw pointer to Request. Change-Id: I73cbaf2d96ea9313a590cdc731a25662950cd51a Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com> Reviewed-on: https://gem5-review.googlesource.com/10995 Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com> Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br> Maintainer: Anthony Gutierrez <anthony.gutierrez@amd.com>
This commit is contained in:
@@ -199,7 +199,7 @@ AbstractMemory::getAddrRange() const
|
||||
void
|
||||
AbstractMemory::trackLoadLocked(PacketPtr pkt)
|
||||
{
|
||||
Request *req = pkt->req;
|
||||
RequestPtr req = pkt->req;
|
||||
Addr paddr = LockedAddr::mask(req->getPaddr());
|
||||
|
||||
// first we check if we already have a locked addr for this
|
||||
@@ -230,7 +230,7 @@ AbstractMemory::trackLoadLocked(PacketPtr pkt)
|
||||
bool
|
||||
AbstractMemory::checkLockedAddrList(PacketPtr pkt)
|
||||
{
|
||||
Request *req = pkt->req;
|
||||
RequestPtr req = pkt->req;
|
||||
Addr paddr = LockedAddr::mask(req->getPaddr());
|
||||
bool isLLSC = pkt->isLLSC();
|
||||
|
||||
|
||||
@@ -79,12 +79,12 @@ class LockedAddr {
|
||||
static Addr mask(Addr paddr) { return (paddr & ~Addr_Mask); }
|
||||
|
||||
// check for matching execution context
|
||||
bool matchesContext(Request *req) const
|
||||
bool matchesContext(RequestPtr req) const
|
||||
{
|
||||
return (contextId == req->contextId());
|
||||
}
|
||||
|
||||
LockedAddr(Request *req) : addr(mask(req->getPaddr())),
|
||||
LockedAddr(RequestPtr req) : addr(mask(req->getPaddr())),
|
||||
contextId(req->contextId())
|
||||
{}
|
||||
|
||||
@@ -140,7 +140,7 @@ class AbstractMemory : public MemObject
|
||||
// this method must be called on *all* stores since even
|
||||
// non-conditional stores must clear any matching lock addresses.
|
||||
bool writeOK(PacketPtr pkt) {
|
||||
Request *req = pkt->req;
|
||||
RequestPtr req = pkt->req;
|
||||
if (lockedAddrList.empty()) {
|
||||
// no locked addrs: nothing to check, store_conditional fails
|
||||
bool isLLSC = pkt->isLLSC();
|
||||
|
||||
4
src/mem/cache/base.cc
vendored
4
src/mem/cache/base.cc
vendored
@@ -1278,7 +1278,7 @@ BaseCache::writebackBlk(CacheBlk *blk)
|
||||
|
||||
writebacks[Request::wbMasterId]++;
|
||||
|
||||
Request *req = new Request(regenerateBlkAddr(blk), blkSize, 0,
|
||||
RequestPtr req = new Request(regenerateBlkAddr(blk), blkSize, 0,
|
||||
Request::wbMasterId);
|
||||
if (blk->isSecure())
|
||||
req->setFlags(Request::SECURE);
|
||||
@@ -1313,7 +1313,7 @@ BaseCache::writebackBlk(CacheBlk *blk)
|
||||
PacketPtr
|
||||
BaseCache::writecleanBlk(CacheBlk *blk, Request::Flags dest, PacketId id)
|
||||
{
|
||||
Request *req = new Request(regenerateBlkAddr(blk), blkSize, 0,
|
||||
RequestPtr req = new Request(regenerateBlkAddr(blk), blkSize, 0,
|
||||
Request::wbMasterId);
|
||||
if (blk->isSecure()) {
|
||||
req->setFlags(Request::SECURE);
|
||||
|
||||
3
src/mem/cache/cache.cc
vendored
3
src/mem/cache/cache.cc
vendored
@@ -872,7 +872,8 @@ Cache::cleanEvictBlk(CacheBlk *blk)
|
||||
assert(!writebackClean);
|
||||
assert(blk && blk->isValid() && !blk->isDirty());
|
||||
// Creating a zero sized write, a message to the snoop filter
|
||||
Request *req =
|
||||
|
||||
RequestPtr req =
|
||||
new Request(regenerateBlkAddr(blk), blkSize, 0,
|
||||
Request::wbMasterId);
|
||||
if (blk->isSecure())
|
||||
|
||||
2
src/mem/cache/prefetch/queued.cc
vendored
2
src/mem/cache/prefetch/queued.cc
vendored
@@ -223,7 +223,7 @@ QueuedPrefetcher::insert(AddrPriority &pf_info, bool is_secure)
|
||||
}
|
||||
|
||||
/* Create a prefetch memory request */
|
||||
Request *pf_req =
|
||||
RequestPtr pf_req =
|
||||
new Request(pf_info.first, blkSize, 0, masterId);
|
||||
|
||||
if (is_secure) {
|
||||
|
||||
Reference in New Issue
Block a user