From: Kevin Lim <ktlim@umich.edu>
Date: Wed, 12 Jul 2006 19:25:34 +0000 (-0400)
Subject: Merge ktlim@zizzer:/bk/newmem
X-Git-Tag: m5_2.0_beta1~67^2~12
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbfe1db6b3d96e5bbf8fe91a494cf60eceae68ad;p=gem5.git

Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem

src/cpu/o3/fetch_impl.hh:
    Hand merge.

--HG--
extra : convert_revision : 820dab2bc921cbadecaca51cd069327f984f5c74
---

bbfe1db6b3d96e5bbf8fe91a494cf60eceae68ad
diff --cc src/cpu/o3/fetch_impl.hh
index a430f4472,39a13f9f8..4045492ca
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@@ -553,10 -550,8 +555,10 @@@ DefaultFetch<Impl>::fetchCacheLine(Add
          // Build packet here.
          PacketPtr data_pkt = new Packet(mem_req,
                                          Packet::ReadReq, Packet::Broadcast);
-         data_pkt->dataStatic(cacheData[tid]);
+         data_pkt->dataDynamic(new uint8_t[cacheBlkSize]);
  
 +        cacheDataPC[tid] = fetch_PC;
 +
          DPRINTF(Fetch, "Fetch: Doing instruction read.\n");
  
          fetchedCacheLines++;