diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-08-08 09:20:52 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-08 12:22:30 +0200 |
commit | 3288b87e2f75278c7415fbc7c4574bcf7da71295 (patch) | |
tree | 95df1e3f0eb76419e780da08b24fae28dc68c580 /src/qml/qml/v4/qv4math_p.h | |
parent | 2d9262a4c6680e3818bf7c07a4d1cfa32b4c9dfe (diff) |
Restructure source code
Move the v4 engine classes from a subdir of qml/qml into
two subdirs (compiler and jsruntime) of the qml module
Remove an unsued qv4syntaxchecker class, and move
the moth code directly into compiler.
Change-Id: I6929bede1f25098e6cb2e68087e779fac16b0c68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v4/qv4math_p.h')
-rw-r--r-- | src/qml/qml/v4/qv4math_p.h | 147 |
1 files changed, 0 insertions, 147 deletions
diff --git a/src/qml/qml/v4/qv4math_p.h b/src/qml/qml/v4/qv4math_p.h deleted file mode 100644 index a3a3715545..0000000000 --- a/src/qml/qml/v4/qv4math_p.h +++ /dev/null @@ -1,147 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 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$ -** 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 -** 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. -** -** In addition, as a special exception, Digia gives you certain additional -** 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$ -** -****************************************************************************/ -#ifndef QMLJS_MATH_H -#define QMLJS_MATH_H - -#include <qglobal.h> - -#ifndef QMLJS_LLVM_RUNTIME -# include <QtCore/qnumeric.h> -#endif // QMLJS_LLVM_RUNTIME -#include <cmath> - -#if defined(Q_CC_GNU) -#define QMLJS_READONLY __attribute((const)) -#else -#define QMLJS_READONLY -#endif - -QT_BEGIN_NAMESPACE - -namespace QV4 { - -#if !defined(QMLJS_LLVM_RUNTIME) && defined(Q_CC_GNU) && defined(Q_PROCESSOR_X86) - -static inline QMLJS_READONLY Value add_int32(int a, int b) -{ - quint8 overflow = 0; - int aa = a; - - asm ("addl %2, %1\n" - "seto %0" - : "=q" (overflow), "=r" (aa) - : "r" (b), "1" (aa) - : "cc" - ); - if (!overflow) - return Value::fromInt32(aa); - return Value::fromDouble((double)a + (double)b); -} - -static inline QMLJS_READONLY Value sub_int32(int a, int b) -{ - quint8 overflow = 0; - int aa = a; - - asm ("subl %2, %1\n" - "seto %0" - : "=q" (overflow), "=r" (aa) - : "r" (b), "1" (aa) - : "cc" - ); - if (!overflow) - return Value::fromInt32(aa); - return Value::fromDouble((double)a - (double)b); -} - -static inline QMLJS_READONLY Value mul_int32(int a, int b) -{ - quint8 overflow = 0; - int aa = a; - - asm ("imul %2, %1\n" - "setc %0" - : "=q" (overflow), "=r" (aa) - : "r" (b), "1" (aa) - : "cc" - ); - if (!overflow) - return Value::fromInt32(aa); - return Value::fromDouble((double)a * (double)b); -} - -#else - -static inline QMLJS_READONLY Value add_int32(int a, int b) -{ - qint64 result = a + b; - if (result > INT_MAX || result < INT_MIN) - return Value::fromDouble(result); - return Value::fromInt32(static_cast<int>(result)); -} - -static inline QMLJS_READONLY Value sub_int32(int a, int b) -{ - qint64 result = a - b; - if (result > INT_MAX || result < INT_MIN) - return Value::fromDouble(result); - return Value::fromInt32(static_cast<int>(result)); -} - -static inline QMLJS_READONLY Value mul_int32(int a, int b) -{ - qint64 result = a * b; - if (result > INT_MAX || result < INT_MIN) - return Value::fromDouble(result); - return Value::fromInt32(static_cast<int>(result)); -} - -#endif // defined(QMLJS_INLINE_MATH) - -} - -QT_END_NAMESPACE - -#ifdef QMLJS_READONLY -#undef QMLJS_READONLY -#endif - -#endif // QMLJS_MATH_H |