queue.hh (12727:56c23b54bcb1) queue.hh (12823:ba630bc7a36d)
1/*
2 * Copyright (c) 2012-2013, 2015-2016, 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

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

172 if (!(ignore_uncacheable && entry->isUncacheable()) &&
173 entry->blkAddr == blk_addr && entry->isSecure == is_secure) {
174 return entry;
175 }
176 }
177 return nullptr;
178 }
179
1/*
2 * Copyright (c) 2012-2013, 2015-2016, 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

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

172 if (!(ignore_uncacheable && entry->isUncacheable()) &&
173 entry->blkAddr == blk_addr && entry->isSecure == is_secure) {
174 return entry;
175 }
176 }
177 return nullptr;
178 }
179
180 bool checkFunctional(PacketPtr pkt, Addr blk_addr)
180 bool trySatisfyFunctional(PacketPtr pkt, Addr blk_addr)
181 {
182 pkt->pushLabel(label);
183 for (const auto& entry : allocatedList) {
181 {
182 pkt->pushLabel(label);
183 for (const auto& entry : allocatedList) {
184 if (entry->blkAddr == blk_addr && entry->checkFunctional(pkt)) {
184 if (entry->blkAddr == blk_addr && entry->trySatisfyFunctional(pkt)) {
185 pkt->popLabel();
186 return true;
187 }
188 }
189 pkt->popLabel();
190 return false;
191 }
192

--- 66 unchanged lines hidden --- 		185 pkt->popLabel();
186 return true;
187 }
188 }
189 pkt->popLabel();
190 return false;
191 }
192

--- 66 unchanged lines hidden ---