From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 9 Oct 2006 23:35:53 +0000 (-0400)
Subject: Merge zizzer.eecs.umich.edu:/bk/newmem
X-Git-Tag: m5_2.0_beta2~104^2~20^2~3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=843888c489c3337a041098a94fc2105359a74a9a;p=gem5.git

Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus

--HG--
extra : convert_revision : 2adde42edead2cedeeba60cc0d2697a2d58682be
---

843888c489c3337a041098a94fc2105359a74a9a
diff --cc src/mem/packet.hh
index 5c513ae7a,56c4caffe..4d57aee75
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@@ -186,24 -183,20 +186,23 @@@ class Packe
      {
          InvalidCmd      = 0,
          ReadReq		= IsRead  | IsRequest | NeedsResponse,
 -        WriteReq	= IsWrite | IsRequest | NeedsResponse,
 -        WriteReqNoAck	= IsWrite | IsRequest,
 -        ReadResp	= IsRead  | IsResponse | NeedsResponse,
 +        WriteReq	= IsWrite | IsRequest | NeedsResponse | HasData,
 +        WriteReqNoAck	= IsWrite | IsRequest | HasData,
 +        ReadResp	= IsRead  | IsResponse | NeedsResponse | HasData,
          WriteResp	= IsWrite | IsResponse | NeedsResponse,
 -        Writeback       = IsWrite | IsRequest,
 +        Writeback       = IsWrite | IsRequest | HasData,
          SoftPFReq       = IsRead  | IsRequest | IsSWPrefetch | NeedsResponse,
          HardPFReq       = IsRead  | IsRequest | IsHWPrefetch | NeedsResponse,
 -        SoftPFResp      = IsRead  | IsResponse | IsSWPrefetch | NeedsResponse,
 -        HardPFResp      = IsRead  | IsResponse | IsHWPrefetch | NeedsResponse,
 +        SoftPFResp      = IsRead  | IsResponse | IsSWPrefetch
 +                                | NeedsResponse | HasData,
 +        HardPFResp      = IsRead  | IsResponse | IsHWPrefetch
 +                                | NeedsResponse | HasData,
          InvalidateReq   = IsInvalidate | IsRequest,
 -        WriteInvalidateReq = IsWrite | IsInvalidate | IsRequest,
 +        WriteInvalidateReq = IsWrite | IsInvalidate | IsRequest | HasData,
-         UpgradeReq      = IsInvalidate | IsRequest | NeedsResponse,
-         UpgradeResp     = IsInvalidate | IsResponse | NeedsResponse,
+         UpgradeReq      = IsInvalidate | IsRequest,
          ReadExReq       = IsRead | IsInvalidate | IsRequest | NeedsResponse,
 -        ReadExResp      = IsRead | IsInvalidate | IsResponse | NeedsResponse
 +        ReadExResp      = IsRead | IsInvalidate | IsResponse
 +                                | NeedsResponse | HasData
      };
  
      /** Return the string name of the cmd field (for debugging and