1 files changed, 1 insertions, 435 deletions
diff --git a/src/qml/jsruntime/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h
index b63777e164..a32b3f1663 100644
--- a/src/qml/jsruntime/qv4runtime_p.h
+++ b/src/qml/jsruntime/qv4runtime_p.h
@@ -55,14 +55,11 @@
 #include "qv4context_p.h"
 #include "qv4engine_p.h"
 #include "qv4math_p.h"
-
+#include "qv4runtimeapi_p.h"
 #include <QtCore/qnumeric.h>
 
-
 QT_BEGIN_NAMESPACE
 
-class QQmlAccessors;
-
 #undef QV4_COUNT_RUNTIME_FUNCTIONS
 
 namespace QV4 {
@@ -100,156 +97,6 @@ enum TypeHint {
     STRING_HINT
 };
 
-// This is a trick to tell the code generators that functions taking a NoThrowContext won't
-// throw exceptions and therefore don't need a check after the call.
-
-#ifndef V4_BOOTSTRAP
-struct NoThrowEngine : public ExecutionEngine
-{
-};
-#else
-struct NoThrowEngine;
-#endif
-
-struct Q_QML_PRIVATE_EXPORT Runtime {
-    // call
-    static ReturnedValue callGlobalLookup(ExecutionEngine *engine, uint index, CallData *callData);
-    static ReturnedValue callActivationProperty(ExecutionEngine *engine, int nameIndex, CallData *callData);
-    static ReturnedValue callQmlScopeObjectProperty(ExecutionEngine *engine, int propertyIndex, CallData *callData);
-    static ReturnedValue callQmlContextObjectProperty(ExecutionEngine *engine, int propertyIndex, CallData *callData);
-    static ReturnedValue callProperty(ExecutionEngine *engine, int nameIndex, CallData *callData);
-    static ReturnedValue callPropertyLookup(ExecutionEngine *engine, uint index, CallData *callData);
-    static ReturnedValue callElement(ExecutionEngine *engine, const Value &index, CallData *callData);
-    static ReturnedValue callValue(ExecutionEngine *engine, const Value &func, CallData *callData);
-
-    // construct
-    static ReturnedValue constructGlobalLookup(ExecutionEngine *engine, uint index, CallData *callData);
-    static ReturnedValue constructActivationProperty(ExecutionEngine *engine, int nameIndex, CallData *callData);
-    static ReturnedValue constructProperty(ExecutionEngine *engine, int nameIndex, CallData *callData);
-    static ReturnedValue constructPropertyLookup(ExecutionEngine *engine, uint index, CallData *callData);
-    static ReturnedValue constructValue(ExecutionEngine *engine, const Value &func, CallData *callData);
-
-    // set & get
-    static void setActivationProperty(ExecutionEngine *engine, int nameIndex, const Value &value);
-    static void setProperty(ExecutionEngine *engine, const Value &object, int nameIndex, const Value &value);
-    static void setElement(ExecutionEngine *engine, const Value &object, const Value &index, const Value &value);
-    static ReturnedValue getProperty(ExecutionEngine *engine, const Value &object, int nameIndex);
-    static ReturnedValue getActivationProperty(ExecutionEngine *engine, int nameIndex);
-    static ReturnedValue getElement(ExecutionEngine *engine, const Value &object, const Value &index);
-
-    // typeof
-    static ReturnedValue typeofValue(ExecutionEngine *engine, const Value &val);
-    static ReturnedValue typeofName(ExecutionEngine *engine, int nameIndex);
-    static ReturnedValue typeofScopeObjectProperty(ExecutionEngine *engine, const Value &context, int propertyIndex);
-    static ReturnedValue typeofContextObjectProperty(ExecutionEngine *engine, const Value &context, int propertyIndex);
-    static ReturnedValue typeofMember(ExecutionEngine *engine, const Value &base, int nameIndex);
-    static ReturnedValue typeofElement(ExecutionEngine *engine, const Value &base, const Value &index);
-
-    // delete
-    static ReturnedValue deleteElement(ExecutionEngine *engine, const Value &base, const Value &index);
-    static ReturnedValue deleteMember(ExecutionEngine *engine, const Value &base, int nameIndex);
-    static ReturnedValue deleteMemberString(ExecutionEngine *engine, const Value &base, String *name);
-    static ReturnedValue deleteName(ExecutionEngine *engine, int nameIndex);
-
-    // exceptions & scopes
-    static void throwException(ExecutionEngine *engine, const Value &value);
-    static ReturnedValue unwindException(ExecutionEngine *engine);
-    static void pushWithScope(const Value &o, ExecutionEngine *engine);
-    static void pushCatchScope(NoThrowEngine *engine, int exceptionVarNameIndex);
-    static void popScope(ExecutionEngine *engine);
-
-    // closures
-    static ReturnedValue closure(ExecutionEngine *engine, int functionId);
-
-    // function header
-    static void declareVar(ExecutionEngine *engine, bool deletable, int nameIndex);
-    static ReturnedValue setupArgumentsObject(ExecutionEngine *engine);
-    static void convertThisToObject(ExecutionEngine *engine);
-
-    // literals
-    static ReturnedValue arrayLiteral(ExecutionEngine *engine, Value *values, uint length);
-    static ReturnedValue objectLiteral(ExecutionEngine *engine, const Value *args, int classId, int arrayValueCount, int arrayGetterSetterCountAndFlags);
-    static ReturnedValue regexpLiteral(ExecutionEngine *engine, int id);
-
-    // foreach
-    static ReturnedValue foreachIterator(ExecutionEngine *engine, const Value &in);
-    static ReturnedValue foreachNextPropertyName(const Value &foreach_iterator);
-
-    // unary operators
-    typedef ReturnedValue (*UnaryOperation)(const Value &value);
-    static ReturnedValue uPlus(const Value &value);
-    static ReturnedValue uMinus(const Value &value);
-    static ReturnedValue uNot(const Value &value);
-    static ReturnedValue complement(const Value &value);
-    static ReturnedValue increment(const Value &value);
-    static ReturnedValue decrement(const Value &value);
-
-    // binary operators
-    typedef ReturnedValue (*BinaryOperation)(const Value &left, const Value &right);
-    typedef ReturnedValue (*BinaryOperationContext)(ExecutionEngine *engine, const Value &left, const Value &right);
-
-    static ReturnedValue instanceof(ExecutionEngine *engine, const Value &left, const Value &right);
-    static ReturnedValue in(ExecutionEngine *engine, const Value &left, const Value &right);
-    static ReturnedValue add(ExecutionEngine *engine, const Value &left, const Value &right);
-    static ReturnedValue addString(ExecutionEngine *engine, const Value &left, const Value &right);
-    static ReturnedValue bitOr(const Value &left, const Value &right);
-    static ReturnedValue bitXor(const Value &left, const Value &right);
-    static ReturnedValue bitAnd(const Value &left, const Value &right);
-    static ReturnedValue sub(const Value &left, const Value &right);
-    static ReturnedValue mul(const Value &left, const Value &right);
-    static ReturnedValue div(const Value &left, const Value &right);
-    static ReturnedValue mod(const Value &left, const Value &right);
-    static ReturnedValue shl(const Value &left, const Value &right);
-    static ReturnedValue shr(const Value &left, const Value &right);
-    static ReturnedValue ushr(const Value &left, const Value &right);
-    static ReturnedValue greaterThan(const Value &left, const Value &right);
-    static ReturnedValue lessThan(const Value &left, const Value &right);
-    static ReturnedValue greaterEqual(const Value &left, const Value &right);
-    static ReturnedValue lessEqual(const Value &left, const Value &right);
-    static ReturnedValue equal(const Value &left, const Value &right);
-    static ReturnedValue notEqual(const Value &left, const Value &right);
-    static ReturnedValue strictEqual(const Value &left, const Value &right);
-    static ReturnedValue strictNotEqual(const Value &left, const Value &right);
-
-    // comparisons
-    typedef Bool (*CompareOperation)(const Value &left, const Value &right);
-    static Bool compareGreaterThan(const Value &l, const Value &r);
-    static Bool compareLessThan(const Value &l, const Value &r);
-    static Bool compareGreaterEqual(const Value &l, const Value &r);
-    static Bool compareLessEqual(const Value &l, const Value &r);
-    static Bool compareEqual(const Value &left, const Value &right);
-    static Bool compareNotEqual(const Value &left, const Value &right);
-    static Bool compareStrictEqual(const Value &left, const Value &right);
-    static Bool compareStrictNotEqual(const Value &left, const Value &right);
-
-    typedef Bool (*CompareOperationContext)(ExecutionEngine *engine, const Value &left, const Value &right);
-    static Bool compareInstanceof(ExecutionEngine *engine, const Value &left, const Value &right);
-    static Bool compareIn(ExecutionEngine *engine, const Value &left, const Value &right);
-
-    // conversions
-    static Bool toBoolean(const Value &value);
-    static ReturnedValue toDouble(const Value &value);
-    static int toInt(const Value &value);
-    static int doubleToInt(const double &d);
-    static unsigned toUInt(const Value &value);
-    static unsigned doubleToUInt(const double &d);
-
-    // qml
-    static ReturnedValue getQmlContext(NoThrowEngine *engine);
-    static ReturnedValue getQmlImportedScripts(NoThrowEngine *engine);
-    static ReturnedValue getQmlSingleton(NoThrowEngine *engine, int nameIndex);
-    static ReturnedValue getQmlAttachedProperty(ExecutionEngine *engine, int attachedPropertiesId, int propertyIndex);
-    static ReturnedValue getQmlScopeObjectProperty(ExecutionEngine *engine, const Value &context, int propertyIndex);
-    static ReturnedValue getQmlContextObjectProperty(ExecutionEngine *engine, const Value &context, int propertyIndex);
-    static ReturnedValue getQmlQObjectProperty(ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired);
-    static ReturnedValue getQmlSingletonQObjectProperty(ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired);
-    static ReturnedValue getQmlIdObject(ExecutionEngine *engine, const Value &context, uint index);
-
-    static void setQmlScopeObjectProperty(ExecutionEngine *engine, const Value &context, int propertyIndex, const Value &value);
-    static void setQmlContextObjectProperty(ExecutionEngine *engine, const Value &context, int propertyIndex, const Value &value);
-    static void setQmlQObjectProperty(ExecutionEngine *engine, const Value &object, int propertyIndex, const Value &value);
-};
-
 struct Q_QML_PRIVATE_EXPORT RuntimeHelpers {
     static ReturnedValue objectDefaultValue(const Object *object, int typeHint);
     static ReturnedValue toPrimitive(const Value &value, int typeHint);
@@ -287,287 +134,6 @@ inline double RuntimeHelpers::toNumber(const Value &value)
 {
     return value.toNumber();
 }
-
-inline ReturnedValue Runtime::uPlus(const Value &value)
-{
-    TRACE1(value);
-
-    if (value.isNumber())
-        return value.asReturnedValue();
-    if (value.integerCompatible())
-        return Encode(value.int_32());
-
-    double n = value.toNumberImpl();
-    return Encode(n);
-}
-
-inline ReturnedValue Runtime::uMinus(const Value &value)
-{
-    TRACE1(value);
-
-    // +0 != -0, so we need to convert to double when negating 0
-    if (value.isInteger() && value.integerValue())
-        return Encode(-value.integerValue());
-    else {
-        double n = RuntimeHelpers::toNumber(value);
-        return Encode(-n);
-    }
-}
-
-inline ReturnedValue Runtime::complement(const Value &value)
-{
-    TRACE1(value);
-
-    int n = value.toInt32();
-    return Encode((int)~n);
-}
-
-inline ReturnedValue Runtime::uNot(const Value &value)
-{
-    TRACE1(value);
-
-    bool b = value.toBoolean();
-    return Encode(!b);
-}
-
-// binary operators
-inline ReturnedValue Runtime::bitOr(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    int lval = left.toInt32();
-    int rval = right.toInt32();
-    return Encode(lval | rval);
-}
-
-inline ReturnedValue Runtime::bitXor(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    int lval = left.toInt32();
-    int rval = right.toInt32();
-    return Encode(lval ^ rval);
-}
-
-inline ReturnedValue Runtime::bitAnd(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    int lval = left.toInt32();
-    int rval = right.toInt32();
-    return Encode(lval & rval);
-}
-
-#ifndef V4_BOOTSTRAP
-inline ReturnedValue Runtime::add(ExecutionEngine *engine, const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    if (Q_LIKELY(left.isInteger() && right.isInteger()))
-        return add_int32(left.integerValue(), right.integerValue());
-    if (left.isNumber() && right.isNumber())
-        return Primitive::fromDouble(left.asDouble() + right.asDouble()).asReturnedValue();
-
-    return RuntimeHelpers::addHelper(engine, left, right);
-}
-#endif // V4_BOOTSTRAP
-
-inline ReturnedValue Runtime::sub(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    if (Q_LIKELY(left.isInteger() && right.isInteger()))
-        return sub_int32(left.integerValue(), right.integerValue());
-
-    double lval = left.isNumber() ? left.asDouble() : left.toNumberImpl();
-    double rval = right.isNumber() ? right.asDouble() : right.toNumberImpl();
-
-    return Primitive::fromDouble(lval - rval).asReturnedValue();
-}
-
-inline ReturnedValue Runtime::mul(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    if (Q_LIKELY(left.isInteger() && right.isInteger()))
-        return mul_int32(left.integerValue(), right.integerValue());
-
-    double lval = left.isNumber() ? left.asDouble() : left.toNumberImpl();
-    double rval = right.isNumber() ? right.asDouble() : right.toNumberImpl();
-
-    return Primitive::fromDouble(lval * rval).asReturnedValue();
-}
-
-inline ReturnedValue Runtime::div(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    if (Value::integerCompatible(left, right)) {
-        int lval = left.integerValue();
-        int rval = right.integerValue();
-        if (rval != 0 && (lval % rval == 0))
-            return Encode(int(lval / rval));
-        else
-            return Encode(double(lval) / rval);
-    }
-
-    double lval = left.toNumber();
-    double rval = right.toNumber();
-    return Primitive::fromDouble(lval / rval).asReturnedValue();
-}
-
-inline ReturnedValue Runtime::mod(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    if (Value::integerCompatible(left, right) && right.integerValue() != 0) {
-        int intRes = left.integerValue() % right.integerValue();
-        if (intRes != 0 || left.integerValue() >= 0)
-            return Encode(intRes);
-    }
-
-    double lval = RuntimeHelpers::toNumber(left);
-    double rval = RuntimeHelpers::toNumber(right);
-    return Primitive::fromDouble(std::fmod(lval, rval)).asReturnedValue();
-}
-
-inline ReturnedValue Runtime::shl(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    int lval = left.toInt32();
-    int rval = right.toInt32() & 0x1f;
-    return Encode((int)(lval << rval));
-}
-
-inline ReturnedValue Runtime::shr(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    int lval = left.toInt32();
-    unsigned rval = right.toUInt32() & 0x1f;
-    return Encode((int)(lval >> rval));
-}
-
-inline ReturnedValue Runtime::ushr(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    unsigned lval = left.toUInt32();
-    unsigned rval = right.toUInt32() & 0x1f;
-    uint res = lval >> rval;
-
-    return Encode(res);
-}
-
-inline ReturnedValue Runtime::greaterThan(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    bool r = Runtime::compareGreaterThan(left, right);
-    return Encode(r);
-}
-
-inline ReturnedValue Runtime::lessThan(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    bool r = Runtime::compareLessThan(left, right);
-    return Encode(r);
-}
-
-inline ReturnedValue Runtime::greaterEqual(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    bool r = Runtime::compareGreaterEqual(left, right);
-    return Encode(r);
-}
-
-inline ReturnedValue Runtime::lessEqual(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    bool r = Runtime::compareLessEqual(left, right);
-    return Encode(r);
-}
-
-inline Bool Runtime::compareEqual(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    if (left.rawValue() == right.rawValue())
-        // NaN != NaN
-        return !left.isNaN();
-
-    if (left.type() == right.type()) {
-        if (!left.isManaged())
-            return false;
-        if (left.isString() == right.isString())
-            return left.cast<Managed>()->isEqualTo(right.cast<Managed>());
-    }
-
-    return RuntimeHelpers::equalHelper(left, right);
-}
-
-inline ReturnedValue Runtime::equal(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    bool r = Runtime::compareEqual(left, right);
-    return Encode(r);
-}
-
-inline ReturnedValue Runtime::notEqual(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    bool r = !Runtime::compareEqual(left, right);
-    return Encode(r);
-}
-
-inline ReturnedValue Runtime::strictEqual(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    bool r = RuntimeHelpers::strictEqual(left, right);
-    return Encode(r);
-}
-
-inline ReturnedValue Runtime::strictNotEqual(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    bool r = ! RuntimeHelpers::strictEqual(left, right);
-    return Encode(r);
-}
-
-inline Bool Runtime::compareNotEqual(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    return !Runtime::compareEqual(left, right);
-}
-
-inline Bool Runtime::compareStrictEqual(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    return RuntimeHelpers::strictEqual(left, right);
-}
-
-inline Bool Runtime::compareStrictNotEqual(const Value &left, const Value &right)
-{
-    TRACE2(left, right);
-
-    return ! RuntimeHelpers::strictEqual(left, right);
-}
-
-inline Bool Runtime::toBoolean(const Value &value)
-{
-    return value.toBoolean();
-}
-
 } // namespace QV4
 
 QT_END_NAMESPACE