wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 915846 - IonMonkey: Simplify int64 arithmetic to int32 arithmetic in several places. r=nbp

Browse Source
This commit is contained in:
Dan Gohman 2013-10-03 17:25:02 -07:00
parent e5779e49c7
commit 989ffe444a
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/src/jit/RangeAnalysis.cpp
View File

@ -450,21 +450,16 @@ Range::and_(const Range *lhs, const Range *rhs)
{
JS_ASSERT(lhs->isInt32());
JS_ASSERT(rhs->isInt32());
int64_t lower;
int64_t upper;
// If both numbers can be negative, result can be negative in the whole range
if (lhs->lower() < 0 && rhs->lower() < 0) {
lower = INT_MIN;
upper = Max(lhs->upper(), rhs->upper());
return Range::NewInt32Range(lower, upper);
}
if (lhs->lower() < 0 && rhs->lower() < 0)
return Range::NewInt32Range(INT32_MIN, Max(lhs->upper(), rhs->upper()));
// Only one of both numbers can be negative.
// - result can't be negative
// - Upper bound is minimum of both upper range,
lower = 0;
upper = Min(lhs->upper(), rhs->upper());
int32_t lower = 0;
int32_t upper = Min(lhs->upper(), rhs->upper());
// EXCEPT when upper bound of non negative number is max value,
// because negative value can return the whole max value.
@ -506,25 +501,27 @@ Range::or_(const Range *lhs, const Range *rhs)
JS_ASSERT_IF(lhs->upper() < 0, lhs->lower() != -1);
JS_ASSERT_IF(rhs->upper() < 0, rhs->lower() != -1);
int64_t lower = INT32_MIN;
int64_t upper = INT32_MAX;
int32_t lower = INT32_MIN;
int32_t upper = INT32_MAX;
if (lhs->lower() >= 0 && rhs->lower() >= 0) {
// Both operands are non-negative, so the result won't be less than either.
lower = Max(lhs->lower(), rhs->lower());
// The result will have leading zeros where both operands have leading zeros.
upper = UINT32_MAX >> Min(CountLeadingZeroes32(lhs->upper()),
CountLeadingZeroes32(rhs->upper()));
// CountLeadingZeroes32 of a non-negative int32 will at least be 1 to account
// for the bit of sign.
upper = int32_t(UINT32_MAX >> Min(CountLeadingZeroes32(lhs->upper()),
CountLeadingZeroes32(rhs->upper())));
} else {
// The result will have leading ones where either operand has leading ones.
if (lhs->upper() < 0) {
unsigned leadingOnes = CountLeadingZeroes32(~lhs->lower());
lower = Max(lower, int64_t(~int32_t(UINT32_MAX >> leadingOnes)));
lower = Max(lower, ~int32_t(UINT32_MAX >> leadingOnes));
upper = -1;
}
if (rhs->upper() < 0) {
unsigned leadingOnes = CountLeadingZeroes32(~rhs->lower());
lower = Max(lower, int64_t(~int32_t(UINT32_MAX >> leadingOnes)));
lower = Max(lower, ~int32_t(UINT32_MAX >> leadingOnes));
upper = -1;
}
}
@ -1794,8 +1791,8 @@ Range::clampToInt32()
{
if (isInt32())
return;
int64_t l = hasInt32LowerBound() ? lower() : JSVAL_INT_MIN;
int64_t h = hasInt32UpperBound() ? upper() : JSVAL_INT_MAX;
int32_t l = hasInt32LowerBound() ? lower() : JSVAL_INT_MIN;
int32_t h = hasInt32UpperBound() ? upper() : JSVAL_INT_MAX;
set(l, h);
}