lsq.cc (10379:c00f6d7e2681) lsq.cc (10504:58d5d471b598)
1/*
2 * Copyright (c) 2013-2014 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

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

1365 LSQ::LSQRequestPtr ret = NULL;
1366
1367 if (!transfers.empty()) {
1368 LSQRequestPtr request = transfers.front();
1369
1370 /* Same instruction and complete access or a store that's
1371 * capable of being moved to the store buffer */
1372 if (request->inst->id == inst->id) {
1/*
2 * Copyright (c) 2013-2014 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

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

1365 LSQ::LSQRequestPtr ret = NULL;
1366
1367 if (!transfers.empty()) {
1368 LSQRequestPtr request = transfers.front();
1369
1370 /* Same instruction and complete access or a store that's
1371 * capable of being moved to the store buffer */
1372 if (request->inst->id == inst->id) {
1373 if (request->isComplete() ||
1374 (request->state == LSQRequest::StoreToStoreBuffer &&
1375 storeBuffer.canInsert()))
1373 bool complete = request->isComplete();
1374 bool can_store = storeBuffer.canInsert();
1375 bool to_store_buffer = request->state ==
1376 LSQRequest::StoreToStoreBuffer;
1377
1378 if ((complete && !(request->isBarrier() && !can_store)) ||
1379 (to_store_buffer && can_store))
1376 {
1377 ret = request;
1378 }
1379 }
1380 }
1381
1382 if (ret) {
1383 DPRINTF(MinorMem, "Found matching memory response for inst: %s\n",

--- 233 unchanged lines hidden --- 		1380 {
1381 ret = request;
1382 }
1383 }
1384 }
1385
1386 if (ret) {
1387 DPRINTF(MinorMem, "Found matching memory response for inst: %s\n",

--- 233 unchanged lines hidden ---