mshr_queue.cc (10913:38dbdeea7f1f) mshr_queue.cc (11197:f8fdd931e674)
1/*
2 * Copyright (c) 2012-2013, 2015 ARM Limited
3 * All rights reserved.
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 132 unchanged lines hidden (view full) ---

141 }
142 assert(false);
143 return readyList.end(); // keep stupid compilers happy
144}
145
146
147MSHR *
148MSHRQueue::allocate(Addr blk_addr, unsigned blk_size, PacketPtr pkt,
1/*
2 * Copyright (c) 2012-2013, 2015 ARM Limited
3 * All rights reserved.
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 132 unchanged lines hidden (view full) ---

141 }
142 assert(false);
143 return readyList.end(); // keep stupid compilers happy
144}
145
146
147MSHR *
148MSHRQueue::allocate(Addr blk_addr, unsigned blk_size, PacketPtr pkt,
149 Tick when_ready, Counter order)
149 Tick when_ready, Counter order, bool alloc_on_fill)
150{
151 assert(!freeList.empty());
152 MSHR *mshr = freeList.front();
153 assert(mshr->getNumTargets() == 0);
154 freeList.pop_front();
155
150{
151 assert(!freeList.empty());
152 MSHR *mshr = freeList.front();
153 assert(mshr->getNumTargets() == 0);
154 freeList.pop_front();
155
156 mshr->allocate(blk_addr, blk_size, pkt, when_ready, order);
156 mshr->allocate(blk_addr, blk_size, pkt, when_ready, order, alloc_on_fill);
157 mshr->allocIter = allocatedList.insert(allocatedList.end(), mshr);
158 mshr->readyIter = addToReadyList(mshr);
159
160 allocated += 1;
161 return mshr;
162}
163
164

--- 106 unchanged lines hidden --- 		157 mshr->allocIter = allocatedList.insert(allocatedList.end(), mshr);
158 mshr->readyIter = addToReadyList(mshr);
159
160 allocated += 1;
161 return mshr;
162}
163
164

--- 106 unchanged lines hidden ---