Merge zizzer.eecs.umich.edu:/bk/newmem

into  zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus

--HG--
extra : convert_revision : 2adde42edead2cedeeba60cc0d2697a2d58682be

diff --cc src/mem/cache/base_cache.cc
Simple merge

diff --cc src/mem/packet.hh
index 5c513ae7ace537f4b48ecb15f69cd82407ed11c4,56c4caffe0309baa2383b39b9e798131921730c7..4d57aee75c4bdd91e09242cc7b53fc4991cc721a
--- 1/src/mem/packet.hh
--- 2/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