| Index: src/arm/code-stubs-arm.cc
|
| ===================================================================
|
| --- src/arm/code-stubs-arm.cc (revision 7731)
|
| +++ src/arm/code-stubs-arm.cc (working copy)
|
| @@ -79,7 +79,7 @@
|
|
|
| __ bind(&call_builtin);
|
| __ push(r0);
|
| - __ InvokeBuiltin(Builtins::TO_NUMBER, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::TO_NUMBER, JUMP_FUNCTION);
|
| }
|
|
|
|
|
| @@ -1599,7 +1599,7 @@
|
|
|
| // Call the native; it returns -1 (less), 0 (equal), or 1 (greater)
|
| // tagged as a small integer.
|
| - __ InvokeBuiltin(native, JUMP_JS);
|
| + __ InvokeBuiltin(native, JUMP_FUNCTION);
|
| }
|
|
|
|
|
| @@ -1965,10 +1965,10 @@
|
| __ push(r0);
|
| switch (op_) {
|
| case Token::SUB:
|
| - __ InvokeBuiltin(Builtins::UNARY_MINUS, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::UNARY_MINUS, JUMP_FUNCTION);
|
| break;
|
| case Token::BIT_NOT:
|
| - __ InvokeBuiltin(Builtins::BIT_NOT, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::BIT_NOT, JUMP_FUNCTION);
|
| break;
|
| default:
|
| UNREACHABLE();
|
| @@ -2902,37 +2902,37 @@
|
| GenerateRegisterArgsPush(masm);
|
| switch (op_) {
|
| case Token::ADD:
|
| - __ InvokeBuiltin(Builtins::ADD, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::ADD, JUMP_FUNCTION);
|
| break;
|
| case Token::SUB:
|
| - __ InvokeBuiltin(Builtins::SUB, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::SUB, JUMP_FUNCTION);
|
| break;
|
| case Token::MUL:
|
| - __ InvokeBuiltin(Builtins::MUL, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::MUL, JUMP_FUNCTION);
|
| break;
|
| case Token::DIV:
|
| - __ InvokeBuiltin(Builtins::DIV, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::DIV, JUMP_FUNCTION);
|
| break;
|
| case Token::MOD:
|
| - __ InvokeBuiltin(Builtins::MOD, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::MOD, JUMP_FUNCTION);
|
| break;
|
| case Token::BIT_OR:
|
| - __ InvokeBuiltin(Builtins::BIT_OR, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::BIT_OR, JUMP_FUNCTION);
|
| break;
|
| case Token::BIT_AND:
|
| - __ InvokeBuiltin(Builtins::BIT_AND, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::BIT_AND, JUMP_FUNCTION);
|
| break;
|
| case Token::BIT_XOR:
|
| - __ InvokeBuiltin(Builtins::BIT_XOR, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::BIT_XOR, JUMP_FUNCTION);
|
| break;
|
| case Token::SAR:
|
| - __ InvokeBuiltin(Builtins::SAR, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::SAR, JUMP_FUNCTION);
|
| break;
|
| case Token::SHR:
|
| - __ InvokeBuiltin(Builtins::SHR, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::SHR, JUMP_FUNCTION);
|
| break;
|
| case Token::SHL:
|
| - __ InvokeBuiltin(Builtins::SHL, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::SHL, JUMP_FUNCTION);
|
| break;
|
| default:
|
| UNREACHABLE();
|
| @@ -3821,11 +3821,11 @@
|
| if (HasArgsInRegisters()) {
|
| __ Push(r0, r1);
|
| }
|
| - __ InvokeBuiltin(Builtins::INSTANCE_OF, JUMP_JS);
|
| + __ InvokeBuiltin(Builtins::INSTANCE_OF, JUMP_FUNCTION);
|
| } else {
|
| __ EnterInternalFrame();
|
| __ Push(r0, r1);
|
| - __ InvokeBuiltin(Builtins::INSTANCE_OF, CALL_JS);
|
| + __ InvokeBuiltin(Builtins::INSTANCE_OF, CALL_FUNCTION);
|
| __ LeaveInternalFrame();
|
| __ cmp(r0, Operand(0));
|
| __ LoadRoot(r0, Heap::kTrueValueRootIndex, eq);
|
| @@ -4476,7 +4476,7 @@
|
| __ bind(&receiver_is_value);
|
| __ EnterInternalFrame();
|
| __ push(r1);
|
| - __ InvokeBuiltin(Builtins::TO_OBJECT, CALL_JS);
|
| + __ InvokeBuiltin(Builtins::TO_OBJECT, CALL_FUNCTION);
|
| __ LeaveInternalFrame();
|
| __ str(r0, MemOperand(sp, argc_ * kPointerSize));
|
|
|
| @@ -5777,7 +5777,7 @@
|
|
|
| if (call_builtin.is_linked()) {
|
| __ bind(&call_builtin);
|
| - __ InvokeBuiltin(builtin_id, JUMP_JS);
|
| + __ InvokeBuiltin(builtin_id, JUMP_FUNCTION);
|
| }
|
| }
|
|
|
|
|