mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes imported from Abseil "staging" branch:

Browse source 
- 536d004b7e2d48927a5f82e71e9e3a0a9afedbc8 Change uint128 parameters to pass by value. by Alex Strelnikov <strel@google.com>

GitOrigin-RevId: 536d004b7e2d48927a5f82e71e9e3a0a9afedbc8
Change-Id: I9c5e73ce06c8423a27ec7bff2c4accc434e99cb2
This commit is contained in:
Abseil Team 2017-12-05 10:58:48 -08:00 committed by Alex Strelnikov
parent f4f91f4216
commit 1b8dacca62
2 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
absl/numeric/int128.cc
View file

@ -124,22 +124,22 @@ uint128::uint128(float v) : uint128(Initialize128FromFloat(v)) {}
uint128::uint128(double v) : uint128(Initialize128FromFloat(v)) {}
uint128::uint128(long double v) : uint128(Initialize128FromFloat(v)) {}
uint128& uint128::operator/=(const uint128& divisor) {
uint128& uint128::operator/=(uint128 other) {
uint128 quotient = 0;
uint128 remainder = 0;
DivModImpl(*this, divisor, &quotient, &remainder);
DivModImpl(*this, other, &quotient, &remainder);
*this = quotient;
return *this;
}
uint128& uint128::operator%=(const uint128& divisor) {
uint128& uint128::operator%=(uint128 other) {
uint128 quotient = 0;
uint128 remainder = 0;
DivModImpl(*this, divisor, &quotient, &remainder);
DivModImpl(*this, other, &quotient, &remainder);
*this = remainder;
return *this;
}
std::ostream& operator<<(std::ostream& o, const uint128& b) {
std::ostream& operator<<(std::ostream& o, uint128 b) {
std::ios_base::fmtflags flags = o.flags();
// Select a divisor which is the largest power of the base < 2^64.

78
absl/numeric/int128.h
View file

@ -140,31 +140,31 @@ class alignas(16) uint128 {
// Trivial copy constructor, assignment operator and destructor.
// Arithmetic operators.
uint128& operator+=(const uint128& other);
uint128& operator-=(const uint128& other);
uint128& operator*=(const uint128& other);
uint128& operator+=(uint128 other);
uint128& operator-=(uint128 other);
uint128& operator*=(uint128 other);
// Long division/modulo for uint128.
uint128& operator/=(const uint128& other);
uint128& operator%=(const uint128& other);
uint128& operator/=(uint128 other);
uint128& operator%=(uint128 other);
uint128 operator++(int);
uint128 operator--(int);
uint128& operator<<=(int);
uint128& operator>>=(int);
uint128& operator&=(const uint128& other);
uint128& operator|=(const uint128& other);
uint128& operator^=(const uint128& other);
uint128& operator&=(uint128 other);
uint128& operator|=(uint128 other);
uint128& operator^=(uint128 other);
uint128& operator++();
uint128& operator--();
// Uint128Low64()
//
// Returns the lower 64-bit value of a `uint128` value.
friend constexpr uint64_t Uint128Low64(const uint128& v);
friend constexpr uint64_t Uint128Low64(uint128 v);
// Uint128High64()
//
// Returns the higher 64-bit value of a `uint128` value.
friend constexpr uint64_t Uint128High64(const uint128& v);
friend constexpr uint64_t Uint128High64(uint128 v);
// MakeUInt128()
//
@ -198,9 +198,9 @@ class alignas(16) uint128 {
extern const uint128 kuint128max;
// allow uint128 to be logged
extern std::ostream& operator<<(std::ostream& o, const uint128& b);
extern std::ostream& operator<<(std::ostream& o, uint128 b);
// TODO(strel) add operator>>(std::istream&, uint128&)
// TODO(strel) add operator>>(std::istream&, uint128)
// TODO(absl-team): Implement signed 128-bit type
@ -251,37 +251,37 @@ inline uint128& uint128::operator=(unsigned __int128 v) {
// Shift and arithmetic operators.
inline uint128 operator<<(const uint128& lhs, int amount) {
inline uint128 operator<<(uint128 lhs, int amount) {
return uint128(lhs) <<= amount;
}
inline uint128 operator>>(const uint128& lhs, int amount) {
inline uint128 operator>>(uint128 lhs, int amount) {
return uint128(lhs) >>= amount;
}
inline uint128 operator+(const uint128& lhs, const uint128& rhs) {
inline uint128 operator+(uint128 lhs, uint128 rhs) {
return uint128(lhs) += rhs;
}
inline uint128 operator-(const uint128& lhs, const uint128& rhs) {
inline uint128 operator-(uint128 lhs, uint128 rhs) {
return uint128(lhs) -= rhs;
}
inline uint128 operator*(const uint128& lhs, const uint128& rhs) {
inline uint128 operator*(uint128 lhs, uint128 rhs) {
return uint128(lhs) *= rhs;
}
inline uint128 operator/(const uint128& lhs, const uint128& rhs) {
inline uint128 operator/(uint128 lhs, uint128 rhs) {
return uint128(lhs) /= rhs;
}
inline uint128 operator%(const uint128& lhs, const uint128& rhs) {
inline uint128 operator%(uint128 lhs, uint128 rhs) {
return uint128(lhs) %= rhs;
}
constexpr uint64_t Uint128Low64(const uint128& v) { return v.lo_; }
constexpr uint64_t Uint128Low64(uint128 v) { return v.lo_; }
constexpr uint64_t Uint128High64(const uint128& v) { return v.hi_; }
constexpr uint64_t Uint128High64(uint128 v) { return v.hi_; }
// Constructors from integer types.
@ -424,34 +424,34 @@ inline uint128::operator long double() const {
// Comparison operators.
inline bool operator==(const uint128& lhs, const uint128& rhs) {
inline bool operator==(uint128 lhs, uint128 rhs) {
return (Uint128Low64(lhs) == Uint128Low64(rhs) &&
Uint128High64(lhs) == Uint128High64(rhs));
}
inline bool operator!=(const uint128& lhs, const uint128& rhs) {
inline bool operator!=(uint128 lhs, uint128 rhs) {
return !(lhs == rhs);
}
inline bool operator<(const uint128& lhs, const uint128& rhs) {
inline bool operator<(uint128 lhs, uint128 rhs) {
return (Uint128High64(lhs) == Uint128High64(rhs))
? (Uint128Low64(lhs) < Uint128Low64(rhs))
: (Uint128High64(lhs) < Uint128High64(rhs));
}
inline bool operator>(const uint128& lhs, const uint128& rhs) {
inline bool operator>(uint128 lhs, uint128 rhs) {
return (Uint128High64(lhs) == Uint128High64(rhs))
? (Uint128Low64(lhs) > Uint128Low64(rhs))
: (Uint128High64(lhs) > Uint128High64(rhs));
}
inline bool operator<=(const uint128& lhs, const uint128& rhs) {
inline bool operator<=(uint128 lhs, uint128 rhs) {
return (Uint128High64(lhs) == Uint128High64(rhs))
? (Uint128Low64(lhs) <= Uint128Low64(rhs))
: (Uint128High64(lhs) <= Uint128High64(rhs));
}
inline bool operator>=(const uint128& lhs, const uint128& rhs) {
inline bool operator>=(uint128 lhs, uint128 rhs) {
return (Uint128High64(lhs) == Uint128High64(rhs))
? (Uint128Low64(lhs) >= Uint128Low64(rhs))
: (Uint128High64(lhs) >= Uint128High64(rhs));
@ -459,7 +459,7 @@ inline bool operator>=(const uint128& lhs, const uint128& rhs) {
// Unary operators.
inline uint128 operator-(const uint128& val) {
inline uint128 operator-(uint128 val) {
const uint64_t hi_flip = ~Uint128High64(val);
const uint64_t lo_flip = ~Uint128Low64(val);
const uint64_t lo_add = lo_flip + 1;
@ -469,44 +469,44 @@ inline uint128 operator-(const uint128& val) {
return MakeUint128(hi_flip, lo_add);
}
inline bool operator!(const uint128& val) {
inline bool operator!(uint128 val) {
return !Uint128High64(val) && !Uint128Low64(val);
}
// Logical operators.
inline uint128 operator~(const uint128& val) {
inline uint128 operator~(uint128 val) {
return MakeUint128(~Uint128High64(val), ~Uint128Low64(val));
}
inline uint128 operator|(const uint128& lhs, const uint128& rhs) {
inline uint128 operator|(uint128 lhs, uint128 rhs) {
return MakeUint128(Uint128High64(lhs) | Uint128High64(rhs),
Uint128Low64(lhs) | Uint128Low64(rhs));
}
inline uint128 operator&(const uint128& lhs, const uint128& rhs) {
inline uint128 operator&(uint128 lhs, uint128 rhs) {
return MakeUint128(Uint128High64(lhs) & Uint128High64(rhs),
Uint128Low64(lhs) & Uint128Low64(rhs));
}
inline uint128 operator^(const uint128& lhs, const uint128& rhs) {
inline uint128 operator^(uint128 lhs, uint128 rhs) {
return MakeUint128(Uint128High64(lhs) ^ Uint128High64(rhs),
Uint128Low64(lhs) ^ Uint128Low64(rhs));
}
inline uint128& uint128::operator|=(const uint128& other) {
inline uint128& uint128::operator|=(uint128 other) {
hi_ |= other.hi_;
lo_ |= other.lo_;
return *this;
}
inline uint128& uint128::operator&=(const uint128& other) {
inline uint128& uint128::operator&=(uint128 other) {
hi_ &= other.hi_;
lo_ &= other.lo_;
return *this;
}
inline uint128& uint128::operator^=(const uint128& other) {
inline uint128& uint128::operator^=(uint128 other) {
hi_ ^= other.hi_;
lo_ ^= other.lo_;
return *this;
@ -550,7 +550,7 @@ inline uint128& uint128::operator>>=(int amount) {
return *this;
}
inline uint128& uint128::operator+=(const uint128& other) {
inline uint128& uint128::operator+=(uint128 other) {
hi_ += other.hi_;
uint64_t lolo = lo_ + other.lo_;
if (lolo < lo_)
@ -559,14 +559,14 @@ inline uint128& uint128::operator+=(const uint128& other) {
return *this;
}
inline uint128& uint128::operator-=(const uint128& other) {
inline uint128& uint128::operator-=(uint128 other) {
hi_ -= other.hi_;
if (other.lo_ > lo_) --hi_;
lo_ -= other.lo_;
return *this;
}
inline uint128& uint128::operator*=(const uint128& other) {
inline uint128& uint128::operator*=(uint128 other) {
#if defined(ABSL_HAVE_INTRINSIC_INT128)
// TODO(strel) Remove once alignment issues are resolved and unsigned __int128
// can be used for uint128 storage.