diff options
author | Steve Reinhardt <steve.reinhardt@amd.com> | 2015-02-11 10:48:50 -0800 |
---|---|---|
committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2015-02-11 10:48:50 -0800 |
commit | ee0b52404c99cfed91a8d3fbebe3f42b0ac133df (patch) | |
tree | 5c26f8de53e57903f80ed45e643b4abd3020040a /src/cpu/inorder/resources/cache_unit.hh | |
parent | ccef61d1ccaea43cf44aa45bee272475f0b10405 (diff) | |
download | gem5-ee0b52404c99cfed91a8d3fbebe3f42b0ac133df.tar.xz |
mem: restructure Packet cmd initialization a bit more
Refactor the way that specific MemCmd values are generated for packets.
The new approach is a little more elegant in that we assign the right
value up front, and it's also more amenable to non-heap-allocated
Packet objects.
Also replaced the code in the Minor model that was still doing it the
ad-hoc way.
This is basically a refinement of http://repo.gem5.org/gem5/rev/711eb0e64249.
Diffstat (limited to 'src/cpu/inorder/resources/cache_unit.hh')
-rw-r--r-- | src/cpu/inorder/resources/cache_unit.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/inorder/resources/cache_unit.hh b/src/cpu/inorder/resources/cache_unit.hh index 65f18eedb..11eb9ddad 100644 --- a/src/cpu/inorder/resources/cache_unit.hh +++ b/src/cpu/inorder/resources/cache_unit.hh @@ -230,7 +230,7 @@ class CacheRequest : public ResourceRequest bool isMemAccPending() { return memAccPending; } //Make this data private/protected! - MemCmd::Command pktCmd; + MemCmd pktCmd; RequestPtr memReq; PacketDataPtr reqData; CacheReqPacket *dataPkt; @@ -252,7 +252,7 @@ class CacheReqPacket : public Packet { public: CacheReqPacket(CacheRequest *_req, - Command _cmd, int _idx = 0) + MemCmd _cmd, int _idx = 0) : Packet(&(*_req->memReq), _cmd), cacheReq(_req), instIdx(_idx), hasSlot(false), reqData(NULL), memReq(NULL) { |