From 774dc54c81daae607567489f98d97f316c712cdb Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 14 Apr 2013 22:45:22 +0200 Subject: Remove the context pointer from unary operations Change-Id: Idaf67f719402666e11676983d6bc99952f48a72d Reviewed-by: Simon Hausmann --- src/v4/llvm_runtime.cpp | 8 ++++---- src/v4/moth/qv4vme_moth.cpp | 2 +- src/v4/qv4isel_masm.cpp | 2 +- src/v4/qv4runtime.cpp | 9 ++------- src/v4/qv4runtime.h | 22 +++++++++++----------- 5 files changed, 19 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/v4/llvm_runtime.cpp b/src/v4/llvm_runtime.cpp index d7d4edce6b..629ee4028c 100644 --- a/src/v4/llvm_runtime.cpp +++ b/src/v4/llvm_runtime.cpp @@ -212,22 +212,22 @@ void __qmljs_llvm_in(ExecutionContext *ctx, Value *result, Value *left, Value *r void __qmljs_llvm_uplus(ExecutionContext *ctx, Value *result, const Value *value) { - __qmljs_uplus(ctx, result, *value); + __qmljs_uplus(result, *value); } void __qmljs_llvm_uminus(ExecutionContext *ctx, Value *result, const Value *value) { - __qmljs_uminus(ctx, result, *value); + __qmljs_uminus(result, *value); } void __qmljs_llvm_compl(ExecutionContext *ctx, Value *result, const Value *value) { - __qmljs_compl(ctx, result, *value); + __qmljs_compl(result, *value); } void __qmljs_llvm_not(ExecutionContext *ctx, Value *result, const Value *value) { - __qmljs_not(ctx, result, *value); + __qmljs_not(result, *value); } void __qmljs_llvm_inplace_bit_and_name(ExecutionContext *ctx, String *dest, Value *src) diff --git a/src/v4/moth/qv4vme_moth.cpp b/src/v4/moth/qv4vme_moth.cpp index 7dcf1aabc7..49d3cbac74 100644 --- a/src/v4/moth/qv4vme_moth.cpp +++ b/src/v4/moth/qv4vme_moth.cpp @@ -465,7 +465,7 @@ VM::Value VME::run(QQmlJS::VM::ExecutionContext *context, const uchar *&code, MOTH_END_INSTR(CJump) MOTH_BEGIN_INSTR(Unop) - instr.alu(context, VALUEPTR(instr.result), VALUE(instr.source)); + instr.alu(VALUEPTR(instr.result), VALUE(instr.source)); MOTH_END_INSTR(Unop) MOTH_BEGIN_INSTR(Binop) diff --git a/src/v4/qv4isel_masm.cpp b/src/v4/qv4isel_masm.cpp index 9a05ccbeee..13a3cc111a 100644 --- a/src/v4/qv4isel_masm.cpp +++ b/src/v4/qv4isel_masm.cpp @@ -939,7 +939,7 @@ void InstructionSelection::unop(V4IR::AluOp oper, V4IR::Temp *sourceTemp, V4IR:: } // switch if (op) - _as->generateFunctionCallImp(Assembler::Void, opName, op, Assembler::ContextRegister, Assembler::PointerToValue(targetTemp), + _as->generateFunctionCallImp(Assembler::Void, opName, op, Assembler::PointerToValue(targetTemp), Assembler::Reference(sourceTemp)); } diff --git a/src/v4/qv4runtime.cpp b/src/v4/qv4runtime.cpp index 90fd44db98..955236f8b5 100644 --- a/src/v4/qv4runtime.cpp +++ b/src/v4/qv4runtime.cpp @@ -749,11 +749,6 @@ void __qmljs_set_property_lookup(ExecutionContext *ctx, const Value &object, int } -void __qmljs_get_thisObject(ExecutionContext *ctx, Value *result) -{ - *result = ctx->thisObject; -} - uint __qmljs_equal(const Value &x, const Value &y) { if (x.type() == y.type()) { @@ -1294,7 +1289,7 @@ void __qmljs_builtin_define_getter_setter(ExecutionContext *ctx, const Value &ob pd->setSetter(setter ? setter->asFunctionObject() : 0); } -void __qmljs_increment(ExecutionContext *, Value *result, const Value &value) +void __qmljs_increment(Value *result, const Value &value) { TRACE1(value); @@ -1306,7 +1301,7 @@ void __qmljs_increment(ExecutionContext *, Value *result, const Value &value) } } -void __qmljs_decrement(ExecutionContext *, Value *result, const Value &value) +void __qmljs_decrement(Value *result, const Value &value) { TRACE1(value); diff --git a/src/v4/qv4runtime.h b/src/v4/qv4runtime.h index d5eebfa555..ff34257fcc 100644 --- a/src/v4/qv4runtime.h +++ b/src/v4/qv4runtime.h @@ -192,13 +192,13 @@ Bool __qmljs_equal(const Value &x, const Value &y); Bool __qmljs_strict_equal(const Value &x, const Value &y); // unary operators -typedef void (*UnaryOpName)(ExecutionContext *, Value *, const Value &); -void __qmljs_uplus(ExecutionContext *, Value *result, const Value &value); -void __qmljs_uminus(ExecutionContext *, Value *result, const Value &value); -void __qmljs_compl(ExecutionContext *, Value *result, const Value &value); -void __qmljs_not(ExecutionContext *, Value *result, const Value &value); -void __qmljs_increment(ExecutionContext *, Value *result, const Value &value); -void __qmljs_decrement(ExecutionContext *, Value *result, const Value &value); +typedef void (*UnaryOpName)(Value *, const Value &); +void __qmljs_uplus(Value *result, const Value &value); +void __qmljs_uminus(Value *result, const Value &value); +void __qmljs_compl(Value *result, const Value &value); +void __qmljs_not(Value *result, const Value &value); +void __qmljs_increment(Value *result, const Value &value); +void __qmljs_decrement(Value *result, const Value &value); void __qmljs_delete_subscript(ExecutionContext *ctx, Value *result, const Value &base, const Value &index); void __qmljs_delete_member(ExecutionContext *ctx, Value *result, const Value &base, String *name); @@ -331,7 +331,7 @@ inline Value __qmljs_to_object(ExecutionContext *ctx, const Value &value) } -inline void __qmljs_uplus(ExecutionContext *, Value *result, const Value &value) +inline void __qmljs_uplus(Value *result, const Value &value) { TRACE1(value); @@ -343,7 +343,7 @@ inline void __qmljs_uplus(ExecutionContext *, Value *result, const Value &value) *result = Value::fromDouble(n); } -inline void __qmljs_uminus(ExecutionContext *, Value *result, const Value &value) +inline void __qmljs_uminus(Value *result, const Value &value) { TRACE1(value); @@ -356,7 +356,7 @@ inline void __qmljs_uminus(ExecutionContext *, Value *result, const Value &value } } -inline void __qmljs_compl(ExecutionContext *, Value *result, const Value &value) +inline void __qmljs_compl(Value *result, const Value &value) { TRACE1(value); @@ -369,7 +369,7 @@ inline void __qmljs_compl(ExecutionContext *, Value *result, const Value &value) *result = Value::fromInt32(~n); } -inline void __qmljs_not(ExecutionContext *, Value *result, const Value &value) +inline void __qmljs_not(Value *result, const Value &value) { TRACE1(value); -- cgit v1.2.3