base.hh (11722:f15f02d8c79e) base.hh (11744:5d33c6972dda)
1/*
2 * Copyright (c) 2012-2013, 2015-2016 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

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

513 // should only see writes or clean evicts here
514 assert(pkt->isWrite() || pkt->cmd == MemCmd::CleanEvict);
515
516 Addr blk_addr = blockAlign(pkt->getAddr());
517
518 WriteQueueEntry *wq_entry =
519 writeBuffer.findMatch(blk_addr, pkt->isSecure());
520 if (wq_entry && !wq_entry->inService) {
1/*
2 * Copyright (c) 2012-2013, 2015-2016 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

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

513 // should only see writes or clean evicts here
514 assert(pkt->isWrite() || pkt->cmd == MemCmd::CleanEvict);
515
516 Addr blk_addr = blockAlign(pkt->getAddr());
517
518 WriteQueueEntry *wq_entry =
519 writeBuffer.findMatch(blk_addr, pkt->isSecure());
520 if (wq_entry && !wq_entry->inService) {
521 DPRINTF(Cache, "Potential to merge writeback %s to %#llx",
522 pkt->cmdString(), pkt->getAddr());
521 DPRINTF(Cache, "Potential to merge writeback %s", pkt->print());
523 }
524
525 writeBuffer.allocate(blk_addr, blkSize, pkt, time, order++);
526
527 if (writeBuffer.isFull()) {
528 setBlocked((BlockedCause)MSHRQueue_WriteBuffer);
529 }
530

--- 85 unchanged lines hidden --- 		522 }
523
524 writeBuffer.allocate(blk_addr, blkSize, pkt, time, order++);
525
526 if (writeBuffer.isFull()) {
527 setBlocked((BlockedCause)MSHRQueue_WriteBuffer);
528 }
529

--- 85 unchanged lines hidden ---