Deleted Added
sdiff udiff text old ( 10853:5312e4cb6547 ) new ( 11990:5fad911cc326 )
full compact
1/*
2 * Copyright (c) 2012, 2014 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

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

341 return (bits(a, intlvHighBit, intlvHighBit - intlvBits + 1) ^
342 bits(a, xorHighBit, xorHighBit - intlvBits + 1)) ==
343 intlvMatch;
344 }
345 }
346 return false;
347 }
348
349/**
350 * Keep the operators away from SWIG.
351 */
352#ifndef SWIG
353
354 /**
355 * Less-than operator used to turn an STL map into a binary search
356 * tree of non-overlapping address ranges.
357 *
358 * @param r Range to compare with
359 * @return true if the start address is less than that of the other range
360 */
361 bool operator<(const AddrRange& r) const

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

379 }
380 return true;
381 }
382
383 bool operator!=(const AddrRange& r) const
384 {
385 return !(*this == r);
386 }
387#endif // SWIG
388};
389
390/**
391 * Convenience typedef for a collection of address ranges
392 */
393typedef std::list<AddrRange> AddrRangeList;
394
395inline AddrRange

--- 12 unchanged lines hidden ---