diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-10 01:57:57 -0400 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-10 01:57:57 -0400 |
| commit | a0472af008bd13d8a4850ef67b0ef08d37cfb8f8 (patch) | |
| tree | 79e12834910a62d400002736c6d306e0e4b8faed /src/mem/packet.hh | |
| parent | 5448517da4cd13e3c8438850f04367d9614d686b (diff) | |
| parent | cc78d86661dfccaca2f144d5bdcc75761bf52521 (diff) | |
| download | gem5-a0472af008bd13d8a4850ef67b0ef08d37cfb8f8.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
src/mem/packet.hh:
Hand merge code
--HG--
extra : convert_revision : d659418f24f4f4bf9867fec8573a5d227c0dfcea
Diffstat (limited to 'src/mem/packet.hh')
| -rw-r--r-- | src/mem/packet.hh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mem/packet.hh b/src/mem/packet.hh index 4d57aee75..426f14421 100644 --- a/src/mem/packet.hh +++ b/src/mem/packet.hh @@ -58,6 +58,8 @@ typedef std::list<PacketPtr> PacketList; #define NO_ALLOCATE 1 << 5 #define SNOOP_COMMIT 1 << 6 +//for now. @todo fix later +#define NUM_MEM_CMDS 1 << 11 /** * A Packet is used to encapsulate a transfer between two objects in * the memory system (e.g., the L1 and L2 cache). (In contrast, a @@ -173,9 +175,9 @@ class Packet NeedsResponse = 1 << 6, IsSWPrefetch = 1 << 7, IsHWPrefetch = 1 << 8, - HasData = 1 << 9 + IsUpgrade = 1 << 9, + HasData = 1 << 10 }; - //For statistics we need max number of commands, hard code it at //20 for now. @todo fix later #define NUM_MEM_CMDS 1 << 10 @@ -199,7 +201,7 @@ class Packet | NeedsResponse | HasData, InvalidateReq = IsInvalidate | IsRequest, WriteInvalidateReq = IsWrite | IsInvalidate | IsRequest | HasData, - UpgradeReq = IsInvalidate | IsRequest, + UpgradeReq = IsInvalidate | IsRequest | IsUpgrade, ReadExReq = IsRead | IsInvalidate | IsRequest | NeedsResponse, ReadExResp = IsRead | IsInvalidate | IsResponse | NeedsResponse | HasData |