233c233
< assert(flags.any(VALID_VADDR));
---
> assert(flags.isSet(VALID_VADDR));
244,245c244,245
< assert(flags.any(VALID_VADDR));
< assert(flags.none(VALID_PADDR));
---
> assert(flags.isSet(VALID_VADDR));
> assert(flags.noneSet(VALID_PADDR));
262c262
< assert(flags.any(VALID_PADDR));
---
> assert(flags.isSet(VALID_PADDR));
272c272
< assert(flags.any(VALID_SIZE));
---
> assert(flags.isSet(VALID_SIZE));
280c280
< assert(flags.any(VALID_PADDR|VALID_VADDR));
---
> assert(flags.isSet(VALID_PADDR|VALID_VADDR));
287c287
< assert(flags.any(VALID_PADDR|VALID_VADDR));
---
> assert(flags.isSet(VALID_PADDR|VALID_VADDR));
291,292d290
< void resetTime() { setTime(curTick); }
<
297c295
< assert(flags.any(VALID_PADDR|VALID_VADDR));
---
> assert(flags.isSet(VALID_PADDR|VALID_VADDR));
304,306c302,304
< assert(flags.any(VALID_PADDR|VALID_VADDR));
< assert(_flags.none(~PUBLIC_FLAGS));
< return flags.any(_flags);
---
> assert(flags.isSet(VALID_PADDR|VALID_VADDR));
> assert(_flags.noneSet(~PUBLIC_FLAGS));
> return flags.isSet(_flags);
312,314c310,312
< assert(flags.any(VALID_PADDR|VALID_VADDR));
< assert(_flags.none(~PUBLIC_FLAGS));
< return flags.all(_flags);
---
> assert(flags.isSet(VALID_PADDR|VALID_VADDR));
> assert(_flags.noneSet(~PUBLIC_FLAGS));
> return flags.allSet(_flags);
321,322c319,320
< assert(flags.any(VALID_PADDR|VALID_VADDR));
< assert(_flags.none(~PUBLIC_FLAGS));
---
> assert(flags.isSet(VALID_PADDR|VALID_VADDR));
> assert(_flags.noneSet(~PUBLIC_FLAGS));
329,330c327,328
< assert(flags.any(VALID_PADDR|VALID_VADDR));
< assert(_flags.none(~PUBLIC_FLAGS));
---
> assert(flags.isSet(VALID_PADDR|VALID_VADDR));
> assert(_flags.noneSet(~PUBLIC_FLAGS));
337c335
< assert(flags.any(VALID_PADDR|VALID_VADDR));
---
> assert(flags.isSet(VALID_PADDR|VALID_VADDR));
345c343
< assert(flags.any(VALID_VADDR));
---
> assert(flags.isSet(VALID_VADDR));
353c351
< assert(flags.any(VALID_VADDR));
---
> assert(flags.isSet(VALID_VADDR));
361c359
< assert(flags.any(VALID_VADDR));
---
> assert(flags.isSet(VALID_VADDR));
369c367
< assert(flags.any(VALID_VADDR));
---
> assert(flags.isSet(VALID_VADDR));
377,378c375,376
< assert(flags.any(VALID_PADDR));
< return flags.any(MMAPED_IPR);
---
> assert(flags.isSet(VALID_PADDR));
> return flags.isSet(MMAPED_IPR);
393c391
< return flags.any(VALID_EXTRA_DATA);
---
> return flags.isSet(VALID_EXTRA_DATA);
400c398
< assert(flags.any(VALID_EXTRA_DATA));
---
> assert(flags.isSet(VALID_EXTRA_DATA));
416c414
< assert(flags.any(VALID_CONTEXT_ID));
---
> assert(flags.isSet(VALID_CONTEXT_ID));
424c422
< assert(flags.any(VALID_THREAD_ID));
---
> assert(flags.isSet(VALID_THREAD_ID));
432c430
< assert(flags.any(VALID_PC));
---
> assert(flags.isSet(VALID_PC));
437,441c435,439
< bool isUncacheable() const { return flags.any(UNCACHEABLE); }
< bool isInstRead() const { return flags.any(INST_READ); }
< bool isLocked() const { return flags.any(LOCKED); }
< bool isSwap() const { return flags.any(MEM_SWAP|MEM_SWAP_COND); }
< bool isCondSwap() const { return flags.any(MEM_SWAP_COND); }
---
> bool isUncacheable() const { return flags.isSet(UNCACHEABLE); }
> bool isInstRead() const { return flags.isSet(INST_READ); }
> bool isLocked() const { return flags.isSet(LOCKED); }
> bool isSwap() const { return flags.isSet(MEM_SWAP|MEM_SWAP_COND); }
> bool isCondSwap() const { return flags.isSet(MEM_SWAP_COND); }
446c444
< if (flags.any(NO_ALIGN_FAULT))
---
> if (flags.isSet(NO_ALIGN_FAULT))
452c450
< if (flags.any(NO_HALF_WORD_ALIGN_FAULT))
---
> if (flags.isSet(NO_HALF_WORD_ALIGN_FAULT))