| cpu.cc (10367:bf52480abd01) | cpu.cc (10416:dd64a2984966) |
|---|---|
| 1/* 2 * Copyright (c) 2011,2013 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 --- 284 unchanged lines hidden (view full) --- 293 if (unverifiedReq && res && unverifiedReq->extraDataValid()) 294 *res = unverifiedReq->getExtraData(); 295 296 // Entire purpose here is to make sure we are getting the 297 // same data to send to the mem system as the CPU did. 298 // Cannot check this is actually what went to memory because 299 // there stores can be in ld/st queue or coherent operations 300 // overwriting values. | 1/* 2 * Copyright (c) 2011,2013 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 --- 284 unchanged lines hidden (view full) --- 293 if (unverifiedReq && res && unverifiedReq->extraDataValid()) 294 *res = unverifiedReq->getExtraData(); 295 296 // Entire purpose here is to make sure we are getting the 297 // same data to send to the mem system as the CPU did. 298 // Cannot check this is actually what went to memory because 299 // there stores can be in ld/st queue or coherent operations 300 // overwriting values. |
| 301 bool extraData; | 301 bool extraData = false; |
| 302 if (unverifiedReq) { 303 extraData = unverifiedReq->extraDataValid() ? | 302 if (unverifiedReq) { 303 extraData = unverifiedReq->extraDataValid() ? |
| 304 unverifiedReq->getExtraData() : 1; | 304 unverifiedReq->getExtraData() : true; |
| 305 } 306 307 if (unverifiedReq && unverifiedMemData && 308 memcmp(data, unverifiedMemData, fullSize) && extraData) { 309 warn("%lli: Store value does not match value sent to memory! " 310 "data: %#x inst_data: %#x", curTick(), data, 311 unverifiedMemData); 312 handleError(); --- 38 unchanged lines hidden --- | 305 } 306 307 if (unverifiedReq && unverifiedMemData && 308 memcmp(data, unverifiedMemData, fullSize) && extraData) { 309 warn("%lli: Store value does not match value sent to memory! " 310 "data: %#x inst_data: %#x", curTick(), data, 311 unverifiedMemData); 312 handleError(); --- 38 unchanged lines hidden --- |