base.cc (12746:0d0c266663d4) base.cc (12747:785f582e44ab)
1/*
2 * Copyright (c) 2012-2013, 2018 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

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

1139 } else {
1140 tags->insertBlock(pkt, blk);
1141 }
1142
1143 // we should never be overwriting a valid block
1144 assert(!blk->isValid());
1145 } else {
1146 // existing block... probably an upgrade
1/*
2 * Copyright (c) 2012-2013, 2018 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

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

1139 } else {
1140 tags->insertBlock(pkt, blk);
1141 }
1142
1143 // we should never be overwriting a valid block
1144 assert(!blk->isValid());
1145 } else {
1146 // existing block... probably an upgrade
1147 assert(blk->tag == tags->extractTag(addr));
1147 assert(regenerateBlkAddr(blk) == addr);
1148 assert(blk->isSecure() == is_secure);
1149 // either we're getting new data or the block should already be valid
1150 assert(pkt->hasData() || blk->isValid());
1151 // don't clear block status... if block is already dirty we
1152 // don't want to lose that
1153 }
1154
1155 blk->status |= BlkValid | BlkReadable;

--- 1171 unchanged lines hidden --- 		1148 assert(blk->isSecure() == is_secure);
1149 // either we're getting new data or the block should already be valid
1150 assert(pkt->hasData() || blk->isValid());
1151 // don't clear block status... if block is already dirty we
1152 // don't want to lose that
1153 }
1154
1155 blk->status |= BlkValid | BlkReadable;

--- 1171 unchanged lines hidden ---