Ported closure init runtime functions to new calling convention

Change-Id: Icb5765069b296977480d896aacfbd09d64dbdad6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/v4/llvm_runtime.cpp b/src/v4/llvm_runtime.cpp
index 9b1bc11..85cb816 100644 (file)
--- a/src/v4/llvm_runtime.cpp
+++ b/src/v4/llvm_runtime.cpp
@@ -95,7 +95,7 @@ void __qmljs_llvm_init_closure(ExecutionContext *ctx, Value *result,
                                                hasNestedFunctions,
                                                formals, formalCount,
                                                locals, localCount);
-    *result = __qmljs_init_closure(clos, ctx);
+    __qmljs_init_closure(ctx, result, clos);
 }
 
 bool __qmljs_llvm_to_boolean(ExecutionContext *ctx, const Value *value)

diff --git a/src/v4/moth/qv4vme_moth.cpp b/src/v4/moth/qv4vme_moth.cpp
index 9c3901e..3850955 100644 (file)
--- a/src/v4/moth/qv4vme_moth.cpp
+++ b/src/v4/moth/qv4vme_moth.cpp
@@ -172,7 +172,7 @@ VM::Value VME::operator()(QQmlJS::VM::ExecutionContext *context, const uchar *co
     MOTH_END_INSTR(LoadValue)
 
     MOTH_BEGIN_INSTR(LoadClosure)
-        VALUE(instr.result) = __qmljs_init_closure(instr.value, context);
+        __qmljs_init_closure(context, VALUEPTR(instr.result), instr.value);
     MOTH_END_INSTR(LoadClosure)
 
     MOTH_BEGIN_INSTR(LoadName)

diff --git a/src/v4/qmljs_runtime.cpp b/src/v4/qmljs_runtime.cpp
index ad871d6..f41208b 100644 (file)
--- a/src/v4/qmljs_runtime.cpp
+++ b/src/v4/qmljs_runtime.cpp
@@ -114,10 +114,10 @@ QString numberToString(double num, int radix = 10)
 
 extern "C" {
 
-Value __qmljs_init_closure(VM::Function *clos, ExecutionContext *ctx)
+void __qmljs_init_closure(ExecutionContext *ctx, Value *result, VM::Function *clos)
 {
     assert(clos);
-    return Value::fromObject(ctx->engine->newScriptFunction(ctx, clos));
+    *result = Value::fromObject(ctx->engine->newScriptFunction(ctx, clos));
 }
 
 Function *__qmljs_register_function(ExecutionContext *ctx, String *name,

diff --git a/src/v4/qmljs_runtime.h b/src/v4/qmljs_runtime.h
index 98bc2e6..39699d9 100644 (file)
--- a/src/v4/qmljs_runtime.h
+++ b/src/v4/qmljs_runtime.h
@@ -127,7 +127,7 @@ void __qmljs_builtin_define_array_property(Value object, int index, Value val, E
 void __qmljs_builtin_define_getter_setter(Value object, String *name, Value getter, Value setter, ExecutionContext *ctx);
 
 // constructors
-Value __qmljs_init_closure(VM::Function *clos, ExecutionContext *ctx);
+void __qmljs_init_closure(ExecutionContext *ctx, Value *result, VM::Function *clos);
 VM::Function *__qmljs_register_function(ExecutionContext *ctx, String *name,
                                         bool hasDirectEval,
                                         bool usesArgumentsObject, bool isStrict,

diff --git a/src/v4/qv4isel_masm.cpp b/src/v4/qv4isel_masm.cpp
index 19d237f..591de83 100644 (file)
--- a/src/v4/qv4isel_masm.cpp
+++ b/src/v4/qv4isel_masm.cpp
@@ -690,7 +690,7 @@ void InstructionSelection::initClosure(IR::Closure *closure, IR::Temp *target)
 {
     VM::Function *vmFunc = vmFunction(closure->value);
     assert(vmFunc);
-    generateFunctionCall(target, __qmljs_init_closure, Assembler::TrustedImmPtr(vmFunc), Assembler::ContextRegister);
+    generateFunctionCall(Assembler::Void, __qmljs_init_closure, Assembler::ContextRegister, Assembler::PointerToValue(target), Assembler::TrustedImmPtr(vmFunc));
 }
 
 void InstructionSelection::getProperty(IR::Temp *base, const QString &name, IR::Temp *target)