Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43345 )
Change subject: mem: Fix style in addr_mapper.hh.
......................................................................
mem: Fix style in addr_mapper.hh.
Change-Id: I3fd0bee6ac79e34034fbcc25e5da505cc3fc7181
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43345
Reviewed-by: Daniel Carvalho <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/mem/addr_mapper.hh
1 file changed, 33 insertions(+), 38 deletions(-)
Approvals:
Daniel Carvalho: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/addr_mapper.hh b/src/mem/addr_mapper.hh
index 2fad133..47a9b52 100644
--- a/src/mem/addr_mapper.hh
+++ b/src/mem/addr_mapper.hh
@@ -54,12 +54,10 @@
class AddrMapper : public SimObject
{
-
public:
-
AddrMapper(const AddrMapperParams ¶ms);
- virtual ~AddrMapper() { }
+ virtual ~AddrMapper() = default;
Port &getPort(const std::string &if_name,
PortID idx=InvalidPortID) override;
@@ -67,7 +65,6 @@
void init() override;
protected:
-
/**
* This function does the actual remapping of one address to another.
* It is pure virtual in this case to to allow any implementation
@@ -88,66 +85,67 @@
* @param _origAddr Address before remapping
*/
AddrMapperSenderState(Addr _origAddr) : origAddr(_origAddr)
- { }
+ {}
/** Destructor */
- ~AddrMapperSenderState() { }
+ ~AddrMapperSenderState() {}
/** The original address the packet was destined for */
Addr origAddr;
-
};
class MapperRequestPort : public RequestPort
{
-
public:
-
MapperRequestPort(const std::string& _name, AddrMapper& _mapper)
: RequestPort(_name, &_mapper), mapper(_mapper)
{ }
protected:
-
- void recvFunctionalSnoop(PacketPtr pkt)
+ void
+ recvFunctionalSnoop(PacketPtr pkt) override
{
mapper.recvFunctionalSnoop(pkt);
}
- Tick recvAtomicSnoop(PacketPtr pkt)
+ Tick
+ recvAtomicSnoop(PacketPtr pkt) override
{
return mapper.recvAtomicSnoop(pkt);
}
- bool recvTimingResp(PacketPtr pkt)
+ bool
+ recvTimingResp(PacketPtr pkt) override
{
return mapper.recvTimingResp(pkt);
}
- void recvTimingSnoopReq(PacketPtr pkt)
+ void
+ recvTimingSnoopReq(PacketPtr pkt) override
{
mapper.recvTimingSnoopReq(pkt);
}
- void recvRangeChange()
+ void
+ recvRangeChange() override
{
mapper.recvRangeChange();
}
- bool isSnooping() const
+ bool
+ isSnooping() const override
{
return mapper.isSnooping();
}
- void recvReqRetry()
+ void
+ recvReqRetry() override
{
mapper.recvReqRetry();
}
private:
-
AddrMapper& mapper;
-
};
/** Instance of request port, facing the memory side */
@@ -155,49 +153,50 @@
class MapperResponsePort : public ResponsePort
{
-
public:
-
MapperResponsePort(const std::string& _name, AddrMapper& _mapper)
: ResponsePort(_name, &_mapper), mapper(_mapper)
- { }
+ {}
protected:
-
- void recvFunctional(PacketPtr pkt)
+ void
+ recvFunctional(PacketPtr pkt) override
{
mapper.recvFunctional(pkt);
}
- Tick recvAtomic(PacketPtr pkt)
+ Tick
+ recvAtomic(PacketPtr pkt) override
{
return mapper.recvAtomic(pkt);
}
- bool recvTimingReq(PacketPtr pkt)
+ bool
+ recvTimingReq(PacketPtr pkt) override
{
return mapper.recvTimingReq(pkt);
}
- bool recvTimingSnoopResp(PacketPtr pkt)
+ bool
+ recvTimingSnoopResp(PacketPtr pkt) override
{
return mapper.recvTimingSnoopResp(pkt);
}
- AddrRangeList getAddrRanges() const
+ AddrRangeList
+ getAddrRanges() const override
{
return mapper.getAddrRanges();
}
- void recvRespRetry()
+ void
+ recvRespRetry() override
{
mapper.recvRespRetry();
}
private:
-
AddrMapper& mapper;
-
};
/** Instance of response port, i.e. on the CPU side */
@@ -238,17 +237,14 @@
*/
class RangeAddrMapper : public AddrMapper
{
-
public:
-
RangeAddrMapper(const RangeAddrMapperParams &p);
- ~RangeAddrMapper() { }
+ ~RangeAddrMapper() = default;
- AddrRangeList getAddrRanges() const;
+ AddrRangeList getAddrRanges() const override;
protected:
-
/**
* This contains a list of ranges the should be remapped. It must
* be the exact same length as remappedRanges which describes what
@@ -262,8 +258,7 @@
*/
std::vector<AddrRange> remappedRanges;
- Addr remapAddr(Addr addr) const;
-
+ Addr remapAddr(Addr addr) const override;
};
#endif //__MEM_ADDR_MAPPER_HH__
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43345
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I3fd0bee6ac79e34034fbcc25e5da505cc3fc7181
Gerrit-Change-Number: 43345
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-CC: Earl Ou <[email protected]>
Gerrit-CC: Yu-hsin Wang <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
