2c2
< * Copyright (c) 2013-2017 ARM Limited
---
> * Copyright (c) 2013-2017,2019 ARM Limited
51a52,53
> const int SnoopFilter::SNOOP_MASK_SIZE;
>
56c58
< if (!(sf_item.requested | sf_item.holder)) {
---
> if ((sf_item.requested | sf_item.holder).none()) {
99,100c101
< // Single bit set -> value is a power of two
< if (isPow2(interested))
---
> if (interested.count() == 1)
117,118c118,120
< panic_if(sf_item.requested & req_port, "double request :( " \
< "SF value %x.%x\n", sf_item.requested, sf_item.holder);
---
> panic_if((sf_item.requested & req_port).any(),
> "double request :( SF value %x.%x\n",
> sf_item.requested, sf_item.holder);
129c131,132
< panic_if(!(sf_item.holder & req_port), "Need to hold the value!");
---
> panic_if((sf_item.holder & req_port).none(),
> "Need to hold the value!");
137c140
< panic_if(!(sf_item.holder & req_port), "requester %x is not a " \
---
> panic_if((sf_item.holder & req_port).none(), "requester %x is not a " \
209,210c212,213
< // Single bit set -> value is a power of two
< if (isPow2(interested))
---
>
> if (interested.count() == 1)
225c228
< if (cpkt->isInvalidate() && !sf_item.requested) {
---
> if (cpkt->isInvalidate() && sf_item.requested.none()) {
269,270c272,274
< panic_if(!(sf_item.holder & rsp_mask), "SF value %x.%x does not have "\
< "the line\n", sf_item.requested, sf_item.holder);
---
> panic_if((sf_item.holder & rsp_mask).none(),
> "SF value %x.%x does not have the line\n",
> sf_item.requested, sf_item.holder);
273c277
< panic_if(!(sf_item.requested & req_mask), "SF value %x.%x missing "\
---
> panic_if((sf_item.requested & req_mask).none(), "SF value %x.%x missing "\
290c294
< assert(sf_item.requested | sf_item.holder);
---
> assert((sf_item.requested | sf_item.holder).any());
362,363c366,368
< panic_if(!(sf_item.requested & slave_mask), "SF value %x.%x missing "\
< "request bit\n", sf_item.requested, sf_item.holder);
---
> panic_if((sf_item.requested & slave_mask).none(),
> "SF value %x.%x missing request bit\n",
> sf_item.requested, sf_item.holder);
379c384
< assert(sf_item.holder | sf_item.requested);
---
> assert((sf_item.holder | sf_item.requested).any());