diff options
Diffstat (limited to 'src/qml/jsruntime/qv4math_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4math_p.h | 89 |
1 files changed, 38 insertions, 51 deletions
diff --git a/src/qml/jsruntime/qv4math_p.h b/src/qml/jsruntime/qv4math_p.h index a868e70c9a..4fdad40a69 100644 --- a/src/qml/jsruntime/qv4math_p.h +++ b/src/qml/jsruntime/qv4math_p.h @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information ** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -43,9 +35,7 @@ #include <qglobal.h> -#ifndef QMLJS_LLVM_RUNTIME -# include <QtCore/qnumeric.h> -#endif // QMLJS_LLVM_RUNTIME +#include <QtCore/qnumeric.h> #include <cmath> #if defined(Q_CC_GNU) @@ -58,9 +48,9 @@ QT_BEGIN_NAMESPACE namespace QV4 { -#if !defined(QMLJS_LLVM_RUNTIME) && defined(Q_CC_GNU) && defined(Q_PROCESSOR_X86) +#if defined(Q_CC_GNU) && defined(Q_PROCESSOR_X86) -static inline QMLJS_READONLY Value add_int32(int a, int b) +static inline QMLJS_READONLY ReturnedValue add_int32(int a, int b) { quint8 overflow = 0; int aa = a; @@ -71,13 +61,12 @@ static inline QMLJS_READONLY Value add_int32(int a, int b) : "r" (b), "1" (aa) : "cc" ); - if (!overflow) - return Primitive::fromInt32(aa); - qint64 result = static_cast<qint64>(a) + b; - return Primitive::fromDouble(result); + if (Q_UNLIKELY(overflow)) + return Primitive::fromDouble(static_cast<double>(a) + b).asReturnedValue(); + return Primitive::fromInt32(aa).asReturnedValue(); } -static inline QMLJS_READONLY Value sub_int32(int a, int b) +static inline QMLJS_READONLY ReturnedValue sub_int32(int a, int b) { quint8 overflow = 0; int aa = a; @@ -88,13 +77,12 @@ static inline QMLJS_READONLY Value sub_int32(int a, int b) : "r" (b), "1" (aa) : "cc" ); - if (!overflow) - return Primitive::fromInt32(aa); - qint64 result = static_cast<qint64>(a) - b; - return Primitive::fromDouble(result); + if (Q_UNLIKELY(overflow)) + return Primitive::fromDouble(static_cast<double>(a) - b).asReturnedValue(); + return Primitive::fromInt32(aa).asReturnedValue(); } -static inline QMLJS_READONLY Value mul_int32(int a, int b) +static inline QMLJS_READONLY ReturnedValue mul_int32(int a, int b) { quint8 overflow = 0; int aa = a; @@ -105,39 +93,38 @@ static inline QMLJS_READONLY Value mul_int32(int a, int b) : "r" (b), "1" (aa) : "cc" ); - if (!overflow) - return Primitive::fromInt32(aa); - qint64 result = static_cast<qint64>(a) * b; - return Primitive::fromDouble(result); + if (Q_UNLIKELY(overflow)) + return Primitive::fromDouble(static_cast<double>(a) * b).asReturnedValue(); + return Primitive::fromInt32(aa).asReturnedValue(); } #else -static inline QMLJS_READONLY Value add_int32(int a, int b) +static inline QMLJS_READONLY ReturnedValue add_int32(int a, int b) { qint64 result = static_cast<qint64>(a) + b; - if (result > INT_MAX || result < INT_MIN) - return Primitive::fromDouble(result); - return Primitive::fromInt32(static_cast<int>(result)); + if (Q_UNLIKELY(result > INT_MAX || result < INT_MIN)) + return Primitive::fromDouble(static_cast<double>(a) + b).asReturnedValue(); + return Primitive::fromInt32(static_cast<int>(result)).asReturnedValue(); } -static inline QMLJS_READONLY Value sub_int32(int a, int b) +static inline QMLJS_READONLY ReturnedValue sub_int32(int a, int b) { qint64 result = static_cast<qint64>(a) - b; - if (result > INT_MAX || result < INT_MIN) - return Primitive::fromDouble(result); - return Primitive::fromInt32(static_cast<int>(result)); + if (Q_UNLIKELY(result > INT_MAX || result < INT_MIN)) + return Primitive::fromDouble(static_cast<double>(a) - b).asReturnedValue(); + return Primitive::fromInt32(static_cast<int>(result)).asReturnedValue(); } -static inline QMLJS_READONLY Value mul_int32(int a, int b) +static inline QMLJS_READONLY ReturnedValue mul_int32(int a, int b) { qint64 result = static_cast<qint64>(a) * b; - if (result > INT_MAX || result < INT_MIN) - return Primitive::fromDouble(result); - return Primitive::fromInt32(static_cast<int>(result)); + if (Q_UNLIKELY(result > INT_MAX || result < INT_MIN)) + return Primitive::fromDouble(static_cast<double>(a) * b).asReturnedValue(); + return Primitive::fromInt32(static_cast<int>(result)).asReturnedValue(); } -#endif // defined(QMLJS_INLINE_MATH) +#endif } |