qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/src/qml/jsruntime/qv4vme_moth.cpp

985 lines
38 KiB
C++
Raw Normal View History

Fix some missing license headers Change-Id: I758fe0a61d1ecb9418087ac318ac93f227013248 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-24 10:07:48 +00:00
/****************************************************************************
**
Updated license headers From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ic36f1a0a1436fe6ac6eeca8c2375a79857e9cb12 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 09:38:36 +00:00
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Fix some missing license headers Change-Id: I758fe0a61d1ecb9418087ac318ac93f227013248 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-24 10:07:48 +00:00
**
Fix module name (QtQml) in the license header Change-Id: Id78dfee1ac76a3b4d0976864353c4eb50e63c08b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-06-24 11:50:51 +00:00
** This file is part of the QtQml module of the Qt Toolkit.
Fix some missing license headers Change-Id: I758fe0a61d1ecb9418087ac318ac93f227013248 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-24 10:07:48 +00:00
**
Updated license headers From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ic36f1a0a1436fe6ac6eeca8c2375a79857e9cb12 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 09:38:36 +00:00
** $QT_BEGIN_LICENSE:LGPL$
Fix some missing license headers Change-Id: I758fe0a61d1ecb9418087ac318ac93f227013248 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-24 10:07:48 +00:00
** 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
Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2015-01-28 11:55:39 +00:00
** a written agreement between you and The Qt Company. For licensing terms
Updated license headers From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ic36f1a0a1436fe6ac6eeca8c2375a79857e9cb12 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 09:38:36 +00:00
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
Fix some missing license headers Change-Id: I758fe0a61d1ecb9418087ac318ac93f227013248 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-24 10:07:48 +00:00
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
Updated license headers From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ic36f1a0a1436fe6ac6eeca8c2375a79857e9cb12 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 09:38:36 +00:00
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
Fix some missing license headers Change-Id: I758fe0a61d1ecb9418087ac318ac93f227013248 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-24 10:07:48 +00:00
**
Updated license headers From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ic36f1a0a1436fe6ac6eeca8c2375a79857e9cb12 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-19 09:38:36 +00:00
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
Fix some missing license headers Change-Id: I758fe0a61d1ecb9418087ac318ac93f227013248 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-24 10:07:48 +00:00
**
** $QT_END_LICENSE$
**
****************************************************************************/
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#include "qv4vme_moth_p.h"
#include "qv4instr_moth_p.h"
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
#include <QtCore/qjsondocument.h>
#include <QtCore/qjsonobject.h>
Get rid of qv4value_inl_p.h and replace it by qv4typedvalue_p.h This is a cleaner separation and further reduces include dependencies in the definitions of our basic data structured. Change-Id: I18aa86cdea0c0dfbc16075d4d617af97e638811e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-14 21:46:41 +00:00
#include <private/qv4value_p.h>
Fix compilation with built-in v4vm JS engine Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-04-15 09:50:16 +00:00
#include <private/qv4debugging_p.h>
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
#include <private/qv4function_p.h>
#include <private/qv4functionobject_p.h>
Fix integer preserving arithmetics with the interpreter This fixes qqmllanguage and some other auto-tests with the interpreter When adding numbers, make sure to preserve them as integer if left and right hand side are integers. We do this now consistently throughout the runtime by providing fallback implementations of mul/sub/add_int32. Change-Id: I37e24ce14dc676bb072571b57289965ec59999c1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-05 13:55:45 +00:00
#include <private/qv4math_p.h>
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
#include <private/qv4scopedvalue_p.h>
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
#include <private/qv4lookup_p.h>
Get rid of qv4value_inl_p.h and replace it by qv4typedvalue_p.h This is a cleaner separation and further reduces include dependencies in the definitions of our basic data structured. Change-Id: I18aa86cdea0c0dfbc16075d4d617af97e638811e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-14 21:46:41 +00:00
#include <private/qv4string_p.h>
Add some debugging infrastructure to the interpreter. This currently mainly intended to be useful in a C++ debugger. The infrastructure makes it a lot easier to access (parent) contexts, find function names, etc. Change-Id: I0493d3a3bd4bf5c3a03379c1a2b545ed76862cd5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-29 13:41:26 +00:00
#include <iostream>
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
Fix alloca usage on Windows On Windows it's _alloca, so provide a wrapping macro in qv4alloca_p.h and use that instead. Change-Id: I675cb7fd09bab3c84c44e56819c0f17a42b3c211 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-08 08:30:40 +00:00
#include "qv4alloca_p.h"
Change the interpreter's stack frame to be allocated with alloca. Change-Id: Ia02ad1af3bb0f429a6078029bf7aaee5a17f3413 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-19 10:21:06 +00:00
Replace usage of stdout for debug output by qDebug This way even paranoid Androids can be show interesting stuff. Task-number: QTBUG-43109 Change-Id: Ib0ef9e8f6c6fc66e9ea9bfcaf2cd9e33d7469070 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-16 12:44:14 +00:00
#undef DO_TRACE_INSTR // define to enable instruction tracing
Added property activation to the interpreter. Change-Id: Icbc900f8d617c8736a5663d19f5691f336bedb30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 14:06:52 +00:00
#ifdef DO_TRACE_INSTR
Replace usage of stdout for debug output by qDebug This way even paranoid Androids can be show interesting stuff. Task-number: QTBUG-43109 Change-Id: Ib0ef9e8f6c6fc66e9ea9bfcaf2cd9e33d7469070 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-16 12:44:14 +00:00
# define TRACE_INSTR(I) qDebug("executing a %s\n", #I);
# define TRACE(n, str, ...) { char buf[4096]; snprintf(buf, 4096, str, __VA_ARGS__); qDebug(" %s : %s", #n, buf); }
Added property activation to the interpreter. Change-Id: Icbc900f8d617c8736a5663d19f5691f336bedb30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 14:06:52 +00:00
#else
# define TRACE_INSTR(I)
# define TRACE(n, str, ...)
#endif // DO_TRACE_INSTR
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
extern "C" {
// This is the interface to Qt Creator's (new) QML debugger.
/*! \internal
\since 5.5
This function is called uncondionally from VME::run().
An attached debugger can set a breakpoint here to
intercept calls to VME::run().
*/
Q_QML_EXPORT void qt_v4ResolvePendingBreakpointsHook()
{
}
/*! \internal
\since 5.5
This function is called when a QML interpreter breakpoint
is hit.
An attached debugger can set a breakpoint here.
*/
Q_QML_EXPORT void qt_v4TriggeredBreakpointHook()
{
}
/*! \internal
\since 5.5
The main entry point into "Native Mixed" Debugging.
Commands are passed as UTF-8 encoded JSON data.
The data has two compulsory fields:
\list
\li \c version: Version of the protocol (currently 1)
\li \c command: Name of the command
\endlist
Depending on \c command, more fields can be present.
Error is indicated by negative return values,
success by non-negative return values.
\c protocolVersion:
Returns version of implemented protocol.
\c insertBreakpoint:
Sets a breakpoint on a given file and line.
\list
\li \c fullName: Name of the QML/JS file
\li \c lineNumber: Line number in the file
\li \c condition: Breakpoint condition
\endlist
Returns a unique positive number as handle.
\c removeBreakpoint:
Removes a breakpoint from a given file and line.
\list
\li \c fullName: Name of the QML/JS file
\li \c lineNumber: Line number in the file
\li \c condition: Breakpoint condition
\endlist
Returns zero on success, a negative number on failure.
\c prepareStep:
Puts the interpreter in stepping mode.
Returns zero.
*/
Q_QML_EXPORT int qt_v4DebuggerHook(const char *json);
} // extern "C"
V4: Leave out Debug and Line istructions on -no-qml-debug Change-Id: Ida861af5636a1605783f7af4bf88cb46b44f9022 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-07-25 13:58:04 +00:00
#ifndef QT_NO_QML_DEBUGGER
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
static int qt_v4BreakpointCount = 0;
static bool qt_v4IsDebugging = true;
static bool qt_v4IsStepping = false;
class Breakpoint
{
public:
Breakpoint() : bpNumber(0), lineNumber(-1) {}
bool matches(const QString &file, int line) const
{
return fullName == file && lineNumber == line;
}
int bpNumber;
int lineNumber;
QString fullName; // e.g. /opt/project/main.qml
QString engineName; // e.g. qrc:/main.qml
QString condition; // optional
};
static QVector<Breakpoint> qt_v4Breakpoints;
static Breakpoint qt_v4LastStop;
static QV4::Function *qt_v4ExtractFunction(QV4::ExecutionContext *context)
{
Change ExecutionContext::getFunctionObject() to getFunction() And return a QV4::Function from now on. This simplifies code in other places and provides all the info required for stack traces and debugging. Change-Id: I512a8ac3932268d8cfc60675e75c4661d1f16fd8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-30 15:20:32 +00:00
if (QV4::Function *function = context->getFunction())
return function;
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
else
return context->d()->engine->globalCode;
}
static void qt_v4TriggerBreakpoint(const Breakpoint &bp, QV4::Function *function)
{
qt_v4LastStop = bp;
// Set up some auxiliary data for informational purpose.
// This is not part of the protocol.
QV4::Heap::String *functionName = function->name();
QByteArray functionNameUtf8;
if (functionName)
functionNameUtf8 = functionName->toQString().toUtf8();
qt_v4TriggeredBreakpointHook(); // Trigger Breakpoint.
}
int qt_v4DebuggerHook(const char *json)
{
const int ProtocolVersion = 1;
enum {
Success = 0,
WrongProtocol,
NoSuchCommand,
NoSuchBreakpoint
};
QJsonDocument doc = QJsonDocument::fromJson(json);
QJsonObject ob = doc.object();
Qml: replace QStringLiteral with QL1S ... or with QL1C in such cases: - if there is overloaded function - in QStringBuilder expressions Saves ~1.5 KB in text size. Build config: ubuntu 16.04 x64, gcc 5.3 Change-Id: Icc0789f1c244ce20a3182494b0c7f35c9d77e41d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-06-07 14:15:07 +00:00
QByteArray command = ob.value(QLatin1String("command")).toString().toUtf8();
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
if (command == "protocolVersion") {
return ProtocolVersion; // Version number.
}
int version = ob.value(QLatin1Literal("version")).toString().toInt();
if (version != ProtocolVersion) {
return -WrongProtocol;
}
if (command == "insertBreakpoint") {
Breakpoint bp;
bp.bpNumber = ++qt_v4BreakpointCount;
Qml: replace QStringLiteral with QL1S ... or with QL1C in such cases: - if there is overloaded function - in QStringBuilder expressions Saves ~1.5 KB in text size. Build config: ubuntu 16.04 x64, gcc 5.3 Change-Id: Icc0789f1c244ce20a3182494b0c7f35c9d77e41d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-06-07 14:15:07 +00:00
bp.lineNumber = ob.value(QLatin1String("lineNumber")).toString().toInt();
bp.engineName = ob.value(QLatin1String("engineName")).toString();
bp.fullName = ob.value(QLatin1String("fullName")).toString();
bp.condition = ob.value(QLatin1String("condition")).toString();
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
qt_v4Breakpoints.append(bp);
return bp.bpNumber;
}
if (command == "removeBreakpoint") {
Qml: replace QStringLiteral with QL1S ... or with QL1C in such cases: - if there is overloaded function - in QStringBuilder expressions Saves ~1.5 KB in text size. Build config: ubuntu 16.04 x64, gcc 5.3 Change-Id: Icc0789f1c244ce20a3182494b0c7f35c9d77e41d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-06-07 14:15:07 +00:00
int lineNumber = ob.value(QLatin1String("lineNumber")).toString().toInt();
QString fullName = ob.value(QLatin1String("fullName")).toString();
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
if (qt_v4Breakpoints.last().matches(fullName, lineNumber)) {
qt_v4Breakpoints.removeLast();
return Success;
}
for (int i = 0; i + 1 < qt_v4Breakpoints.size(); ++i) {
if (qt_v4Breakpoints.at(i).matches(fullName, lineNumber)) {
qt_v4Breakpoints[i] = qt_v4Breakpoints.takeLast();
return Success; // Ok.
}
}
return -NoSuchBreakpoint; // Failure
}
if (command == "prepareStep") {
qt_v4IsStepping = true;
return Success; // Ok.
}
return -NoSuchCommand; // Failure.
}
static void qt_v4CheckForBreak(QV4::ExecutionContext *context, QV4::Value **scopes, int scopeDepth)
{
Q_UNUSED(scopes);
Q_UNUSED(scopeDepth);
const int lineNumber = context->d()->lineNumber;
QV4::Function *function = qt_v4ExtractFunction(context);
QString engineName = function->sourceFile();
if (engineName.isEmpty())
return;
if (qt_v4IsStepping) {
if (qt_v4LastStop.lineNumber != lineNumber
|| qt_v4LastStop.engineName != engineName) {
qt_v4IsStepping = false;
Breakpoint bp;
bp.bpNumber = 0;
bp.lineNumber = lineNumber;
bp.engineName = engineName;
qt_v4TriggerBreakpoint(bp, function);
return;
}
}
for (int i = qt_v4Breakpoints.size(); --i >= 0; ) {
const Breakpoint &bp = qt_v4Breakpoints.at(i);
if (bp.lineNumber != lineNumber)
continue;
if (bp.engineName != engineName)
continue;
qt_v4TriggerBreakpoint(bp, function);
}
}
V4: Leave out Debug and Line istructions on -no-qml-debug Change-Id: Ida861af5636a1605783f7af4bf88cb46b44f9022 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-07-25 13:58:04 +00:00
#endif // QT_NO_QML_DEBUGGER
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
// End of debugger interface
Clean up our internal namespaces QQmlJS::MASM -> QV4::JIT QQmlJS::V4IR -> QV4::IR Change-Id: I707e8990459114a699c200fe3c22cec3c8df1afc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-14 12:58:40 +00:00
using namespace QV4;
using namespace QV4::Moth;
Add tracing for runtime methods. Change-Id: I540297e83e3e297d0724c3e08e5780eee0d2fac8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:31:02 +00:00
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#define MOTH_BEGIN_INSTR_COMMON(I) { \
const InstrMeta<(int)Instr::I>::DataType &instr = InstrMeta<(int)Instr::I>::data(*genericInstr); \
code += InstrMeta<(int)Instr::I>::Size; \
Added property activation to the interpreter. Change-Id: Icbc900f8d617c8736a5663d19f5691f336bedb30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 14:06:52 +00:00
Q_UNUSED(instr); \
TRACE_INSTR(I)
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#ifdef MOTH_THREADED_INTERPRETER
# define MOTH_BEGIN_INSTR(I) op_##I: \
MOTH_BEGIN_INSTR_COMMON(I)
# define MOTH_END_INSTR(I) } \
genericInstr = reinterpret_cast<const Instr *>(code); \
goto *genericInstr->common.code; \
#else
# define MOTH_BEGIN_INSTR(I) \
case Instr::I: \
MOTH_BEGIN_INSTR_COMMON(I)
# define MOTH_END_INSTR(I) } \
Fix interpreter without computed goto and new exception handling At the end of an instruction, don't break and run into the unreachable assert, instead use "continue" to get to the top of the for (;;) loop to resume execution. Change-Id: I544104e76cb7a547c050714da1c67cde6f11ba04 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-28 15:04:07 +00:00
continue;
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#endif
Remove the tempRegister from moth by loading/storing values directly. Change-Id: I51982d5852db2e10234620d63c235484c5b8a573 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-13 11:25:23 +00:00
#ifdef DO_TRACE_INSTR
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
Param traceParam(const Param &param)
{
if (param.isConstant()) {
Replace usage of stdout for debug output by qDebug This way even paranoid Androids can be show interesting stuff. Task-number: QTBUG-43109 Change-Id: Ib0ef9e8f6c6fc66e9ea9bfcaf2cd9e33d7469070 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-16 12:44:14 +00:00
qDebug(" constant\n");
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
} else if (param.isArgument()) {
Replace usage of stdout for debug output by qDebug This way even paranoid Androids can be show interesting stuff. Task-number: QTBUG-43109 Change-Id: Ib0ef9e8f6c6fc66e9ea9bfcaf2cd9e33d7469070 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-16 12:44:14 +00:00
qDebug(" argument %d@%d\n", param.index, param.scope);
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
} else if (param.isLocal()) {
Replace usage of stdout for debug output by qDebug This way even paranoid Androids can be show interesting stuff. Task-number: QTBUG-43109 Change-Id: Ib0ef9e8f6c6fc66e9ea9bfcaf2cd9e33d7469070 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-16 12:44:14 +00:00
qDebug(" local %d\n", param.index);
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
} else if (param.isTemp()) {
Replace usage of stdout for debug output by qDebug This way even paranoid Androids can be show interesting stuff. Task-number: QTBUG-43109 Change-Id: Ib0ef9e8f6c6fc66e9ea9bfcaf2cd9e33d7469070 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-16 12:44:14 +00:00
qDebug(" temp %d\n", param.index);
reference locals in outer functions by index This makes V4 reference all variables in scopes that are not the global scope by index. The JIT and the interpreter walk up the scope chain to get the correct reference. Variables are only resolved by name for the global scope, if the scope contains an eval statement (as eval can define new variables) and inside with and catch scopes. Change-Id: Ib9f9d1a03d50124130aefd169eeb071533ba3520 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-15 12:36:49 +00:00
} else if (param.isScopedLocal()) {
Replace usage of stdout for debug output by qDebug This way even paranoid Androids can be show interesting stuff. Task-number: QTBUG-43109 Change-Id: Ib0ef9e8f6c6fc66e9ea9bfcaf2cd9e33d7469070 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-16 12:44:14 +00:00
qDebug(" temp %d@%d\n", param.index, param.scope);
Remove the tempRegister from moth by loading/storing values directly. Change-Id: I51982d5852db2e10234620d63c235484c5b8a573 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-13 11:25:23 +00:00
} else {
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_ASSERT(!"INVALID");
Remove the tempRegister from moth by loading/storing values directly. Change-Id: I51982d5852db2e10234620d63c235484c5b8a573 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-13 11:25:23 +00:00
}
Replace usage of stdout for debug output by qDebug This way even paranoid Androids can be show interesting stuff. Task-number: QTBUG-43109 Change-Id: Ib0ef9e8f6c6fc66e9ea9bfcaf2cd9e33d7469070 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-16 12:44:14 +00:00
return param;
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
}
Fix VALUE/VALUEPTR macros in the interpreter. Change-Id: I04f7625979974809bd62006520f67c5cb2d9c5fd Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-06-03 11:32:51 +00:00
# define VALUE(param) (*VALUEPTR(param))
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
# define VALUEPTR(param) (scopes[traceParam(param).scope] + param.index)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
#else
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
# define VALUE(param) (*VALUEPTR(param))
# define VALUEPTR(param) (scopes[param.scope] + param.index)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
#endif
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
#define STOREVALUE(param, value) { \
QV4::ReturnedValue tmp = (value); \
Smaller performance fixes Move commonly used variables in the ExecutionEngine to the beginning of the struct to increase cache locality. Keep the engine pointer in a register in the interpreter to save one memory load per instruction. Change-Id: If2540c66b62685701511f410aff495c0a20ca694 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-05 15:12:16 +00:00
if (engine->hasException) \
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
goto catchException; \
VALUE(param) = tmp; \
}
Speed up invocation of builtin functions Completely avoid creation of a CallContext for those methods, as we don't need it. Change-Id: Iff1a38fd3c7e846df6ec0374cb7b3fb8f1b4de3a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-05 17:48:20 +00:00
// qv4scopedvalue_p.h also defines a CHECK_EXCEPTION macro
#ifdef CHECK_EXCEPTION
#undef CHECK_EXCEPTION
#endif
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
#define CHECK_EXCEPTION \
Smaller performance fixes Move commonly used variables in the ExecutionEngine to the beginning of the struct to increase cache locality. Keep the engine pointer in a register in the interpreter to save one memory load per instruction. Change-Id: If2540c66b62685701511f410aff495c0a20ca694 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-05 15:12:16 +00:00
if (engine->hasException) \
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
goto catchException
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
Change signature or runtime methods to take an engine pointer This makes a lot more sense in the long term and is the more maintainable solution, once the GC starts moving objects around in memory Change-Id: I8f327c0f5b5b0af38c5fe1a217852ee8c4a5c2fc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-11 15:07:54 +00:00
QV4::ReturnedValue VME::run(ExecutionEngine *engine, const uchar *code
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#ifdef MOTH_THREADED_INTERPRETER
, void ***storeJumpTable
#endif
)
{
Split off 2 builtins into their own instruction. The foreach-iterator-object and foreach-next-property-name now have their own interpreter instructions. Also cleaned up the parameter passing helper methods. Change-Id: I3f375ba29e1ae914e707039b157fa011878b88b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 09:11:05 +00:00
#ifdef DO_TRACE_INSTR
qDebug("Starting VME with context=%p and code=%p", context, code);
#endif // DO_TRACE_INSTR
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
qt_v4ResolvePendingBreakpointsHook();
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#ifdef MOTH_THREADED_INTERPRETER
if (storeJumpTable) {
#define MOTH_INSTR_ADDR(I, FMT) &&op_##I,
static void *jumpTable[] = {
FOR_EACH_MOTH_INSTR(MOTH_INSTR_ADDR)
};
#undef MOTH_INSTR_ADDR
*storeJumpTable = jumpTable;
Move Value::fromBool, ... to a new Primitive class This will simplify finding the remaining direct usages of QV4::Value that need fixing. Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-25 10:24:36 +00:00
return QV4::Primitive::undefinedValue().asReturnedValue();
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
}
#endif
Remove two unused parameters from VME::run() These parameters are not used outside the function itself anymore, so we can safely remove them. Change-Id: I1694481c05a9927fc78a59ffb7fec43a88e85ac8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-06 12:22:36 +00:00
QV4::Value *stack = 0;
unsigned stackSize = 0;
Debugging with V4 Currently missing, but coming in subsequent patches: - evaluating expressions - evaluating breakpoint conditions Change-Id: Ib43f2a3aaa252741ea7ce857a274480feb8741aa Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-16 10:29:47 +00:00
const uchar *exceptionHandler = 0;
Cleanup code that modifies the JS stack Change-Id: Ic043e256c3df984bb06c9a16b86573b0173b19a1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-17 20:07:05 +00:00
QV4::Scope scope(engine);
Rename currentExecutionContext to currentContext Now that the other method is gone, let's use the shorter currentContext Change-Id: I2a6fb3b77f83a1ffdf314ad29081e303d17030ed Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-24 14:18:11 +00:00
QV4::ExecutionContext *context = engine->currentContext;
Cleanup usage of ExecutionEngine::currentContext Change-Id: Ic79d6da162375928ec25871cd0341daeab6483d2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-24 14:16:56 +00:00
engine->current->lineNumber = -1;
Debugging with V4 Currently missing, but coming in subsequent patches: - evaluating expressions - evaluating breakpoint conditions Change-Id: Ib43f2a3aaa252741ea7ce857a274480feb8741aa Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-16 10:29:47 +00:00
#ifdef DO_TRACE_INSTR
qDebug("Starting VME with context=%p and code=%p", context, code);
#endif // DO_TRACE_INSTR
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
// setup lookup scopes
int scopeDepth = 0;
{
Convert ExecutionContext::parent/outer to use a heap object Change-Id: I1b8ee831cfcdd5b1904ce24a341f5a796dce41cf Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-07 04:46:20 +00:00
QV4::Heap::ExecutionContext *scope = context->d();
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
while (scope) {
++scopeDepth;
Convert ExecutionContext::parent/outer to use a heap object Change-Id: I1b8ee831cfcdd5b1904ce24a341f5a796dce41cf Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-07 04:46:20 +00:00
scope = scope->outer;
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
}
}
Add Q_ALLOCA_VAR, Q_ALLOCA_DECLARE and Q_ALLOCA_ASSIGN macros Define Q_ALLOCA_VAR macro to be used instead of #ifdeffing the occurrences of alloca() in case it's not supported. Q_ALLOCA_DECLARE and Q_ALLOCA_ASSIGN macros separate memory allocation from the declaration and RAII. Change-Id: Idc7551642c48a968a44bcade14d84800a3a1270e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-02-04 13:12:54 +00:00
Q_ALLOCA_VAR(QV4::Value*, scopes, sizeof(QV4::Value *)*(2 + 2*scopeDepth));
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
{
Fix endianness in constant handling When running on a big-endian system, we need to convert the constant values into big-endian once and then it's possible to access them directly. Change-Id: I655bad7b7734e3b95e79e5f688f0b4041d0c41c4 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-07-14 18:39:58 +00:00
scopes[0] = const_cast<QV4::Value *>(context->d()->compilationUnit->constants);
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
// stack gets setup in push instruction
scopes[1] = 0;
Convert ExecutionContext::parent/outer to use a heap object Change-Id: I1b8ee831cfcdd5b1904ce24a341f5a796dce41cf Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-07 04:46:20 +00:00
QV4::Heap::ExecutionContext *scope = context->d();
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
int i = 0;
while (scope) {
Convert ExecutionContext::parent/outer to use a heap object Change-Id: I1b8ee831cfcdd5b1904ce24a341f5a796dce41cf Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-07 04:46:20 +00:00
if (scope->type >= QV4::Heap::ExecutionContext::Type_SimpleCallContext) {
QV4::Heap::CallContext *cc = static_cast<QV4::Heap::CallContext *>(scope);
scopes[2*i + 2] = cc->callData->args;
scopes[2*i + 3] = cc->locals;
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
} else {
scopes[2*i + 2] = 0;
scopes[2*i + 3] = 0;
}
++i;
Convert ExecutionContext::parent/outer to use a heap object Change-Id: I1b8ee831cfcdd5b1904ce24a341f5a796dce41cf Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-07 04:46:20 +00:00
scope = scope->outer;
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
}
}
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
for (;;) {
const Instr *genericInstr = reinterpret_cast<const Instr *>(code);
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
#ifdef MOTH_THREADED_INTERPRETER
goto *genericInstr->common.code;
#else
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
switch (genericInstr->common.instructionType) {
#endif
Remove the LoadValue instruction With the constant table this is exactly the same as a move. Also renamed MoveTemp to Move, as it not only moves Temps but also other variables. Change-Id: I1fccc04314661954179d903519adbc39777395e5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 07:17:54 +00:00
MOTH_BEGIN_INSTR(Move)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
VALUE(instr.result) = VALUE(instr.source);
Remove the LoadValue instruction With the constant table this is exactly the same as a move. Also renamed MoveTemp to Move, as it not only moves Temps but also other variables. Change-Id: I1fccc04314661954179d903519adbc39777395e5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 07:17:54 +00:00
MOTH_END_INSTR(Move)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
Add a MoveConst instruction to the interpreter This simplifies and speeds up loading of constants Change-Id: I05b4f7a34abd4ed6416fa800a31debbb28b37104 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-06 12:19:27 +00:00
MOTH_BEGIN_INSTR(MoveConst)
VALUE(instr.result) = instr.source;
MOTH_END_INSTR(MoveConst)
V4: Fix SSA decomposition when no regalloc is used. Add scheduling for moves generated by removing phi nodes by re-using the MoveMapping class from the register allocator. This change applies to both the JIT when no register allocator is used, and the interpreter. Change-Id: I38eac5b13759c7790132d1ef07fa17fcb53187e3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-01 13:45:53 +00:00
MOTH_BEGIN_INSTR(SwapTemps)
qSwap(VALUE(instr.left), VALUE(instr.right));
MOTH_END_INSTR(MoveTemp)
Prospective MSVC build fix It seems LoadString is somehow expanded as a macro, so call the instruction LoadRuntimeString, which is closer to the meaning. Change-Id: I16836b495d29db8cb1af5874762c8e66acb9c529 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-19 09:57:03 +00:00
MOTH_BEGIN_INSTR(LoadRuntimeString)
Ported identifiers in moth to use runtime strings Change-Id: I09f04994a2ebe631b12fa76b77a622711de31926 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-16 14:35:05 +00:00
// TRACE(value, "%s", instr.value.toString(context)->toQString().toUtf8().constData());
Fix run-time string handling with regards to the new heap Changed runtimeStrings to be an array of Heap::String pointers instead of indirect String pointers. Later that member along with other GC related members will go into a managed subclass. Meanwhile the generated code no more loads String pointers directly but just passes the index into the run-time strings to the run-time functions, which in turn will load the heap string into a scoped string. Also replaced the template<T> Value::operator=(T *m) with a non-template overload that takes a Managed *, in order to help the compiler choose the non-template operator=(Heap::Base *) overload. This allows removing a bunch of Value::fromHeapObject calls. Change-Id: I20415c0549d33cca6813441a2495976b66d4c00e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-11-12 15:07:56 +00:00
VALUE(instr.result) = context->d()->compilationUnit->runtimeStrings[instr.stringId];
Prospective MSVC build fix It seems LoadString is somehow expanded as a macro, so call the instruction LoadRuntimeString, which is closer to the meaning. Change-Id: I16836b495d29db8cb1af5874762c8e66acb9c529 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-19 09:57:03 +00:00
MOTH_END_INSTR(LoadRuntimeString)
Ported identifiers in moth to use runtime strings Change-Id: I09f04994a2ebe631b12fa76b77a622711de31926 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-16 14:35:05 +00:00
Get rid of QV4::Function::generatedValues by porting moths' regexps to runtime expressions Change-Id: Iaae3c4855016948952159596d2528fca73341b72 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-16 14:40:21 +00:00
MOTH_BEGIN_INSTR(LoadRegExp)
// TRACE(value, "%s", instr.value.toString(context)->toQString().toUtf8().constData());
Convert ExecutionContext to new storage scheme Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-06 07:23:59 +00:00
VALUE(instr.result) = context->d()->compilationUnit->runtimeRegularExpressions[instr.regExpId];
Get rid of QV4::Function::generatedValues by porting moths' regexps to runtime expressions Change-Id: Iaae3c4855016948952159596d2528fca73341b72 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-08-16 14:40:21 +00:00
MOTH_END_INSTR(LoadRegExp)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(LoadClosure)
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
STOREVALUE(instr.result, engine->runtime.closure(engine, instr.value));
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(LoadClosure)
MOTH_BEGIN_INSTR(LoadName)
Refactor our NaN boxing to be more efficient * Use a unified way to store all Managed objects inside a Value, instead of distinguishing between strings and other objects. * On 64 bit we store pointers as pointers, so accessing them through Scoped<> objects is cheap. This implies that doubles are now stored in a mangled form (xor'ed with a mask). Change-Id: I582e0fb167a62c0c527c6bfa3452550e37944069 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-15 13:46:36 +00:00
TRACE(inline, "property name = %s", runtimeStrings[instr.name]->toQString().toUtf8().constData());
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.getActivationProperty(engine, instr.name));
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(LoadName)
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_BEGIN_INSTR(GetGlobalLookup)
Convert ExecutionContext to new storage scheme Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-06 07:23:59 +00:00
QV4::Lookup *l = context->d()->lookups + instr.index;
Change signature or runtime methods to take an engine pointer This makes a lot more sense in the long term and is the more maintainable solution, once the GC starts moving objects around in memory Change-Id: I8f327c0f5b5b0af38c5fe1a217852ee8c4a5c2fc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-11 15:07:54 +00:00
STOREVALUE(instr.result, l->globalGetter(l, engine));
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_END_INSTR(GetGlobalLookup)
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
MOTH_BEGIN_INSTR(StoreName)
Refactor our NaN boxing to be more efficient * Use a unified way to store all Managed objects inside a Value, instead of distinguishing between strings and other objects. * On 64 bit we store pointers as pointers, so accessing them through Scoped<> objects is cheap. This implies that doubles are now stored in a mangled form (xor'ed with a mask). Change-Id: I582e0fb167a62c0c527c6bfa3452550e37944069 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-15 13:46:36 +00:00
TRACE(inline, "property name = %s", runtimeStrings[instr.name]->toQString().toUtf8().constData());
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
engine->runtime.setActivationProperty(engine, instr.name, VALUE(instr.source));
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
CHECK_EXCEPTION;
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
MOTH_END_INSTR(StoreName)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(LoadElement)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.getElement(engine, VALUE(instr.base), VALUE(instr.index)));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(LoadElement)
Use lookups for get/setElement in the interpreter Significantly speeds up crypto.js Change-Id: Icd3d59bea3fe4427e93e9e10e3526178e8de859c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-31 13:58:14 +00:00
MOTH_BEGIN_INSTR(LoadElementLookup)
Convert ExecutionContext to new storage scheme Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-06 07:23:59 +00:00
QV4::Lookup *l = context->d()->lookups + instr.lookup;
Get rid of most uses of ValueRef Instead pass a const Value & into the functions With our new inheritance structure, we can get rid of ValueRef and instead simply pass a pointer to a Value again. Pointers to Values are safe to use again now, as they are now guaranteed to be in a place where the GC knows about them. Change-Id: I44c606fde764db3993b8128fd6fb781d3a298e53 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2015-01-15 10:36:57 +00:00
STOREVALUE(instr.result, l->indexedGetter(l, VALUE(instr.base), VALUE(instr.index)));
Use lookups for get/setElement in the interpreter Significantly speeds up crypto.js Change-Id: Icd3d59bea3fe4427e93e9e10e3526178e8de859c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-31 13:58:14 +00:00
MOTH_END_INSTR(LoadElementLookup)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(StoreElement)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
engine->runtime.setElement(engine, VALUE(instr.base), VALUE(instr.index), VALUE(instr.source));
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
CHECK_EXCEPTION;
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(StoreElement)
Use lookups for get/setElement in the interpreter Significantly speeds up crypto.js Change-Id: Icd3d59bea3fe4427e93e9e10e3526178e8de859c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-31 13:58:14 +00:00
MOTH_BEGIN_INSTR(StoreElementLookup)
Convert ExecutionContext to new storage scheme Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-06 07:23:59 +00:00
QV4::Lookup *l = context->d()->lookups + instr.lookup;
Get rid of most uses of ValueRef Instead pass a const Value & into the functions With our new inheritance structure, we can get rid of ValueRef and instead simply pass a pointer to a Value again. Pointers to Values are safe to use again now, as they are now guaranteed to be in a place where the GC knows about them. Change-Id: I44c606fde764db3993b8128fd6fb781d3a298e53 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2015-01-15 10:36:57 +00:00
l->indexedSetter(l, VALUE(instr.base), VALUE(instr.index), VALUE(instr.source));
Use lookups for get/setElement in the interpreter Significantly speeds up crypto.js Change-Id: Icd3d59bea3fe4427e93e9e10e3526178e8de859c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-31 13:58:14 +00:00
CHECK_EXCEPTION;
MOTH_END_INSTR(StoreElementLookup)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(LoadProperty)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.getProperty(engine, VALUE(instr.base), instr.name));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(LoadProperty)
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_BEGIN_INSTR(GetLookup)
Convert ExecutionContext to new storage scheme Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-06 07:23:59 +00:00
QV4::Lookup *l = context->d()->lookups + instr.index;
Get rid of most uses of ValueRef Instead pass a const Value & into the functions With our new inheritance structure, we can get rid of ValueRef and instead simply pass a pointer to a Value again. Pointers to Values are safe to use again now, as they are now guaranteed to be in a place where the GC knows about them. Change-Id: I44c606fde764db3993b8128fd6fb781d3a298e53 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2015-01-15 10:36:57 +00:00
STOREVALUE(instr.result, l->getter(l, engine, VALUE(instr.base)));
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_END_INSTR(GetLookup)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(StoreProperty)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
engine->runtime.setProperty(engine, VALUE(instr.base), instr.name, VALUE(instr.source));
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
CHECK_EXCEPTION;
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(StoreProperty)
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_BEGIN_INSTR(SetLookup)
Convert ExecutionContext to new storage scheme Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-06 07:23:59 +00:00
QV4::Lookup *l = context->d()->lookups + instr.index;
Get rid of most uses of ValueRef Instead pass a const Value & into the functions With our new inheritance structure, we can get rid of ValueRef and instead simply pass a pointer to a Value again. Pointers to Values are safe to use again now, as they are now guaranteed to be in a place where the GC knows about them. Change-Id: I44c606fde764db3993b8128fd6fb781d3a298e53 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2015-01-15 10:36:57 +00:00
l->setter(l, engine, VALUE(instr.base), VALUE(instr.source));
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
CHECK_EXCEPTION;
MOTH_END_INSTR(SetLookup)
Implement setting of values to resolved QObject properties After the resolution of a property, we can set it by index at run-time instead of via name resolution. Change-Id: I479599dabe343cf9e6582dcda12291aebfcce418 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-10-28 14:18:31 +00:00
MOTH_BEGIN_INSTR(StoreQObjectProperty)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
engine->runtime.setQmlQObjectProperty(engine, VALUE(instr.base), instr.propertyIndex, VALUE(instr.source));
Implement setting of values to resolved QObject properties After the resolution of a property, we can set it by index at run-time instead of via name resolution. Change-Id: I479599dabe343cf9e6582dcda12291aebfcce418 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-10-28 14:18:31 +00:00
CHECK_EXCEPTION;
MOTH_END_INSTR(StoreQObjectProperty)
Initial support for resolving meta-property access for the scope and context objects at QML compile time This avoids having to do a string lookup for ids and in the import cache at run-time, before we can do a string hash lookup in the property cache. Instead we resolve final properties in the context and scope object at compile time and look them up at run-time using their index instead. The dependencies to these properties are also tracked separately and recorded in the compiled data. This is merely the initial patch. There's a lot left to do, such as having specialized getter and setters for specific property types. Setters are missing altogether right now and will fall back to name lookup. Change-Id: If3cb4e7c9454ef4850a615f0935b311c9395b165 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-10-24 12:51:02 +00:00
MOTH_BEGIN_INSTR(LoadQObjectProperty)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
STOREVALUE(instr.result, engine->runtime.getQmlQObjectProperty(engine, VALUE(instr.base), instr.propertyIndex, instr.captureRequired));
Initial support for resolving meta-property access for the scope and context objects at QML compile time This avoids having to do a string lookup for ids and in the import cache at run-time, before we can do a string hash lookup in the property cache. Instead we resolve final properties in the context and scope object at compile time and look them up at run-time using their index instead. The dependencies to these properties are also tracked separately and recorded in the compiled data. This is merely the initial patch. There's a lot left to do, such as having specialized getter and setters for specific property types. Setters are missing altogether right now and will fall back to name lookup. Change-Id: If3cb4e7c9454ef4850a615f0935b311c9395b165 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-10-24 12:51:02 +00:00
MOTH_END_INSTR(LoadQObjectProperty)
Use the QmlContext to access properties of the scope object Add some runtime methods to access properties of the scope object directly (using the QmlContext), and generate proper code to call those. Change-Id: I0b29357c9a3b9ad53ba568ec6cb763e8ecb10f21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-19 12:18:13 +00:00
MOTH_BEGIN_INSTR(StoreScopeObjectProperty)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
engine->runtime.setQmlScopeObjectProperty(engine, VALUE(instr.base), instr.propertyIndex, VALUE(instr.source));
Use the QmlContext to access properties of the scope object Add some runtime methods to access properties of the scope object directly (using the QmlContext), and generate proper code to call those. Change-Id: I0b29357c9a3b9ad53ba568ec6cb763e8ecb10f21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-19 12:18:13 +00:00
CHECK_EXCEPTION;
MOTH_END_INSTR(StoreScopeObjectProperty)
MOTH_BEGIN_INSTR(LoadScopeObjectProperty)
Fix binding dependencies when used in together with functions When a function called from a binding would access a scope or context property, we would end up registering those dependencies as permanent dependencies in the expression and set m_permanentDependenciesRegistered to true. Then after the binding evaluation itself, we would not end up registering the real binding's permanent dependencies. Change-Id: I3b6c1c181aa064d535362c736b5b2bbc4f576ba9 Done-with: Erik Task-number: QTBUG-54394 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-08-26 14:11:38 +00:00
STOREVALUE(instr.result, engine->runtime.getQmlScopeObjectProperty(engine, VALUE(instr.base), instr.propertyIndex, instr.captureRequired));
Use the QmlContext to access properties of the scope object Add some runtime methods to access properties of the scope object directly (using the QmlContext), and generate proper code to call those. Change-Id: I0b29357c9a3b9ad53ba568ec6cb763e8ecb10f21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-19 12:18:13 +00:00
MOTH_END_INSTR(LoadScopeObjectProperty)
Access context properties through the qml context And get rid of another temp in the IR. Change-Id: I039393e020e5141f1986aee276246c30fd8057f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-22 05:46:32 +00:00
MOTH_BEGIN_INSTR(StoreContextObjectProperty)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
engine->runtime.setQmlContextObjectProperty(engine, VALUE(instr.base), instr.propertyIndex, VALUE(instr.source));
Access context properties through the qml context And get rid of another temp in the IR. Change-Id: I039393e020e5141f1986aee276246c30fd8057f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-22 05:46:32 +00:00
CHECK_EXCEPTION;
MOTH_END_INSTR(StoreContextObjectProperty)
MOTH_BEGIN_INSTR(LoadContextObjectProperty)
Fix binding dependencies when used in together with functions When a function called from a binding would access a scope or context property, we would end up registering those dependencies as permanent dependencies in the expression and set m_permanentDependenciesRegistered to true. Then after the binding evaluation itself, we would not end up registering the real binding's permanent dependencies. Change-Id: I3b6c1c181aa064d535362c736b5b2bbc4f576ba9 Done-with: Erik Task-number: QTBUG-54394 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-08-26 14:11:38 +00:00
STOREVALUE(instr.result, engine->runtime.getQmlContextObjectProperty(engine, VALUE(instr.base), instr.propertyIndex, instr.captureRequired));
Access context properties through the qml context And get rid of another temp in the IR. Change-Id: I039393e020e5141f1986aee276246c30fd8057f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-22 05:46:32 +00:00
MOTH_END_INSTR(LoadContextObjectProperty)
Access the id objects through a specialized runtime method This brings us one step closer to getting rid of the QQmlContextWrapper. Change-Id: Ied57f4c174c2ebd95096310a4ad4c0c28787e7a4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-22 14:33:40 +00:00
MOTH_BEGIN_INSTR(LoadIdObject)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
STOREVALUE(instr.result, engine->runtime.getQmlIdObject(engine, VALUE(instr.base), instr.index));
Access the id objects through a specialized runtime method This brings us one step closer to getting rid of the QQmlContextWrapper. Change-Id: Ied57f4c174c2ebd95096310a4ad4c0c28787e7a4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-22 14:33:40 +00:00
MOTH_END_INSTR(LoadIdObject)
Add support for accelerated property access to QML types and namespace support * Resolve lookups in namespaces at compile time and instruct the SSA optimizer to eliminate reads from the namespace (QQmlTypeWrapper) if possible. For example access to attached properties of types (i.e. MyNameSpace.ListView.isCurrentItem) requires neither reading the namespace nor the type. * Add support for accelerated lookup of attached properties Change-Id: Ib0b66404ed7e70e1d4a46a1ac8218743a4cc8608 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-11-14 23:06:18 +00:00
MOTH_BEGIN_INSTR(LoadAttachedQObjectProperty)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
STOREVALUE(instr.result, engine->runtime.getQmlAttachedProperty(engine, instr.attachedPropertiesId, instr.propertyIndex));
Add support for accelerated property access to QML types and namespace support * Resolve lookups in namespaces at compile time and instruct the SSA optimizer to eliminate reads from the namespace (QQmlTypeWrapper) if possible. For example access to attached properties of types (i.e. MyNameSpace.ListView.isCurrentItem) requires neither reading the namespace nor the type. * Add support for accelerated lookup of attached properties Change-Id: Ib0b66404ed7e70e1d4a46a1ac8218743a4cc8608 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-11-14 23:06:18 +00:00
MOTH_END_INSTR(LoadAttachedQObjectProperty)
Accelerate property lookups for C++-based QObject singletons. Change-Id: Icbdf06a077014db5dd57cba42f84591433ec4196 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-07-23 17:43:38 +00:00
MOTH_BEGIN_INSTR(LoadSingletonQObjectProperty)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
STOREVALUE(instr.result, engine->runtime.getQmlSingletonQObjectProperty(engine, VALUE(instr.base), instr.propertyIndex, instr.captureRequired));
Accelerate property lookups for C++-based QObject singletons. Change-Id: Icbdf06a077014db5dd57cba42f84591433ec4196 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-07-23 17:43:38 +00:00
MOTH_END_INSTR(LoadSingletonQObjectProperty)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(Push)
Add tracing for runtime methods. Change-Id: I540297e83e3e297d0724c3e08e5780eee0d2fac8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:31:02 +00:00
TRACE(inline, "stack size: %u", instr.value);
Add a MemoryManager, which does GC for the interpreter. Todo: - stack walking for MASM - fix all TODOs/FIXMEs and hidden treasures (bugs). Change-Id: I36f8cdc3a545df7287ce1df17b3570a9c017865e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-04 12:40:18 +00:00
stackSize = instr.value;
Cleanup code that modifies the JS stack Change-Id: Ic043e256c3df984bb06c9a16b86573b0173b19a1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-17 20:07:05 +00:00
stack = scope.alloc(stackSize);
Rework parameter handling for moth Get rid of the parameter type, and only store a scope, that is an index into a SafeValue ** array. This significantly speeds up loading and saving of parameters. Change-Id: I185145f1afd0b8cea461c7ca732ada3ebe39c34c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 09:28:04 +00:00
scopes[1] = stack;
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(Push)
Implemented calls in the interpreter. Change-Id: Iafc9b04a1aa39272ab8aac24fb410a23df02a756 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 15:04:29 +00:00
MOTH_BEGIN_INSTR(CallValue)
Refactor our NaN boxing to be more efficient * Use a unified way to store all Managed objects inside a Value, instead of distinguishing between strings and other objects. * On 64 bit we store pointers as pointers, so accessing them through Scoped<> objects is cheap. This implies that doubles are now stored in a mangled form (xor'ed with a mask). Change-Id: I582e0fb167a62c0c527c6bfa3452550e37944069 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-15 13:46:36 +00:00
#if 0 //def DO_TRACE_INSTR
Convert ExecutionContext to new storage scheme Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-06 07:23:59 +00:00
if (Debugging::Debugger *debugger = context->engine()->debugger) {
Rename QQmlJS::VM namespace to QV4 Simplifies writing code against it (less stuff to type). Change-Id: I8ac03ca2519375a204a3245e82c4be4cf1e793eb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-04-19 11:03:42 +00:00
if (QV4::FunctionObject *o = (VALUE(instr.dest)).asFunctionObject()) {
Fix outgoing argument start position. Change-Id: Ie1b86746dc578ce479f5c072e2e1190826a7739c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-29 13:35:18 +00:00
if (Debugging::FunctionDebugInfo *info = debugger->debugInfo(o)) {
QString n = debugger->name(o);
std::cerr << "*** Call to \"" << (n.isNull() ? "<no name>" : qPrintable(n)) << "\" defined @" << info->startLine << ":" << info->startColumn << std::endl;
}
}
}
#endif // DO_TRACE_INSTR
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
callData->argc = instr.argc;
Move Value::fromBool, ... to a new Primitive class This will simplify finding the remaining direct usages of QV4::Value that need fixing. Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-25 10:24:36 +00:00
callData->thisObject = QV4::Primitive::undefinedValue();
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.callValue(engine, VALUE(instr.dest), callData));
Implemented calls in the interpreter. Change-Id: Iafc9b04a1aa39272ab8aac24fb410a23df02a756 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 15:04:29 +00:00
MOTH_END_INSTR(CallValue)
MOTH_BEGIN_INSTR(CallProperty)
Refactor our NaN boxing to be more efficient * Use a unified way to store all Managed objects inside a Value, instead of distinguishing between strings and other objects. * On 64 bit we store pointers as pointers, so accessing them through Scoped<> objects is cheap. This implies that doubles are now stored in a mangled form (xor'ed with a mask). Change-Id: I582e0fb167a62c0c527c6bfa3452550e37944069 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-15 13:46:36 +00:00
TRACE(property name, "%s, args=%u, argc=%u, this=%s", qPrintable(runtimeStrings[instr.name]->toQString()), instr.callData, instr.argc, (VALUE(instr.base)).toString(context)->toQString().toUtf8().constData());
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
callData->argc = instr.argc;
callData->thisObject = VALUE(instr.base);
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.callProperty(engine, instr.name, callData));
Implemented calls in the interpreter. Change-Id: Iafc9b04a1aa39272ab8aac24fb410a23df02a756 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 15:04:29 +00:00
MOTH_END_INSTR(CallProperty)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_BEGIN_INSTR(CallPropertyLookup)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
callData->argc = instr.argc;
callData->thisObject = VALUE(instr.base);
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.callPropertyLookup(engine, instr.lookupIndex, callData));
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_END_INSTR(CallPropertyLookup)
Use the QmlContext to access properties of the scope object Add some runtime methods to access properties of the scope object directly (using the QmlContext), and generate proper code to call those. Change-Id: I0b29357c9a3b9ad53ba568ec6cb763e8ecb10f21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-19 12:18:13 +00:00
MOTH_BEGIN_INSTR(CallScopeObjectProperty)
TRACE(property name, "%s, args=%u, argc=%u, this=%s", qPrintable(runtimeStrings[instr.name]->toQString()), instr.callData, instr.argc, (VALUE(instr.base)).toString(context)->toQString().toUtf8().constData());
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Use the QmlContext to access properties of the scope object Add some runtime methods to access properties of the scope object directly (using the QmlContext), and generate proper code to call those. Change-Id: I0b29357c9a3b9ad53ba568ec6cb763e8ecb10f21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-19 12:18:13 +00:00
callData->argc = instr.argc;
callData->thisObject = VALUE(instr.base);
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.callQmlScopeObjectProperty(engine, instr.index, callData));
Use the QmlContext to access properties of the scope object Add some runtime methods to access properties of the scope object directly (using the QmlContext), and generate proper code to call those. Change-Id: I0b29357c9a3b9ad53ba568ec6cb763e8ecb10f21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-19 12:18:13 +00:00
MOTH_END_INSTR(CallScopeObjectProperty)
Access context properties through the qml context And get rid of another temp in the IR. Change-Id: I039393e020e5141f1986aee276246c30fd8057f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-22 05:46:32 +00:00
MOTH_BEGIN_INSTR(CallContextObjectProperty)
TRACE(property name, "%s, args=%u, argc=%u, this=%s", qPrintable(runtimeStrings[instr.name]->toQString()), instr.callData, instr.argc, (VALUE(instr.base)).toString(context)->toQString().toUtf8().constData());
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Access context properties through the qml context And get rid of another temp in the IR. Change-Id: I039393e020e5141f1986aee276246c30fd8057f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-22 05:46:32 +00:00
callData->argc = instr.argc;
callData->thisObject = VALUE(instr.base);
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.callQmlContextObjectProperty(engine, instr.index, callData));
Access context properties through the qml context And get rid of another temp in the IR. Change-Id: I039393e020e5141f1986aee276246c30fd8057f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-22 05:46:32 +00:00
MOTH_END_INSTR(CallContextObjectProperty)
Fix call expressions with a subscript Call expressions such as foo[bar]() where wrongly converted to a temporary and then called by value. This made the call have the wrong this argument, as the reference was resolved in the assignment to the temporary. Change-Id: Id6044f833dfcf9ee8fa4f9ec0602a929abdc2c48 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 21:39:01 +00:00
MOTH_BEGIN_INSTR(CallElement)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
callData->argc = instr.argc;
callData->thisObject = VALUE(instr.base);
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.callElement(engine, VALUE(instr.index), callData));
reference locals in outer functions by index This makes V4 reference all variables in scopes that are not the global scope by index. The JIT and the interpreter walk up the scope chain to get the correct reference. Variables are only resolved by name for the global scope, if the scope contains an eval statement (as eval can define new variables) and inside with and catch scopes. Change-Id: Ib9f9d1a03d50124130aefd169eeb071533ba3520 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-15 12:36:49 +00:00
MOTH_END_INSTR(CallElement)
Fix call expressions with a subscript Call expressions such as foo[bar]() where wrongly converted to a temporary and then called by value. This made the call have the wrong this argument, as the reference was resolved in the assignment to the temporary. Change-Id: Id6044f833dfcf9ee8fa4f9ec0602a929abdc2c48 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 21:39:01 +00:00
Fix callBuiltinInvalid for the interpreter. Change-Id: Ifde12261a7c66a7b268129d5fae4ae626e16a00f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 12:21:09 +00:00
MOTH_BEGIN_INSTR(CallActivationProperty)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
callData->argc = instr.argc;
Move Value::fromBool, ... to a new Primitive class This will simplify finding the remaining direct usages of QV4::Value that need fixing. Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-25 10:24:36 +00:00
callData->thisObject = QV4::Primitive::undefinedValue();
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.callActivationProperty(engine, instr.name, callData));
Fix callBuiltinInvalid for the interpreter. Change-Id: Ifde12261a7c66a7b268129d5fae4ae626e16a00f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 12:21:09 +00:00
MOTH_END_INSTR(CallActivationProperty)
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_BEGIN_INSTR(CallGlobalLookup)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
callData->argc = instr.argc;
callData->thisObject = QV4::Primitive::undefinedValue();
Start converting Runtime calls to 'vtable' calls The old code was using absolute addressing for calls into methods of the Runtime. This produces non relocatable code, which is bad for caching. So instead, we'll have a table of function pointers for all runtime methods in the ExecutionEngine, and do the runtime calls through that table. Change-Id: I75c04f699ea11c38f742575f9ce264c0c5ad0c96 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 06:58:36 +00:00
STOREVALUE(instr.result, Runtime::method_callGlobalLookup(engine, instr.index, callData));
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_END_INSTR(CallGlobalLookup)
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
MOTH_BEGIN_INSTR(SetExceptionHandler)
QtQml: Fix const correctness in old style casts Found with GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c958364a2e9859 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-03-07 22:35:47 +00:00
exceptionHandler = instr.offset ? ((const uchar *)&instr.offset) + instr.offset : 0;
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
MOTH_END_INSTR(SetExceptionHandler)
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
MOTH_BEGIN_INSTR(CallBuiltinThrow)
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
engine->runtime.throwException(engine, VALUE(instr.arg));
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
CHECK_EXCEPTION;
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
MOTH_END_INSTR(CallBuiltinThrow)
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
MOTH_BEGIN_INSTR(CallBuiltinUnwindException)
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
STOREVALUE(instr.result, engine->runtime.unwindException(engine));
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
MOTH_END_INSTR(CallBuiltinUnwindException)
MOTH_BEGIN_INSTR(CallBuiltinPushCatchScope)
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
engine->runtime.pushCatchScope(static_cast<QV4::NoThrowEngine*>(engine), instr.name);
Rename currentExecutionContext to currentContext Now that the other method is gone, let's use the shorter currentContext Change-Id: I2a6fb3b77f83a1ffdf314ad29081e303d17030ed Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-24 14:18:11 +00:00
context = engine->currentContext;
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
MOTH_END_INSTR(CallBuiltinPushCatchScope)
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
MOTH_BEGIN_INSTR(CallBuiltinPushScope)
V4: check for exceptions after convertThisToObject The method_convertThisToObject method was invalidly tagged as not needing exception checks. As a side-effect method_pushCatchScope and method_popScope are now correctly tagged with a NoThrowEngine. Change-Id: I11d987e62136216a29eadcbd641546311030058f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-23 11:55:30 +00:00
engine->runtime.pushWithScope(VALUE(instr.arg), static_cast<QV4::NoThrowEngine*>(engine));
Rename currentExecutionContext to currentContext Now that the other method is gone, let's use the shorter currentContext Change-Id: I2a6fb3b77f83a1ffdf314ad29081e303d17030ed Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-24 14:18:11 +00:00
context = engine->currentContext;
Return a Heap::Object in Object::prototype() Change-Id: Ice0265ae558ba14497421a5bbf25ee9db76adab5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-27 07:56:03 +00:00
CHECK_EXCEPTION;
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
MOTH_END_INSTR(CallBuiltinPushScope)
MOTH_BEGIN_INSTR(CallBuiltinPopScope)
V4: check for exceptions after convertThisToObject The method_convertThisToObject method was invalidly tagged as not needing exception checks. As a side-effect method_pushCatchScope and method_popScope are now correctly tagged with a NoThrowEngine. Change-Id: I11d987e62136216a29eadcbd641546311030058f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-23 11:55:30 +00:00
engine->runtime.popScope(static_cast<QV4::NoThrowEngine*>(engine));
Rename currentExecutionContext to currentContext Now that the other method is gone, let's use the shorter currentContext Change-Id: I2a6fb3b77f83a1ffdf314ad29081e303d17030ed Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-24 14:18:11 +00:00
context = engine->currentContext;
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
MOTH_END_INSTR(CallBuiltinPopScope)
Added calls to built-ins to moth. Change-Id: I277b1136ed3b073a9fc85726dc714ef68109fbfa Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-25 08:08:22 +00:00
Split off 2 builtins into their own instruction. The foreach-iterator-object and foreach-next-property-name now have their own interpreter instructions. Also cleaned up the parameter passing helper methods. Change-Id: I3f375ba29e1ae914e707039b157fa011878b88b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 09:11:05 +00:00
MOTH_BEGIN_INSTR(CallBuiltinForeachIteratorObject)
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
STOREVALUE(instr.result, engine->runtime.foreachIterator(engine, VALUE(instr.arg)));
Split off 2 builtins into their own instruction. The foreach-iterator-object and foreach-next-property-name now have their own interpreter instructions. Also cleaned up the parameter passing helper methods. Change-Id: I3f375ba29e1ae914e707039b157fa011878b88b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 09:11:05 +00:00
MOTH_END_INSTR(CallBuiltinForeachIteratorObject)
MOTH_BEGIN_INSTR(CallBuiltinForeachNextPropertyName)
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
STOREVALUE(instr.result, engine->runtime.foreachNextPropertyName(VALUE(instr.arg)));
Split off 2 builtins into their own instruction. The foreach-iterator-object and foreach-next-property-name now have their own interpreter instructions. Also cleaned up the parameter passing helper methods. Change-Id: I3f375ba29e1ae914e707039b157fa011878b88b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 09:11:05 +00:00
MOTH_END_INSTR(CallBuiltinForeachNextPropertyName)
Added more builtins to moth. - delete member - delete subscript - delete name - delete value - foreach-iterator-object - foreach-next-property-name Change-Id: I639a3c3a293ea88019e2f69e1f51ce2264a68bcc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-12 13:31:05 +00:00
MOTH_BEGIN_INSTR(CallBuiltinDeleteMember)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.deleteMember(engine, VALUE(instr.base), instr.member));
Added more builtins to moth. - delete member - delete subscript - delete name - delete value - foreach-iterator-object - foreach-next-property-name Change-Id: I639a3c3a293ea88019e2f69e1f51ce2264a68bcc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-12 13:31:05 +00:00
MOTH_END_INSTR(CallBuiltinDeleteMember)
MOTH_BEGIN_INSTR(CallBuiltinDeleteSubscript)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.deleteElement(engine, VALUE(instr.base), VALUE(instr.index)));
Added more builtins to moth. - delete member - delete subscript - delete name - delete value - foreach-iterator-object - foreach-next-property-name Change-Id: I639a3c3a293ea88019e2f69e1f51ce2264a68bcc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-12 13:31:05 +00:00
MOTH_END_INSTR(CallBuiltinDeleteSubscript)
MOTH_BEGIN_INSTR(CallBuiltinDeleteName)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.deleteName(engine, instr.name));
Added more builtins to moth. - delete member - delete subscript - delete name - delete value - foreach-iterator-object - foreach-next-property-name Change-Id: I639a3c3a293ea88019e2f69e1f51ce2264a68bcc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-12 13:31:05 +00:00
MOTH_END_INSTR(CallBuiltinDeleteName)
QML: Fix typeof context property. This was missing from f21e8c641af6b2d10f0d7e7e0fc6a755dab3673c. Task-number: QTBUG-48524 Change-Id: I5cc6a979d965a1ef6b7fbc916a7ca9df868b459a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-27 11:21:00 +00:00
MOTH_BEGIN_INSTR(CallBuiltinTypeofScopeObjectProperty)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.typeofScopeObjectProperty(engine, VALUE(instr.base), instr.index));
QML: Fix typeof context property. This was missing from f21e8c641af6b2d10f0d7e7e0fc6a755dab3673c. Task-number: QTBUG-48524 Change-Id: I5cc6a979d965a1ef6b7fbc916a7ca9df868b459a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-27 11:21:00 +00:00
MOTH_END_INSTR(CallBuiltinTypeofMember)
MOTH_BEGIN_INSTR(CallBuiltinTypeofContextObjectProperty)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.typeofContextObjectProperty(engine, VALUE(instr.base), instr.index));
QML: Fix typeof context property. This was missing from f21e8c641af6b2d10f0d7e7e0fc6a755dab3673c. Task-number: QTBUG-48524 Change-Id: I5cc6a979d965a1ef6b7fbc916a7ca9df868b459a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-27 11:21:00 +00:00
MOTH_END_INSTR(CallBuiltinTypeofMember)
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_BEGIN_INSTR(CallBuiltinTypeofMember)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.typeofMember(engine, VALUE(instr.base), instr.member));
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_END_INSTR(CallBuiltinTypeofMember)
MOTH_BEGIN_INSTR(CallBuiltinTypeofSubscript)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.typeofElement(engine, VALUE(instr.base), VALUE(instr.index)));
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_END_INSTR(CallBuiltinTypeofSubscript)
MOTH_BEGIN_INSTR(CallBuiltinTypeofName)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.typeofName(engine, instr.name));
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_END_INSTR(CallBuiltinTypeofName)
MOTH_BEGIN_INSTR(CallBuiltinTypeofValue)
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.typeofValue(engine, VALUE(instr.value)));
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_END_INSTR(CallBuiltinTypeofValue)
Add more built-ins to the interpreter. Change-Id: I6a1656a8a2042b0a02d6e3bb8e59c9db52f6fd5d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-27 11:17:19 +00:00
MOTH_BEGIN_INSTR(CallBuiltinDeclareVar)
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
engine->runtime.declareVar(engine, instr.isDeletable, instr.varName);
Moved callBuiltin into the common super class. Now the backends do not need to duplicate the tedious switch, but can just implement the specific methods. It also prevents backends from missing out on cases. Change-Id: I45a25c6955af584f60b6e69cf6a616ca3e2dc640 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-16 14:49:42 +00:00
MOTH_END_INSTR(CallBuiltinDeclareVar)
Add more built-ins to the interpreter. Change-Id: I6a1656a8a2042b0a02d6e3bb8e59c9db52f6fd5d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-27 11:17:19 +00:00
More efficient initialization of array literals Initialize array literals in one go instead of going through repeated calls to the runtime for each value. This gives quite a nice speed improvement on the splay tree benchmark. Change-Id: Id5757dd7a910be13db4958da7e449172ec1b04ae Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-03-01 15:47:07 +00:00
MOTH_BEGIN_INSTR(CallBuiltinDefineArray)
Fix off-by-one in assertion for argc/args in calls. When a call is done with 1 argument, it is not copied into the outgoing args array, but passed by-reference. So when it happens to be the last element in the stack frame, then args + argc == stackSize (because argc is 1). Change-Id: Idb769c95e9066c24a9d93cdcc24e13d3a9acc995 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-03-04 08:32:16 +00:00
Q_ASSERT(instr.args + instr.argc <= stackSize);
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
QV4::Value *args = stack + instr.args;
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
STOREVALUE(instr.result, engine->runtime.arrayLiteral(engine, args, instr.argc));
More efficient initialization of array literals Initialize array literals in one go instead of going through repeated calls to the runtime for each value. This gives quite a nice speed improvement on the splay tree benchmark. Change-Id: Id5757dd7a910be13db4958da7e449172ec1b04ae Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-03-01 15:47:07 +00:00
MOTH_END_INSTR(CallBuiltinDefineArray)
Fix properties of literal array initialisers Array entries defined in such a way need to be own properties. To avoid calling builtin_define_property with the integer index converted to a string for each property, this patch also introduces a builtin_define_array_property that takes an integer index instead. Change-Id: Ib21f99a555b3237753a7930a7edc70bfcd49ac18 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-24 11:53:47 +00:00
Speed up object literal construction Define the internal class at compile (isel) time, so that creation of the object at run-time is very fast. Change-Id: Ie153cda695cefde9d7118a7a65f1ff7e78f120cc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-04-23 05:31:02 +00:00
MOTH_BEGIN_INSTR(CallBuiltinDefineObjectLiteral)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
QV4::Value *args = stack + instr.args;
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
STOREVALUE(instr.result, engine->runtime.objectLiteral(engine, args, instr.internalClassId, instr.arrayValueCount, instr.arrayGetterSetterCountAndFlags));
Speed up object literal construction Define the internal class at compile (isel) time, so that creation of the object at run-time is very fast. Change-Id: Ie153cda695cefde9d7118a7a65f1ff7e78f120cc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-04-23 05:31:02 +00:00
MOTH_END_INSTR(CallBuiltinDefineObjectLiteral)
Move arguments object creation into the generated code So far we've been creating the arguments object at runtime in initCallContext(). It's much more efficient to simply add arguments as a local variable in qv4codegen if it's being used and initialize it through a builtin method. Change-Id: I6913f3565adf3aa1917adae8dceef9f50ecf1722 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-16 10:54:30 +00:00
MOTH_BEGIN_INSTR(CallBuiltinSetupArgumentsObject)
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
STOREVALUE(instr.result, engine->runtime.setupArgumentsObject(engine));
Move arguments object creation into the generated code So far we've been creating the arguments object at runtime in initCallContext(). It's much more efficient to simply add arguments as a local variable in qv4codegen if it's being used and initialize it through a builtin method. Change-Id: I6913f3565adf3aa1917adae8dceef9f50ecf1722 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-16 10:54:30 +00:00
MOTH_END_INSTR(CallBuiltinSetupArgumentsObject)
Move conversion of this object into generated code When a non strict mode function uses the this object, we need to make sure it's being correctly converted into a object before being accessed. So far this was being done by ScriptFunction::call. Move this into the generated code to avoid overhead for methods not using 'this', and simplify our ScriptFunction::call() implementation. Change-Id: I739f4a89d29ed8082ce59e48d1523776224fc29d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-11-02 20:10:13 +00:00
MOTH_BEGIN_INSTR(CallBuiltinConvertThisToObject)
Convert second batch of runtime methods Change-Id: I8b85b0398f758026cc8f8359f722c0d7f8544dbb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:23:20 +00:00
engine->runtime.convertThisToObject(engine);
Move conversion of this object into generated code When a non strict mode function uses the this object, we need to make sure it's being correctly converted into a object before being accessed. So far this was being done by ScriptFunction::call. Move this into the generated code to avoid overhead for methods not using 'this', and simplify our ScriptFunction::call() implementation. Change-Id: I739f4a89d29ed8082ce59e48d1523776224fc29d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-11-02 20:10:13 +00:00
CHECK_EXCEPTION;
MOTH_END_INSTR(CallBuiltinConvertThisToObject)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(CreateValue)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
callData->argc = instr.argc;
Move Value::fromBool, ... to a new Primitive class This will simplify finding the remaining direct usages of QV4::Value that need fixing. Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-25 10:24:36 +00:00
callData->thisObject = QV4::Primitive::undefinedValue();
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.constructValue(engine, VALUE(instr.func), callData));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(CreateValue)
MOTH_BEGIN_INSTR(CreateProperty)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
callData->argc = instr.argc;
Use lookups for create_property (ie. new foo.bar) This is not used that often, but it removes one more place where we do lookups by name. Change-Id: I9f798b8b4a64be3fdf3e53090e4288724c9d2b22 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-11-13 10:45:51 +00:00
callData->thisObject = VALUE(instr.base);
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.constructProperty(engine, instr.name, callData));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(CreateProperty)
Use lookups for create_property (ie. new foo.bar) This is not used that often, but it removes one more place where we do lookups by name. Change-Id: I9f798b8b4a64be3fdf3e53090e4288724c9d2b22 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-11-13 10:45:51 +00:00
MOTH_BEGIN_INSTR(ConstructPropertyLookup)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Use lookups for create_property (ie. new foo.bar) This is not used that often, but it removes one more place where we do lookups by name. Change-Id: I9f798b8b4a64be3fdf3e53090e4288724c9d2b22 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-11-13 10:45:51 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Use lookups for create_property (ie. new foo.bar) This is not used that often, but it removes one more place where we do lookups by name. Change-Id: I9f798b8b4a64be3fdf3e53090e4288724c9d2b22 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-11-13 10:45:51 +00:00
callData->argc = instr.argc;
callData->thisObject = VALUE(instr.base);
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.constructPropertyLookup(engine, instr.index, callData));
Use lookups for create_property (ie. new foo.bar) This is not used that often, but it removes one more place where we do lookups by name. Change-Id: I9f798b8b4a64be3fdf3e53090e4288724c9d2b22 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-11-13 10:45:51 +00:00
MOTH_END_INSTR(ConstructPropertyLookup)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(CreateActivationProperty)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Generate CallData structures directly in the instruction selection Like this we can hand the CallData through the runtime methods without any need to modify them. This simplifies the code in there, and should also speed them up to some degree. Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-05 12:49:55 +00:00
callData->argc = instr.argc;
Move Value::fromBool, ... to a new Primitive class This will simplify finding the remaining direct usages of QV4::Value that need fixing. Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-25 10:24:36 +00:00
callData->thisObject = QV4::Primitive::undefinedValue();
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.constructActivationProperty(engine, instr.name, callData));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(CreateActivationProperty)
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_BEGIN_INSTR(ConstructGlobalLookup)
Cleanups Remove SafeValue, it was used to port over to an exact GC. Since we now have that, we can now safely merge it with QV4::Value again. Also rename SafeString to StringValue for better naming consistency. Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 21:55:39 +00:00
Q_ASSERT(instr.callData + instr.argc + qOffsetOf(QV4::CallData, args)/sizeof(QV4::Value) <= stackSize);
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
QV4::CallData *callData = reinterpret_cast<QV4::CallData *>(stack + instr.callData);
V4: Free up 2 address bits in 64bit mode This allows for the OS to use 49 address bits. It also maps JS Undefined to the C++ nullptr on 64bit. Task-number: QTBUG-54822 Change-Id: I7cc90620f499be1506a61aac77d72d067308838c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-23 09:34:12 +00:00
callData->tag = QV4::Value::Integer_Type_Internal;
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
callData->argc = instr.argc;
callData->thisObject = QV4::Primitive::undefinedValue();
Convert the first batch of runtime functions Convert them to the new calling convention through function pointers in the execution engine. Change-Id: Iecc54c9512f7231a04eb1659490a5d56118ff66a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:16:42 +00:00
STOREVALUE(instr.result, engine->runtime.constructGlobalLookup(engine, instr.index, callData));
Use lookups in the interpreter Implement lookup calls for the interpreter. This significantly reduces overhead by avoiding repeated name lookups on the same object type. This doubles the speed of quite a few of the v8 benchmarks, and brings the interpreter up to close to 40% of the speed of the JIT. Change-Id: Ie8c2f5b1ca71a7329bc643c3d2158a6301a392ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-10 09:51:42 +00:00
MOTH_END_INSTR(ConstructGlobalLookup)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(Jump)
QtQml: Fix const correctness in old style casts Found with GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c958364a2e9859 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-03-07 22:35:47 +00:00
code = ((const uchar *)&instr.offset) + instr.offset;
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(Jump)
Specialize CJump into JumpEq and JumpNe This avoids the bool invert in the instruction stream, and some additional code in the VME. Change-Id: I0ea675a2e3d07c1b8c5234b888d8d9683bcee330 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-06 14:05:35 +00:00
MOTH_BEGIN_INSTR(JumpEq)
bool cond = VALUEPTR(instr.condition)->toBoolean();
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
TRACE(condition, "%s", cond ? "TRUE" : "FALSE");
if (cond)
QtQml: Fix const correctness in old style casts Found with GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c958364a2e9859 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-03-07 22:35:47 +00:00
code = ((const uchar *)&instr.offset) + instr.offset;
Specialize CJump into JumpEq and JumpNe This avoids the bool invert in the instruction stream, and some additional code in the VME. Change-Id: I0ea675a2e3d07c1b8c5234b888d8d9683bcee330 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-06 14:05:35 +00:00
MOTH_END_INSTR(JumpEq)
MOTH_BEGIN_INSTR(JumpNe)
bool cond = VALUEPTR(instr.condition)->toBoolean();
TRACE(condition, "%s", cond ? "TRUE" : "FALSE");
if (!cond)
QtQml: Fix const correctness in old style casts Found with GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c958364a2e9859 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-03-07 22:35:47 +00:00
code = ((const uchar *)&instr.offset) + instr.offset;
Specialize CJump into JumpEq and JumpNe This avoids the bool invert in the instruction stream, and some additional code in the VME. Change-Id: I0ea675a2e3d07c1b8c5234b888d8d9683bcee330 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-06 14:05:35 +00:00
MOTH_END_INSTR(JumpNe)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
Inline unary operations in moth Change-Id: I6e141a425c2b4cc0cd64c7f0011e7028b9147f69 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 11:53:05 +00:00
MOTH_BEGIN_INSTR(UNot)
Convert unary operations to new calling convention Change-Id: I629e336ec41f46390b7ed9f9365a832e1722b61a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:41:49 +00:00
STOREVALUE(instr.result, engine->runtime.uNot(VALUE(instr.source)));
Inline unary operations in moth Change-Id: I6e141a425c2b4cc0cd64c7f0011e7028b9147f69 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 11:53:05 +00:00
MOTH_END_INSTR(UNot)
Optimize some unops and binops for moth Optimize unops for ints/bools and add some special binops where one side is constant. Change-Id: I4f5639e36458560e5614371733abaafd94909ab1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 15:06:43 +00:00
MOTH_BEGIN_INSTR(UNotBool)
bool b = VALUE(instr.source).booleanValue();
VALUE(instr.result) = QV4::Encode(!b);
MOTH_END_INSTR(UNotBool)
Inline unary operations in moth Change-Id: I6e141a425c2b4cc0cd64c7f0011e7028b9147f69 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 11:53:05 +00:00
MOTH_BEGIN_INSTR(UPlus)
Convert unary operations to new calling convention Change-Id: I629e336ec41f46390b7ed9f9365a832e1722b61a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:41:49 +00:00
STOREVALUE(instr.result, engine->runtime.uPlus(VALUE(instr.source)));
Inline unary operations in moth Change-Id: I6e141a425c2b4cc0cd64c7f0011e7028b9147f69 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 11:53:05 +00:00
MOTH_END_INSTR(UPlus)
MOTH_BEGIN_INSTR(UMinus)
Convert unary operations to new calling convention Change-Id: I629e336ec41f46390b7ed9f9365a832e1722b61a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:41:49 +00:00
STOREVALUE(instr.result, engine->runtime.uMinus(VALUE(instr.source)));
Inline unary operations in moth Change-Id: I6e141a425c2b4cc0cd64c7f0011e7028b9147f69 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 11:53:05 +00:00
MOTH_END_INSTR(UMinus)
MOTH_BEGIN_INSTR(UCompl)
Convert unary operations to new calling convention Change-Id: I629e336ec41f46390b7ed9f9365a832e1722b61a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:41:49 +00:00
STOREVALUE(instr.result, engine->runtime.complement(VALUE(instr.source)));
Inline unary operations in moth Change-Id: I6e141a425c2b4cc0cd64c7f0011e7028b9147f69 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 11:53:05 +00:00
MOTH_END_INSTR(UCompl)
Optimize some unops and binops for moth Optimize unops for ints/bools and add some special binops where one side is constant. Change-Id: I4f5639e36458560e5614371733abaafd94909ab1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 15:06:43 +00:00
MOTH_BEGIN_INSTR(UComplInt)
VALUE(instr.result) = QV4::Encode((int)~VALUE(instr.source).integerValue());
MOTH_END_INSTR(UComplInt)
Inline unary operations in moth Change-Id: I6e141a425c2b4cc0cd64c7f0011e7028b9147f69 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 11:53:05 +00:00
MOTH_BEGIN_INSTR(Increment)
Convert unary operations to new calling convention Change-Id: I629e336ec41f46390b7ed9f9365a832e1722b61a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:41:49 +00:00
STOREVALUE(instr.result, engine->runtime.increment(VALUE(instr.source)));
Inline unary operations in moth Change-Id: I6e141a425c2b4cc0cd64c7f0011e7028b9147f69 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 11:53:05 +00:00
MOTH_END_INSTR(Increment)
MOTH_BEGIN_INSTR(Decrement)
Convert unary operations to new calling convention Change-Id: I629e336ec41f46390b7ed9f9365a832e1722b61a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:41:49 +00:00
STOREVALUE(instr.result, engine->runtime.decrement(VALUE(instr.source)));
Inline unary operations in moth Change-Id: I6e141a425c2b4cc0cd64c7f0011e7028b9147f69 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 11:53:05 +00:00
MOTH_END_INSTR(Decrement)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(Binop)
Make the moth representation relocatable Remove direct use of function pointers in the instructions, and instead index into the array of runtime methods. This requires some rather ugly casting to retrieve the method. Change-Id: I5dee8b49dbd7adbfb89a9cc33cbbda8fa53325ce Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-12 12:37:37 +00:00
QV4::Runtime::BinaryOperation op = *reinterpret_cast<QV4::Runtime::BinaryOperation *>(reinterpret_cast<char *>(&engine->runtime) + instr.alu);
STOREVALUE(instr.result, op(VALUE(instr.lhs), VALUE(instr.rhs)));
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(Binop)
Moth: Inline a couple of binops This gives another 10-15% for v8-bench Change-Id: Iaea90402179813af23008c35d344fa7f5353cf5f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 14:28:17 +00:00
MOTH_BEGIN_INSTR(Add)
Convert the remaining runtime methods to new calling convention Change-Id: I88ad3ca430508617d527715aa85ae8474ab7c621 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 08:26:00 +00:00
STOREVALUE(instr.result, engine->runtime.add(engine, VALUE(instr.lhs), VALUE(instr.rhs)));
Moth: Inline a couple of binops This gives another 10-15% for v8-bench Change-Id: Iaea90402179813af23008c35d344fa7f5353cf5f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 14:28:17 +00:00
MOTH_END_INSTR(Add)
MOTH_BEGIN_INSTR(BitAnd)
Convert the remaining runtime methods to new calling convention Change-Id: I88ad3ca430508617d527715aa85ae8474ab7c621 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 08:26:00 +00:00
STOREVALUE(instr.result, engine->runtime.bitAnd(VALUE(instr.lhs), VALUE(instr.rhs)));
Moth: Inline a couple of binops This gives another 10-15% for v8-bench Change-Id: Iaea90402179813af23008c35d344fa7f5353cf5f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 14:28:17 +00:00
MOTH_END_INSTR(BitAnd)
MOTH_BEGIN_INSTR(BitOr)
Convert the remaining runtime methods to new calling convention Change-Id: I88ad3ca430508617d527715aa85ae8474ab7c621 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 08:26:00 +00:00
STOREVALUE(instr.result, engine->runtime.bitOr(VALUE(instr.lhs), VALUE(instr.rhs)));
Moth: Inline a couple of binops This gives another 10-15% for v8-bench Change-Id: Iaea90402179813af23008c35d344fa7f5353cf5f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 14:28:17 +00:00
MOTH_END_INSTR(BitOr)
MOTH_BEGIN_INSTR(BitXor)
Convert the remaining runtime methods to new calling convention Change-Id: I88ad3ca430508617d527715aa85ae8474ab7c621 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 08:26:00 +00:00
STOREVALUE(instr.result, engine->runtime.bitXor(VALUE(instr.lhs), VALUE(instr.rhs)));
Moth: Inline a couple of binops This gives another 10-15% for v8-bench Change-Id: Iaea90402179813af23008c35d344fa7f5353cf5f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 14:28:17 +00:00
MOTH_END_INSTR(BitXor)
Add specialized instructions for right and left shift These give a measurable speedup as the critical code paths are now inline. Change-Id: I3cee8a432fbe96d66ba1e6bd277a38e624a50c14 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-06 13:56:32 +00:00
MOTH_BEGIN_INSTR(Shr)
STOREVALUE(instr.result, QV4::Encode((int)(VALUEPTR(instr.lhs)->toInt32() >> (VALUEPTR(instr.rhs)->toInt32() & 0x1f))));
MOTH_END_INSTR(Shr)
MOTH_BEGIN_INSTR(Shl)
STOREVALUE(instr.result, QV4::Encode((int)(VALUEPTR(instr.lhs)->toInt32() << (VALUEPTR(instr.rhs)->toInt32() & 0x1f))));
MOTH_END_INSTR(Shl)
Optimize some unops and binops for moth Optimize unops for ints/bools and add some special binops where one side is constant. Change-Id: I4f5639e36458560e5614371733abaafd94909ab1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 15:06:43 +00:00
MOTH_BEGIN_INSTR(BitAndConst)
int lhs = VALUEPTR(instr.lhs)->toInt32();
STOREVALUE(instr.result, QV4::Encode((int)(lhs & instr.rhs)));
MOTH_END_INSTR(BitAnd)
MOTH_BEGIN_INSTR(BitOrConst)
int lhs = VALUEPTR(instr.lhs)->toInt32();
STOREVALUE(instr.result, QV4::Encode((int)(lhs | instr.rhs)));
MOTH_END_INSTR(BitOr)
MOTH_BEGIN_INSTR(BitXorConst)
int lhs = VALUEPTR(instr.lhs)->toInt32();
STOREVALUE(instr.result, QV4::Encode((int)(lhs ^ instr.rhs)));
MOTH_END_INSTR(BitXor)
Add specialized instructions for right and left shift These give a measurable speedup as the critical code paths are now inline. Change-Id: I3cee8a432fbe96d66ba1e6bd277a38e624a50c14 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-06 13:56:32 +00:00
MOTH_BEGIN_INSTR(ShrConst)
STOREVALUE(instr.result, QV4::Encode((int)(VALUEPTR(instr.lhs)->toInt32() >> instr.rhs)));
MOTH_END_INSTR(ShrConst)
MOTH_BEGIN_INSTR(ShlConst)
STOREVALUE(instr.result, QV4::Encode((int)(VALUEPTR(instr.lhs)->toInt32() << instr.rhs)));
MOTH_END_INSTR(ShlConst)
Moth: Inline a couple of binops This gives another 10-15% for v8-bench Change-Id: Iaea90402179813af23008c35d344fa7f5353cf5f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 14:28:17 +00:00
MOTH_BEGIN_INSTR(Mul)
Convert the remaining runtime methods to new calling convention Change-Id: I88ad3ca430508617d527715aa85ae8474ab7c621 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 08:26:00 +00:00
STOREVALUE(instr.result, engine->runtime.mul(VALUE(instr.lhs), VALUE(instr.rhs)));
Moth: Inline a couple of binops This gives another 10-15% for v8-bench Change-Id: Iaea90402179813af23008c35d344fa7f5353cf5f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 14:28:17 +00:00
MOTH_END_INSTR(Mul)
MOTH_BEGIN_INSTR(Sub)
Convert the remaining runtime methods to new calling convention Change-Id: I88ad3ca430508617d527715aa85ae8474ab7c621 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 08:26:00 +00:00
STOREVALUE(instr.result, engine->runtime.sub(VALUE(instr.lhs), VALUE(instr.rhs)));
Moth: Inline a couple of binops This gives another 10-15% for v8-bench Change-Id: Iaea90402179813af23008c35d344fa7f5353cf5f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-29 14:28:17 +00:00
MOTH_END_INSTR(Sub)
Remove context argument from most binops Change-Id: I4fa2636f1b2c8e8426b64d6e16bc7c223e6f327a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-05 21:41:42 +00:00
MOTH_BEGIN_INSTR(BinopContext)
Make the moth representation relocatable Remove direct use of function pointers in the instructions, and instead index into the array of runtime methods. This requires some rather ugly casting to retrieve the method. Change-Id: I5dee8b49dbd7adbfb89a9cc33cbbda8fa53325ce Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-12 12:37:37 +00:00
QV4::Runtime::BinaryOperationContext op = *reinterpret_cast<QV4::Runtime::BinaryOperationContext *>(reinterpret_cast<char *>(&engine->runtime) + instr.alu);
STOREVALUE(instr.result, op(engine, VALUE(instr.lhs), VALUE(instr.rhs)));
Remove context argument from most binops Change-Id: I4fa2636f1b2c8e8426b64d6e16bc7c223e6f327a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-05 21:41:42 +00:00
MOTH_END_INSTR(BinopContext)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(Ret)
Add utility function to print stack traces from lldb/gdb. Change-Id: I81315a1cd6900dbecfc9a39d9dc4256461163921 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-04 09:31:31 +00:00
// TRACE(Ret, "returning value %s", result.toString(context)->toQString().toUtf8().constData());
remove more uses of QV4::Value Change-Id: I11b0b2b7626297e2c98dc77784574da4b59ba8cf Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-09-27 14:15:38 +00:00
return VALUE(instr.result).asReturnedValue();
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(Ret)
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
V4: Leave out Debug and Line istructions on -no-qml-debug Change-Id: Ida861af5636a1605783f7af4bf88cb46b44f9022 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-07-25 13:58:04 +00:00
#ifndef QT_NO_QML_DEBUGGER
Add a special Debug instruction to the interpreter and use it This avoid having to check for the debugger at every instruction we execute. Instead we only add debug instructions at the beginning of every line and every basic block when we have a debugger. This still allows interrupting the JS execution at any time (as we can't loop inside a basic block), and single stepping through lines. But it has no overhead when the debugger is not running and a lot less when it is running. Change-Id: Ib17170b42944b608fc6caa1891082205dd2b2763 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-05 13:38:03 +00:00
MOTH_BEGIN_INSTR(Debug)
Cleanup usage of ExecutionEngine::currentContext Change-Id: Ic79d6da162375928ec25871cd0341daeab6483d2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-24 14:16:56 +00:00
engine->current->lineNumber = instr.lineNumber;
V4: Make ExecutionEngine's debugger and profiler private This will allow us to #define them away on -no-qml-debug, saving two pointers per engine. Change-Id: I400cffd32cd7f55ff0e68565734b6002b9f901d5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-07-25 15:02:45 +00:00
QV4::Debugging::Debugger *debugger = context->engine()->debugger();
Simplify our breakpoint handling Only store a Hash of break points in the debugger, instead of the involved logic that currently adds and removes break points. Add the current line number to the Debug statements in the interpreter, and pass them on to the debugger for checking whether we should really break. This adds a slight additional overhead to running inside the debugger, but greatly simplifies the logic and doesn't require modifying the bytecode anymore. This in turn opens up the possibility to run the debugger on JIT generated code later on. Change-Id: If2a3ae8f8d08b69a3a704cbbe0a84000f917a32e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-03 13:20:54 +00:00
if (debugger && debugger->pauseAtNextOpportunity())
Add a Line instruction to the interpreter This unifies the way we handle line numbers in the JIT and Interpreter. Remove the now unused lineNumberMapping code and data. Change-Id: I1d60b1fbb77e70b531fa73d93410683e84dd1e3c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-03 13:41:31 +00:00
debugger->maybeBreakAtInstruction();
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
if (qt_v4IsDebugging)
qt_v4CheckForBreak(context, scopes, scopeDepth);
Add a Line instruction to the interpreter This unifies the way we handle line numbers in the JIT and Interpreter. Remove the now unused lineNumberMapping code and data. Change-Id: I1d60b1fbb77e70b531fa73d93410683e84dd1e3c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-03 13:41:31 +00:00
MOTH_END_INSTR(Debug)
MOTH_BEGIN_INSTR(Line)
Cleanup usage of ExecutionEngine::currentContext Change-Id: Ic79d6da162375928ec25871cd0341daeab6483d2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-24 14:16:56 +00:00
engine->current->lineNumber = instr.lineNumber;
Initial shot at native Qml-and-C++ debugging This supports a Qt Creator debugging mode that allows to extract combined C++/JS stacktraces and JS variable values by examinining only the stack of the "native" debugger backend. Currently, only simple breakpoints and stepping with GDB is supported, and the setup requires a debug build of Qt(Declarative). Change-Id: I9d73041ee541fa45ed4a977f4deef8ebb0493ff9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2014-12-11 18:14:30 +00:00
if (qt_v4IsDebugging)
qt_v4CheckForBreak(context, scopes, scopeDepth);
Don't MOTH_END_INSTR(Debug) after beginning a Line This probably works because Debug and Line have the same internal structure, but obviously it's fragile. Change-Id: Ia27a769fa560726cec1ab73dee96f7c1e6812db0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-05-22 10:31:44 +00:00
MOTH_END_INSTR(Line)
V4: Leave out Debug and Line istructions on -no-qml-debug Change-Id: Ida861af5636a1605783f7af4bf88cb46b44f9022 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-07-25 13:58:04 +00:00
#endif // QT_NO_QML_DEBUGGER
Add a special Debug instruction to the interpreter and use it This avoid having to check for the debugger at every instruction we execute. Instead we only add debug instructions at the beginning of every line and every basic block when we have a debugger. This still allows interrupting the JS execution at any time (as we can't loop inside a basic block), and single stepping through lines. But it has no overhead when the debugger is not running and a lot less when it is running. Change-Id: Ib17170b42944b608fc6caa1891082205dd2b2763 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-02-05 13:38:03 +00:00
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
MOTH_BEGIN_INSTR(LoadThis)
Cleanups Simplify some code in BooleanObject Simplify access to call arguments and thisObject Change-Id: I2f8e844019bc587385608beb02f05b15f827535c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2015-01-15 20:54:12 +00:00
VALUE(instr.result) = context->thisObject();
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
MOTH_END_INSTR(LoadThis)
Added property activation to the interpreter. Change-Id: Icbc900f8d617c8736a5663d19f5691f336bedb30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 14:06:52 +00:00
Add ability to retrieve and use the QmlContext from our generated code Our generated code (JIT and interpreter) should operate on the QML context to retrieve QML related things. That's better than operating on 4 different temps. So this commit introduces the QML context as a temp in the code we generate for QML. The next commits will move things over to use that context with specialized runtime methods instead of using generic subscript/get calls on the different subobjects. Change-Id: Ia05cf339de9cdd23003f35cf78ede17d2590f8de Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-18 11:12:31 +00:00
MOTH_BEGIN_INSTR(LoadQmlContext)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
VALUE(instr.result) = engine->runtime.getQmlContext(static_cast<QV4::NoThrowEngine*>(engine));
Add ability to retrieve and use the QmlContext from our generated code Our generated code (JIT and interpreter) should operate on the QML context to retrieve QML related things. That's better than operating on 4 different temps. So this commit introduces the QML context as a temp in the code we generate for QML. The next commits will move things over to use that context with specialized runtime methods instead of using generic subscript/get calls on the different subobjects. Change-Id: Ia05cf339de9cdd23003f35cf78ede17d2590f8de Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-06-18 11:12:31 +00:00
MOTH_END_INSTR(LoadQmlContext)
Speed up lookups of imported scripts The QQmlContextData stores the JS objects of imported scripts in a QList<PersistentValue>. Instead of indexing into that list, this patch changes ctxt->importedScripts to be a JavaScript array, that in the IR we can index via subscript. Change-Id: Ie2c35fb5294a20a0b7084bb51d19671a27195fec Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-10-29 10:59:54 +00:00
MOTH_BEGIN_INSTR(LoadQmlImportedScripts)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
VALUE(instr.result) = engine->runtime.getQmlImportedScripts(static_cast<QV4::NoThrowEngine*>(engine));
Speed up lookups of imported scripts The QQmlContextData stores the JS objects of imported scripts in a QList<PersistentValue>. Instead of indexing into that list, this patch changes ctxt->importedScripts to be a JavaScript array, that in the IR we can index via subscript. Change-Id: Ie2c35fb5294a20a0b7084bb51d19671a27195fec Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-10-29 10:59:54 +00:00
MOTH_END_INSTR(LoadQmlImportedScripts)
Implement loading of resolved imported scripts We can resolve the use of names that refer to imported scripts at compile time and load them at run-time by index through context->importedScripts. Change-Id: I681b19e7d68dbf3b9a68af00b4cea2a9254c2d78 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-10-28 16:02:54 +00:00
Initial support for accelerated property access to QML singletons and enums With this patch we determine the meta-object of singletons, propagate it into the IR and load them separately using a dedicated run-time function. In addition enums in singletons and QML types are resolved at compile time. Change-Id: I01ce1288391b476d1c9af669cb2987a44c885703 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-11-02 21:46:25 +00:00
MOTH_BEGIN_INSTR(LoadQmlSingleton)
Convert 3rd batch of runtime methods Change-Id: Idc277fd95d2b397a573631026549da44801109f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-09 07:30:12 +00:00
VALUE(instr.result) = engine->runtime.getQmlSingleton(static_cast<QV4::NoThrowEngine*>(engine), instr.name);
Initial support for accelerated property access to QML singletons and enums With this patch we determine the meta-object of singletons, propagate it into the IR and load them separately using a dedicated run-time function. In addition enums in singletons and QML types are resolved at compile time. Change-Id: I01ce1288391b476d1c9af669cb2987a44c885703 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-11-02 21:46:25 +00:00
MOTH_END_INSTR(LoadQmlSingleton)
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#ifdef MOTH_THREADED_INTERPRETER
// nothing to do
#else
default:
qFatal("QQmlJS::Moth::VME: Internal error - unknown instruction %d", genericInstr->common.instructionType);
break;
}
#endif
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
Q_ASSERT(false);
catchException:
Convert ExecutionContext to new storage scheme Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-05-06 07:23:59 +00:00
Q_ASSERT(context->engine()->hasException);
Cleanup code that modifies the JS stack Change-Id: Ic043e256c3df984bb06c9a16b86573b0173b19a1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-17 20:07:05 +00:00
if (!exceptionHandler)
Implement new exception handling for moth Add the required instructions and check for exceptions in the engine before storing any results. Change-Id: Ibfaf904d659859e8012920270825211ba202c63d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-23 12:03:09 +00:00
return QV4::Encode::undefined();
code = exceptionHandler;
}
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
}
#ifdef MOTH_THREADED_INTERPRETER
void **VME::instructionJumpTable()
{
static void **jumpTable = 0;
if (!jumpTable) {
Implement JavaScript exceptions using C++ exceptions Instead of registering catch handlers with setjmp and throwing JS exceptions with longjmp, they are now thrown and caught as C++ exceptions. This allows for tight interoperability between C++ and JS in the future and allows for clear semantics with regards to cleaning up memory in the engine when throwing exceptions. (destructors are guaranteed to be called, unlike with setjmp/longjmp). The recent unwind table additions allow for the exceptions to be thrown through JIT generated code. Catching the exception is done by re-using the existing IR semantics where the beginning of a try block is marked by registering an exception handler. Execution after the registration continues conditionally, based on the return value of builtin_create_exception_handler. A return value of is 0 the try block(s) are executed. If an exception is thrown during that time, execution resumes at the point where builtin_create_exception_handler returns, but with a return value of 1. If an exception is thrown within the catch handler, the execution resumes again at the same point, but the inCatch IR variable will guide execution straight to the finally block(s), which calls delete_exception_handler. In the JIT as well as the interpreter this is implemented by entering a C++ code section that contains a C++ try {} catch {} block, in which the calling function is called again and continues right at the next instruction (or the interpreter loop is recursively entered). An exception will throw us out of that scope and back into the try {} catch {} wrapper, which can call again into the calling function. The IR guarantees that delete_exception_handler is always called, regardless of how the try or catch blocks are terminated. That is where in the JIT and interpreter we return from the nested function call and return back into the original stack frame, effectively unregistering the catch handler. Further cleanups with regards to the naming and the exception handler stack will come in subsequent patches, this is merely the minimal patch set to change to the new mechanism. This patch set breaks ARM until ARM exception handler tables are implemented. The interpreter changes are based on a patchset from Erik from https://codereview.qt-project.org/#change,45750 Change-Id: I543f2bd37b2186f7e48ffcab177d57b5ce932a0c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-03-01 16:04:21 +00:00
const uchar *code = 0;
Remove two unused parameters from VME::run() These parameters are not used outside the function itself anymore, so we can safely remove them. Change-Id: I1694481c05a9927fc78a59ffb7fec43a88e85ac8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-06 12:22:36 +00:00
VME().run(0, code, &jumpTable);
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
}
return jumpTable;
}
#endif
Change signature or runtime methods to take an engine pointer This makes a lot more sense in the long term and is the more maintainable solution, once the GC starts moving objects around in memory Change-Id: I8f327c0f5b5b0af38c5fe1a217852ee8c4a5c2fc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-11 15:07:54 +00:00
QV4::ReturnedValue VME::exec(ExecutionEngine *engine, const uchar *code)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
{
VME vme;
V4: Make ExecutionEngine's debugger and profiler private This will allow us to #define them away on -no-qml-debug, saving two pointers per engine. Change-Id: I400cffd32cd7f55ff0e68565734b6002b9f901d5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-07-25 15:02:45 +00:00
QV4::Debugging::Debugger *debugger = engine->debugger();
Debugging with V4 Currently missing, but coming in subsequent patches: - evaluating expressions - evaluating breakpoint conditions Change-Id: Ib43f2a3aaa252741ea7ce857a274480feb8741aa Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-16 10:29:47 +00:00
if (debugger)
debugger->enteringFunction();
Change signature or runtime methods to take an engine pointer This makes a lot more sense in the long term and is the more maintainable solution, once the GC starts moving objects around in memory Change-Id: I8f327c0f5b5b0af38c5fe1a217852ee8c4a5c2fc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-11 15:07:54 +00:00
QV4::ReturnedValue retVal = vme.run(engine, code);
Debugging with V4 Currently missing, but coming in subsequent patches: - evaluating expressions - evaluating breakpoint conditions Change-Id: Ib43f2a3aaa252741ea7ce857a274480feb8741aa Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-16 10:29:47 +00:00
if (debugger)
debugger->leavingFunction(retVal);
return retVal;
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
}