base.cc (12728:57bdea4f96aa) base.cc (12729:9870d6f73e04)
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

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

1131 tags->insertBlock(pkt, blk);
1132 }
1133
1134 // we should never be overwriting a valid block
1135 assert(!blk->isValid());
1136 } else {
1137 // existing block... probably an upgrade
1138 assert(blk->tag == tags->extractTag(addr));
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

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

1131 tags->insertBlock(pkt, blk);
1132 }
1133
1134 // we should never be overwriting a valid block
1135 assert(!blk->isValid());
1136 } else {
1137 // existing block... probably an upgrade
1138 assert(blk->tag == tags->extractTag(addr));
1139 assert(blk->isSecure() == is_secure);
1139 // either we're getting new data or the block should already be valid
1140 assert(pkt->hasData() || blk->isValid());
1141 // don't clear block status... if block is already dirty we
1142 // don't want to lose that
1143 }
1144
1140 // either we're getting new data or the block should already be valid
1141 assert(pkt->hasData() || blk->isValid());
1142 // don't clear block status... if block is already dirty we
1143 // don't want to lose that
1144 }
1145
1145 if (is_secure)
1146 blk->status |= BlkSecure;
1147 blk->status |= BlkValid | BlkReadable;
1148
1149 // sanity check for whole-line writes, which should always be
1150 // marked as writable as part of the fill, and then later marked
1151 // dirty as part of satisfyRequest
1152 if (pkt->cmd == MemCmd::WriteLineReq) {
1153 assert(!pkt->hasSharers());
1154 }

--- 1146 unchanged lines hidden --- 		1146 blk->status |= BlkValid | BlkReadable;
1147
1148 // sanity check for whole-line writes, which should always be
1149 // marked as writable as part of the fill, and then later marked
1150 // dirty as part of satisfyRequest
1151 if (pkt->cmd == MemCmd::WriteLineReq) {
1152 assert(!pkt->hasSharers());
1153 }

--- 1146 unchanged lines hidden ---