Prepare run-time method calling mechanism for cross-compilation

The current way of encoding the offsetof() of the method_ members in
QV4::Runtime is not portable when cross-compiling from a 64-bit host
(where the offsetof would be calculated on) to a 32-bit target (where
the offset would be different), or vice versa. In preparation for making
this work, this patch first replaces the direct use of the run-time
members with use through a void * and an enum for indexing.  This gives
us some type-safety in some places and will also allow for a translation
of the pointer offset from host pointer indexing to target pointer
indexes.

As a bonus we can avoid going through the engine->runtime indirection in
the interpreter altogether and call the static methods right away.

Task-number: QTBUG-58666
Change-Id: I3cd6459523923a9719408317fa729bca19c2bf3c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 156 insertions, 236 deletions

diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h
index 355b7890b6..2c898a1880 100644
--- a/src/qml/jsruntime/qv4runtimeapi_p.h
+++ b/src/qml/jsruntime/qv4runtimeapi_p.h
@@ -90,256 +90,176 @@ struct ExceptionCheck<void (*)(QV4::NoThrowEngine *, A, B, C)> {
 };
 } // anonymous namespace
 
-#define RUNTIME_METHOD(returnvalue, name, args) \
-    typedef returnvalue (*Method_##name)args; \
-    enum { Method_##name##_NeedsExceptionCheck = ExceptionCheck<Method_##name>::NeedsCheck }; \
-    static returnvalue method_##name args; \
-    const Method_##name name
-
-#define INIT_RUNTIME_METHOD(name) \
-    name(method_##name)
+#define FOR_EACH_RUNTIME_METHOD(F) \
+    /* call */ \
+    F(ReturnedValue, callGlobalLookup, (ExecutionEngine *engine, uint index, CallData *callData)) \
+    F(ReturnedValue, callActivationProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData)) \
+    F(ReturnedValue, callQmlScopeObjectProperty, (ExecutionEngine *engine, int propertyIndex, CallData *callData)) \
+    F(ReturnedValue, callQmlContextObjectProperty, (ExecutionEngine *engine, int propertyIndex, CallData *callData)) \
+    F(ReturnedValue, callProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData)) \
+    F(ReturnedValue, callPropertyLookup, (ExecutionEngine *engine, uint index, CallData *callData)) \
+    F(ReturnedValue, callElement, (ExecutionEngine *engine, const Value &index, CallData *callData)) \
+    F(ReturnedValue, callValue, (ExecutionEngine *engine, const Value &func, CallData *callData)) \
+    \
+    /* construct */ \
+    F(ReturnedValue, constructGlobalLookup, (ExecutionEngine *engine, uint index, CallData *callData)) \
+    F(ReturnedValue, constructActivationProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData)) \
+    F(ReturnedValue, constructProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData)) \
+    F(ReturnedValue, constructPropertyLookup, (ExecutionEngine *engine, uint index, CallData *callData)) \
+    F(ReturnedValue, constructValue, (ExecutionEngine *engine, const Value &func, CallData *callData)) \
+    \
+    /* set & get */ \
+    F(void, setActivationProperty, (ExecutionEngine *engine, int nameIndex, const Value &value)) \
+    F(void, setProperty, (ExecutionEngine *engine, const Value &object, int nameIndex, const Value &value)) \
+    F(void, setElement, (ExecutionEngine *engine, const Value &object, const Value &index, const Value &value)) \
+    F(ReturnedValue, getProperty, (ExecutionEngine *engine, const Value &object, int nameIndex)) \
+    F(ReturnedValue, getActivationProperty, (ExecutionEngine *engine, int nameIndex)) \
+    F(ReturnedValue, getElement, (ExecutionEngine *engine, const Value &object, const Value &index)) \
+    \
+    /* typeof */  \
+    F(ReturnedValue, typeofValue, (ExecutionEngine *engine, const Value &val)) \
+    F(ReturnedValue, typeofName, (ExecutionEngine *engine, int nameIndex)) \
+    F(ReturnedValue, typeofScopeObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex)) \
+    F(ReturnedValue, typeofContextObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex)) \
+    F(ReturnedValue, typeofMember, (ExecutionEngine *engine, const Value &base, int nameIndex)) \
+    F(ReturnedValue, typeofElement, (ExecutionEngine *engine, const Value &base, const Value &index)) \
+    \
+    /* delete */ \
+    F(ReturnedValue, deleteElement, (ExecutionEngine *engine, const Value &base, const Value &index)) \
+    F(ReturnedValue, deleteMember, (ExecutionEngine *engine, const Value &base, int nameIndex)) \
+    F(ReturnedValue, deleteMemberString, (ExecutionEngine *engine, const Value &base, String *name)) \
+    F(ReturnedValue, deleteName, (ExecutionEngine *engine, int nameIndex)) \
+    \
+    /* exceptions & scopes */ \
+    F(void, throwException, (ExecutionEngine *engine, const Value &value)) \
+    F(ReturnedValue, unwindException, (ExecutionEngine *engine)) \
+    F(void, pushWithScope, (const Value &o, NoThrowEngine *engine)) \
+    F(void, pushCatchScope, (NoThrowEngine *engine, int exceptionVarNameIndex)) \
+    F(void, popScope, (NoThrowEngine *engine)) \
+    \
+    /* closures */ \
+    F(ReturnedValue, closure, (ExecutionEngine *engine, int functionId)) \
+    \
+    /* function header */ \
+    F(void, declareVar, (ExecutionEngine *engine, bool deletable, int nameIndex)) \
+    F(ReturnedValue, setupArgumentsObject, (ExecutionEngine *engine)) \
+    F(void, convertThisToObject, (ExecutionEngine *engine)) \
+    \
+    /* literals */ \
+    F(ReturnedValue, arrayLiteral, (ExecutionEngine *engine, Value *values, uint length)) \
+    F(ReturnedValue, objectLiteral, (ExecutionEngine *engine, const Value *args, int classId, int arrayValueCount, int arrayGetterSetterCountAndFlags)) \
+    F(ReturnedValue, regexpLiteral, (ExecutionEngine *engine, int id)) \
+    \
+    /* foreach */ \
+    F(ReturnedValue, foreachIterator, (ExecutionEngine *engine, const Value &in)) \
+    F(ReturnedValue, foreachNextPropertyName, (const Value &foreach_iterator)) \
+    \
+    /* unary operators */ \
+    F(ReturnedValue, uPlus, (const Value &value)) \
+    F(ReturnedValue, uMinus, (const Value &value)) \
+    F(ReturnedValue, uNot, (const Value &value)) \
+    F(ReturnedValue, complement, (const Value &value)) \
+    F(ReturnedValue, increment, (const Value &value)) \
+    F(ReturnedValue, decrement, (const Value &value)) \
+    \
+    /* binary operators */ \
+    F(ReturnedValue, instanceof, (ExecutionEngine *engine, const Value &left, const Value &right)) \
+    F(ReturnedValue, in, (ExecutionEngine *engine, const Value &left, const Value &right)) \
+    F(ReturnedValue, add, (ExecutionEngine *engine, const Value &left, const Value &right)) \
+    F(ReturnedValue, addString, (ExecutionEngine *engine, const Value &left, const Value &right)) \
+    F(ReturnedValue, bitOr, (const Value &left, const Value &right)) \
+    F(ReturnedValue, bitXor, (const Value &left, const Value &right)) \
+    F(ReturnedValue, bitAnd, (const Value &left, const Value &right)) \
+    F(ReturnedValue, sub, (const Value &left, const Value &right)) \
+    F(ReturnedValue, mul, (const Value &left, const Value &right)) \
+    F(ReturnedValue, div, (const Value &left, const Value &right)) \
+    F(ReturnedValue, mod, (const Value &left, const Value &right)) \
+    F(ReturnedValue, shl, (const Value &left, const Value &right)) \
+    F(ReturnedValue, shr, (const Value &left, const Value &right)) \
+    F(ReturnedValue, ushr, (const Value &left, const Value &right)) \
+    F(ReturnedValue, greaterThan, (const Value &left, const Value &right)) \
+    F(ReturnedValue, lessThan, (const Value &left, const Value &right)) \
+    F(ReturnedValue, greaterEqual, (const Value &left, const Value &right)) \
+    F(ReturnedValue, lessEqual, (const Value &left, const Value &right)) \
+    F(ReturnedValue, equal, (const Value &left, const Value &right)) \
+    F(ReturnedValue, notEqual, (const Value &left, const Value &right)) \
+    F(ReturnedValue, strictEqual, (const Value &left, const Value &right)) \
+    F(ReturnedValue, strictNotEqual, (const Value &left, const Value &right)) \
+    \
+    /* comparisons */ \
+    F(Bool, compareGreaterThan, (const Value &l, const Value &r)) \
+    F(Bool, compareLessThan, (const Value &l, const Value &r)) \
+    F(Bool, compareGreaterEqual, (const Value &l, const Value &r)) \
+    F(Bool, compareLessEqual, (const Value &l, const Value &r)) \
+    F(Bool, compareEqual, (const Value &left, const Value &right)) \
+    F(Bool, compareNotEqual, (const Value &left, const Value &right)) \
+    F(Bool, compareStrictEqual, (const Value &left, const Value &right)) \
+    F(Bool, compareStrictNotEqual, (const Value &left, const Value &right)) \
+    \
+    F(Bool, compareInstanceof, (ExecutionEngine *engine, const Value &left, const Value &right)) \
+    F(Bool, compareIn, (ExecutionEngine *engine, const Value &left, const Value &right)) \
+    \
+    /* conversions */ \
+    F(Bool, toBoolean, (const Value &value)) \
+    F(ReturnedValue, toDouble, (const Value &value)) \
+    F(int, toInt, (const Value &value)) \
+    F(int, doubleToInt, (const double &d)) \
+    F(unsigned, toUInt, (const Value &value)) \
+    F(unsigned, doubleToUInt, (const double &d)) \
+    \
+    /* qml */ \
+    F(ReturnedValue, getQmlContext, (NoThrowEngine *engine)) \
+    F(ReturnedValue, getQmlImportedScripts, (NoThrowEngine *engine)) \
+    F(ReturnedValue, getQmlSingleton, (NoThrowEngine *engine, int nameIndex)) \
+    F(ReturnedValue, getQmlAttachedProperty, (ExecutionEngine *engine, int attachedPropertiesId, int propertyIndex)) \
+    F(ReturnedValue, getQmlScopeObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, bool captureRequired)) \
+    F(ReturnedValue, getQmlContextObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, bool captureRequired)) \
+    F(ReturnedValue, getQmlQObjectProperty, (ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired)) \
+    F(ReturnedValue, getQmlSingletonQObjectProperty, (ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired)) \
+    F(ReturnedValue, getQmlIdObject, (ExecutionEngine *engine, const Value &context, uint index)) \
+    \
+    F(void, setQmlScopeObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, const Value &value)) \
+    F(void, setQmlContextObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, const Value &value)) \
+    F(void, setQmlQObjectProperty, (ExecutionEngine *engine, const Value &object, int propertyIndex, const Value &value))
 
 struct Q_QML_PRIVATE_EXPORT Runtime {
     Runtime()
-        : INIT_RUNTIME_METHOD(callGlobalLookup)
-        , INIT_RUNTIME_METHOD(callActivationProperty)
-        , INIT_RUNTIME_METHOD(callQmlScopeObjectProperty)
-        , INIT_RUNTIME_METHOD(callQmlContextObjectProperty)
-        , INIT_RUNTIME_METHOD(callProperty)
-        , INIT_RUNTIME_METHOD(callPropertyLookup)
-        , INIT_RUNTIME_METHOD(callElement)
-        , INIT_RUNTIME_METHOD(callValue)
-        , INIT_RUNTIME_METHOD(constructGlobalLookup)
-        , INIT_RUNTIME_METHOD(constructActivationProperty)
-        , INIT_RUNTIME_METHOD(constructProperty)
-        , INIT_RUNTIME_METHOD(constructPropertyLookup)
-        , INIT_RUNTIME_METHOD(constructValue)
-        , INIT_RUNTIME_METHOD(setActivationProperty)
-        , INIT_RUNTIME_METHOD(setProperty)
-        , INIT_RUNTIME_METHOD(setElement)
-        , INIT_RUNTIME_METHOD(getProperty)
-        , INIT_RUNTIME_METHOD(getActivationProperty)
-        , INIT_RUNTIME_METHOD(getElement)
-        , INIT_RUNTIME_METHOD(typeofValue)
-        , INIT_RUNTIME_METHOD(typeofName)
-        , INIT_RUNTIME_METHOD(typeofScopeObjectProperty)
-        , INIT_RUNTIME_METHOD(typeofContextObjectProperty)
-        , INIT_RUNTIME_METHOD(typeofMember)
-        , INIT_RUNTIME_METHOD(typeofElement)
-        , INIT_RUNTIME_METHOD(deleteElement)
-        , INIT_RUNTIME_METHOD(deleteMember)
-        , INIT_RUNTIME_METHOD(deleteMemberString)
-        , INIT_RUNTIME_METHOD(deleteName)
-        , INIT_RUNTIME_METHOD(throwException)
-        , INIT_RUNTIME_METHOD(unwindException)
-        , INIT_RUNTIME_METHOD(pushWithScope)
-        , INIT_RUNTIME_METHOD(pushCatchScope)
-        , INIT_RUNTIME_METHOD(popScope)
-        , INIT_RUNTIME_METHOD(closure)
-        , INIT_RUNTIME_METHOD(declareVar)
-        , INIT_RUNTIME_METHOD(setupArgumentsObject)
-        , INIT_RUNTIME_METHOD(convertThisToObject)
-        , INIT_RUNTIME_METHOD(arrayLiteral)
-        , INIT_RUNTIME_METHOD(objectLiteral)
-        , INIT_RUNTIME_METHOD(regexpLiteral)
-        , INIT_RUNTIME_METHOD(foreachIterator)
-        , INIT_RUNTIME_METHOD(foreachNextPropertyName)
-        , INIT_RUNTIME_METHOD(uPlus)
-        , INIT_RUNTIME_METHOD(uMinus)
-        , INIT_RUNTIME_METHOD(uNot)
-        , INIT_RUNTIME_METHOD(complement)
-        , INIT_RUNTIME_METHOD(increment)
-        , INIT_RUNTIME_METHOD(decrement)
-        , INIT_RUNTIME_METHOD(instanceof)
-        , INIT_RUNTIME_METHOD(in)
-        , INIT_RUNTIME_METHOD(add)
-        , INIT_RUNTIME_METHOD(addString)
-        , INIT_RUNTIME_METHOD(bitOr)
-        , INIT_RUNTIME_METHOD(bitXor)
-        , INIT_RUNTIME_METHOD(bitAnd)
-        , INIT_RUNTIME_METHOD(sub)
-        , INIT_RUNTIME_METHOD(mul)
-        , INIT_RUNTIME_METHOD(div)
-        , INIT_RUNTIME_METHOD(mod)
-        , INIT_RUNTIME_METHOD(shl)
-        , INIT_RUNTIME_METHOD(shr)
-        , INIT_RUNTIME_METHOD(ushr)
-        , INIT_RUNTIME_METHOD(greaterThan)
-        , INIT_RUNTIME_METHOD(lessThan)
-        , INIT_RUNTIME_METHOD(greaterEqual)
-        , INIT_RUNTIME_METHOD(lessEqual)
-        , INIT_RUNTIME_METHOD(equal)
-        , INIT_RUNTIME_METHOD(notEqual)
-        , INIT_RUNTIME_METHOD(strictEqual)
-        , INIT_RUNTIME_METHOD(strictNotEqual)
-        , INIT_RUNTIME_METHOD(compareGreaterThan)
-        , INIT_RUNTIME_METHOD(compareLessThan)
-        , INIT_RUNTIME_METHOD(compareGreaterEqual)
-        , INIT_RUNTIME_METHOD(compareLessEqual)
-        , INIT_RUNTIME_METHOD(compareEqual)
-        , INIT_RUNTIME_METHOD(compareNotEqual)
-        , INIT_RUNTIME_METHOD(compareStrictEqual)
-        , INIT_RUNTIME_METHOD(compareStrictNotEqual)
-        , INIT_RUNTIME_METHOD(compareInstanceof)
-        , INIT_RUNTIME_METHOD(compareIn)
-        , INIT_RUNTIME_METHOD(toBoolean)
-        , INIT_RUNTIME_METHOD(toDouble)
-        , INIT_RUNTIME_METHOD(toInt)
-        , INIT_RUNTIME_METHOD(doubleToInt)
-        , INIT_RUNTIME_METHOD(toUInt)
-        , INIT_RUNTIME_METHOD(doubleToUInt)
-        , INIT_RUNTIME_METHOD(getQmlContext)
-        , INIT_RUNTIME_METHOD(getQmlImportedScripts)
-        , INIT_RUNTIME_METHOD(getQmlSingleton)
-        , INIT_RUNTIME_METHOD(getQmlAttachedProperty)
-        , INIT_RUNTIME_METHOD(getQmlScopeObjectProperty)
-        , INIT_RUNTIME_METHOD(getQmlContextObjectProperty)
-        , INIT_RUNTIME_METHOD(getQmlQObjectProperty)
-        , INIT_RUNTIME_METHOD(getQmlSingletonQObjectProperty)
-        , INIT_RUNTIME_METHOD(getQmlIdObject)
-        , INIT_RUNTIME_METHOD(setQmlScopeObjectProperty)
-        , INIT_RUNTIME_METHOD(setQmlContextObjectProperty)
-        , INIT_RUNTIME_METHOD(setQmlQObjectProperty)
-    { }
-
-    // call
-    RUNTIME_METHOD(ReturnedValue, callGlobalLookup, (ExecutionEngine *engine, uint index, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, callActivationProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, callQmlScopeObjectProperty, (ExecutionEngine *engine, int propertyIndex, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, callQmlContextObjectProperty, (ExecutionEngine *engine, int propertyIndex, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, callProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, callPropertyLookup, (ExecutionEngine *engine, uint index, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, callElement, (ExecutionEngine *engine, const Value &index, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, callValue, (ExecutionEngine *engine, const Value &func, CallData *callData));
-
-    // construct
-    RUNTIME_METHOD(ReturnedValue, constructGlobalLookup, (ExecutionEngine *engine, uint index, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, constructActivationProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, constructProperty, (ExecutionEngine *engine, int nameIndex, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, constructPropertyLookup, (ExecutionEngine *engine, uint index, CallData *callData));
-    RUNTIME_METHOD(ReturnedValue, constructValue, (ExecutionEngine *engine, const Value &func, CallData *callData));
-
-    // set & get
-    RUNTIME_METHOD(void, setActivationProperty, (ExecutionEngine *engine, int nameIndex, const Value &value));
-    RUNTIME_METHOD(void, setProperty, (ExecutionEngine *engine, const Value &object, int nameIndex, const Value &value));
-    RUNTIME_METHOD(void, setElement, (ExecutionEngine *engine, const Value &object, const Value &index, const Value &value));
-    RUNTIME_METHOD(ReturnedValue, getProperty, (ExecutionEngine *engine, const Value &object, int nameIndex));
-    RUNTIME_METHOD(ReturnedValue, getActivationProperty, (ExecutionEngine *engine, int nameIndex));
-    RUNTIME_METHOD(ReturnedValue, getElement, (ExecutionEngine *engine, const Value &object, const Value &index));
-
-    // typeof
-    RUNTIME_METHOD(ReturnedValue, typeofValue, (ExecutionEngine *engine, const Value &val));
-    RUNTIME_METHOD(ReturnedValue, typeofName, (ExecutionEngine *engine, int nameIndex));
-    RUNTIME_METHOD(ReturnedValue, typeofScopeObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex));
-    RUNTIME_METHOD(ReturnedValue, typeofContextObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex));
-    RUNTIME_METHOD(ReturnedValue, typeofMember, (ExecutionEngine *engine, const Value &base, int nameIndex));
-    RUNTIME_METHOD(ReturnedValue, typeofElement, (ExecutionEngine *engine, const Value &base, const Value &index));
-
-    // delete
-    RUNTIME_METHOD(ReturnedValue, deleteElement, (ExecutionEngine *engine, const Value &base, const Value &index));
-    RUNTIME_METHOD(ReturnedValue, deleteMember, (ExecutionEngine *engine, const Value &base, int nameIndex));
-    RUNTIME_METHOD(ReturnedValue, deleteMemberString, (ExecutionEngine *engine, const Value &base, String *name));
-    RUNTIME_METHOD(ReturnedValue, deleteName, (ExecutionEngine *engine, int nameIndex));
-
-    // exceptions & scopes
-    RUNTIME_METHOD(void, throwException, (ExecutionEngine *engine, const Value &value));
-    RUNTIME_METHOD(ReturnedValue, unwindException, (ExecutionEngine *engine));
-    RUNTIME_METHOD(void, pushWithScope, (const Value &o, NoThrowEngine *engine));
-    RUNTIME_METHOD(void, pushCatchScope, (NoThrowEngine *engine, int exceptionVarNameIndex));
-    RUNTIME_METHOD(void, popScope, (NoThrowEngine *engine));
-
-    // closures
-    RUNTIME_METHOD(ReturnedValue, closure, (ExecutionEngine *engine, int functionId));
+    {
+#define INIT_METHOD(returnvalue, name, args) runtimeMethods[name] = reinterpret_cast<void*>(&method_##name);
+FOR_EACH_RUNTIME_METHOD(INIT_METHOD)
+#undef INIT_METHOD
+    }
 
-    // function header
-    RUNTIME_METHOD(void, declareVar, (ExecutionEngine *engine, bool deletable, int nameIndex));
-    RUNTIME_METHOD(ReturnedValue, setupArgumentsObject, (ExecutionEngine *engine));
-    RUNTIME_METHOD(void, convertThisToObject, (ExecutionEngine *engine));
-
-    // literals
-    RUNTIME_METHOD(ReturnedValue, arrayLiteral, (ExecutionEngine *engine, Value *values, uint length));
-    RUNTIME_METHOD(ReturnedValue, objectLiteral, (ExecutionEngine *engine, const Value *args, int classId, int arrayValueCount, int arrayGetterSetterCountAndFlags));
-    RUNTIME_METHOD(ReturnedValue, regexpLiteral, (ExecutionEngine *engine, int id));
-
-    // foreach
-    RUNTIME_METHOD(ReturnedValue, foreachIterator, (ExecutionEngine *engine, const Value &in));
-    RUNTIME_METHOD(ReturnedValue, foreachNextPropertyName, (const Value &foreach_iterator));
-
-    // unary operators
     typedef ReturnedValue (*UnaryOperation)(const Value &value);
-    RUNTIME_METHOD(ReturnedValue, uPlus, (const Value &value));
-    RUNTIME_METHOD(ReturnedValue, uMinus, (const Value &value));
-    RUNTIME_METHOD(ReturnedValue, uNot, (const Value &value));
-    RUNTIME_METHOD(ReturnedValue, complement, (const Value &value));
-    RUNTIME_METHOD(ReturnedValue, increment, (const Value &value));
-    RUNTIME_METHOD(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);
 
-    RUNTIME_METHOD(ReturnedValue, instanceof, (ExecutionEngine *engine, const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, in, (ExecutionEngine *engine, const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, add, (ExecutionEngine *engine, const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, addString, (ExecutionEngine *engine, const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, bitOr, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, bitXor, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, bitAnd, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, sub, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, mul, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, div, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, mod, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, shl, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, shr, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, ushr, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, greaterThan, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, lessThan, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, greaterEqual, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, lessEqual, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, equal, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, notEqual, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, strictEqual, (const Value &left, const Value &right));
-    RUNTIME_METHOD(ReturnedValue, strictNotEqual, (const Value &left, const Value &right));
-
-    // comparisons
-    RUNTIME_METHOD(Bool, compareGreaterThan, (const Value &l, const Value &r));
-    RUNTIME_METHOD(Bool, compareLessThan, (const Value &l, const Value &r));
-    RUNTIME_METHOD(Bool, compareGreaterEqual, (const Value &l, const Value &r));
-    RUNTIME_METHOD(Bool, compareLessEqual, (const Value &l, const Value &r));
-    RUNTIME_METHOD(Bool, compareEqual, (const Value &left, const Value &right));
-    RUNTIME_METHOD(Bool, compareNotEqual, (const Value &left, const Value &right));
-    RUNTIME_METHOD(Bool, compareStrictEqual, (const Value &left, const Value &right));
-    RUNTIME_METHOD(Bool, compareStrictNotEqual, (const Value &left, const Value &right));
+#define DEFINE_RUNTIME_METHOD_ENUM(returnvalue, name, args) name,
+    enum RuntimeMethods {
+        FOR_EACH_RUNTIME_METHOD(DEFINE_RUNTIME_METHOD_ENUM)
+        RuntimeMethodCount,
+        InvalidRuntimeMethod = RuntimeMethodCount
+    };
+#undef DEFINE_RUNTIME_METHOD_ENUM
 
-    RUNTIME_METHOD(Bool, compareInstanceof, (ExecutionEngine *engine, const Value &left, const Value &right));
-    RUNTIME_METHOD(Bool, compareIn, (ExecutionEngine *engine, const Value &left, const Value &right));
+    void *runtimeMethods[RuntimeMethodCount];
 
-    // conversions
-    RUNTIME_METHOD(Bool, toBoolean, (const Value &value));
-    RUNTIME_METHOD(ReturnedValue, toDouble, (const Value &value));
-    RUNTIME_METHOD(int, toInt, (const Value &value));
-    RUNTIME_METHOD(int, doubleToInt, (const double &d));
-    RUNTIME_METHOD(unsigned, toUInt, (const Value &value));
-    RUNTIME_METHOD(unsigned, doubleToUInt, (const double &d));
+    static uint runtimeMethodOffset(RuntimeMethods method) { return method*QT_POINTER_SIZE; }
 
-    // qml
-    RUNTIME_METHOD(ReturnedValue, getQmlContext, (NoThrowEngine *engine));
-    RUNTIME_METHOD(ReturnedValue, getQmlImportedScripts, (NoThrowEngine *engine));
-    RUNTIME_METHOD(ReturnedValue, getQmlSingleton, (NoThrowEngine *engine, int nameIndex));
-    RUNTIME_METHOD(ReturnedValue, getQmlAttachedProperty, (ExecutionEngine *engine, int attachedPropertiesId, int propertyIndex));
-    RUNTIME_METHOD(ReturnedValue, getQmlScopeObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, bool captureRequired));
-    RUNTIME_METHOD(ReturnedValue, getQmlContextObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, bool captureRequired));
-    RUNTIME_METHOD(ReturnedValue, getQmlQObjectProperty, (ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired));
-    RUNTIME_METHOD(ReturnedValue, getQmlSingletonQObjectProperty, (ExecutionEngine *engine, const Value &object, int propertyIndex, bool captureRequired));
-    RUNTIME_METHOD(ReturnedValue, getQmlIdObject, (ExecutionEngine *engine, const Value &context, uint index));
+#define RUNTIME_METHOD(returnvalue, name, args) \
+    typedef returnvalue (*Method_##name)args; \
+    enum { Method_##name##_NeedsExceptionCheck = ExceptionCheck<Method_##name>::NeedsCheck }; \
+    static returnvalue method_##name args;
+    FOR_EACH_RUNTIME_METHOD(RUNTIME_METHOD)
+#undef RUNTIME_METHOD
 
-    RUNTIME_METHOD(void, setQmlScopeObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, const Value &value));
-    RUNTIME_METHOD(void, setQmlContextObjectProperty, (ExecutionEngine *engine, const Value &context, int propertyIndex, const Value &value));
-    RUNTIME_METHOD(void, setQmlQObjectProperty, (ExecutionEngine *engine, const Value &object, int propertyIndex, const Value &value));
 };
 
-#undef RUNTIME_METHOD
-#undef INIT_RUNTIME_METHOD
+static_assert(std::is_standard_layout<Runtime>::value, "Runtime needs to be standard layout in order for us to be able to use offsetof");
+static_assert(offsetof(Runtime, runtimeMethods) == 0, "JIT expects this to be the first member");
+static_assert(sizeof(Runtime::BinaryOperation) == sizeof(void*), "JIT expects a function pointer to fit into a regular pointer, for cross-compilation offset translation");
+
+#undef FOR_EACH_RUNTIME_METHOD
 
 } // namespace QV4