mshr_queue.cc (10768:9a34e28cd2c2) | mshr_queue.cc (10910:32f3d1c454ec) |
---|---|
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 --- 172 unchanged lines hidden (view full) --- 181 } 182 mshr->deallocate(); 183 if (drainManager && allocated == 0) { 184 // Notify the drain manager that we have completed draining if 185 // there are no other outstanding requests in this MSHR queue. 186 DPRINTF(Drain, "MSHRQueue now empty, signalling drained\n"); 187 drainManager->signalDrainDone(); 188 drainManager = NULL; | 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 --- 172 unchanged lines hidden (view full) --- 181 } 182 mshr->deallocate(); 183 if (drainManager && allocated == 0) { 184 // Notify the drain manager that we have completed draining if 185 // there are no other outstanding requests in this MSHR queue. 186 DPRINTF(Drain, "MSHRQueue now empty, signalling drained\n"); 187 drainManager->signalDrainDone(); 188 drainManager = NULL; |
189 setDrainState(Drainable::Drained); | 189 setDrainState(DrainState::Drained); |
190 } 191 return retval; 192} 193 194void 195MSHRQueue::moveToFront(MSHR *mshr) 196{ 197 if (!mshr->inService) { --- 66 unchanged lines hidden (view full) --- 264 } 265 } 266} 267 268unsigned int 269MSHRQueue::drain(DrainManager *dm) 270{ 271 if (allocated == 0) { | 190 } 191 return retval; 192} 193 194void 195MSHRQueue::moveToFront(MSHR *mshr) 196{ 197 if (!mshr->inService) { --- 66 unchanged lines hidden (view full) --- 264 } 265 } 266} 267 268unsigned int 269MSHRQueue::drain(DrainManager *dm) 270{ 271 if (allocated == 0) { |
272 setDrainState(Drainable::Drained); | 272 setDrainState(DrainState::Drained); |
273 return 0; 274 } else { 275 drainManager = dm; | 273 return 0; 274 } else { 275 drainManager = dm; |
276 setDrainState(Drainable::Draining); | 276 setDrainState(DrainState::Draining); |
277 return 1; 278 } 279} | 277 return 1; 278 } 279} |