src/arm/codegen-arm.cc - Issue 6529032: Merge 6168:6800 from bleeding_edge to experimental/gc branch.

Unified Diff: src/arm/codegen-arm.cc

Issue 6529032: Merge 6168:6800 from bleeding_edge to experimental/gc branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/

Patch Set: Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/arm/codegen-arm.cc

===================================================================

--- src/arm/codegen-arm.cc (revision 6800)

+++ src/arm/codegen-arm.cc (working copy)

@@ -600,7 +600,7 @@

// When using lazy arguments allocation, we store the hole value

// as a sentinel indicating that the arguments object hasn't been

// allocated yet.

- frame_->EmitPushRoot(Heap::kTheHoleValueRootIndex);

+ frame_->EmitPushRoot(Heap::kArgumentsMarkerRootIndex);

} else {

frame_->SpillAll();

ArgumentsAccessStub stub(ArgumentsAccessStub::NEW_OBJECT);

@@ -627,7 +627,7 @@

// has a local variable named 'arguments'.

LoadFromSlot(scope()->arguments()->AsSlot(), NOT_INSIDE_TYPEOF);

- __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);

+ __ LoadRoot(ip, Heap::kArgumentsMarkerRootIndex);

__ cmp(arguments, ip);

done.Branch(ne);

}

@@ -1114,7 +1114,7 @@

// Not a 32bits signed int, fall back to the GenericBinaryOpStub.

- __ ConvertToInt32(tos_register_, int32, r4, r5, entry_label());

+ __ ConvertToInt32(tos_register_, int32, r4, r5, d0, entry_label());

// tos_register_ (r0 or r1): Original heap number.

// int32: signed 32bits int.

@@ -1593,7 +1593,7 @@

}

-void CodeGenerator::Comparison(Condition cc,

+void CodeGenerator::Comparison(Condition cond,

Expression* left,

Expression* right,

bool strict) {

@@ -1607,7 +1607,7 @@

// result : cc register

// Strict only makes sense for equality comparisons.

- ASSERT(!strict || cc == eq);

+ ASSERT(!strict || cond == eq);

@@ -1618,8 +1618,8 @@

// We load the top two stack positions into registers chosen by the virtual

// frame. This should keep the register shuffling to a minimum.

// Implement '>' and '<=' by reversal to obtain ECMA-262 conversion order.

- if (cc == gt || cc == le) {

- cc = ReverseCondition(cc);

+ if (cond == gt || cond == le) {

+ cond = ReverseCondition(cond);

lhs_is_smi = frame_->KnownSmiAt(0);

rhs_is_smi = frame_->KnownSmiAt(1);

lhs = frame_->PopToRegister();

@@ -1659,7 +1659,7 @@

// Perform non-smi comparison by stub.

// CompareStub takes arguments in r0 and r1, returns <0, >0 or 0 in r0.

// We call with 0 args because there are 0 on the stack.

- CompareStub stub(cc, strict, NO_SMI_COMPARE_IN_STUB, lhs, rhs);

+ CompareStub stub(cond, strict, NO_SMI_COMPARE_IN_STUB, lhs, rhs);

frame_->CallStub(&stub, 0);

__ cmp(r0, Operand(0, RelocInfo::NONE));

exit.Jump();

@@ -1671,7 +1671,7 @@

__ cmp(lhs, Operand(rhs));

exit.Bind();

- cc_reg_ = cc;

+ cc_reg_ = cond;

}

@@ -1752,7 +1752,7 @@

// named 'arguments' has been introduced.

JumpTarget slow;

Label done;

- __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);

+ __ LoadRoot(ip, Heap::kArgumentsMarkerRootIndex);

__ cmp(ip, arguments_reg);

slow.Branch(ne);

@@ -1766,7 +1766,7 @@

// sp[2]: applicand.

// Check that the receiver really is a JavaScript object.

- __ BranchOnSmi(receiver_reg, &build_args);

+ __ JumpIfSmi(receiver_reg, &build_args);

// We allow all JSObjects including JSFunctions. As long as

// JS_FUNCTION_TYPE is the last instance type and it is right

// after LAST_JS_OBJECT_TYPE, we do not have to check the upper

@@ -1778,7 +1778,7 @@

// Check that applicand.apply is Function.prototype.apply.

__ ldr(r0, MemOperand(sp, kPointerSize));

- __ BranchOnSmi(r0, &build_args);

+ __ JumpIfSmi(r0, &build_args);

__ CompareObjectType(r0, r1, r2, JS_FUNCTION_TYPE);

__ b(ne, &build_args);

Handle<Code> apply_code(Builtins::builtin(Builtins::FunctionApply));

@@ -1789,7 +1789,7 @@

// Check that applicand is a function.

__ ldr(r1, MemOperand(sp, 2 * kPointerSize));

- __ BranchOnSmi(r1, &build_args);

+ __ JumpIfSmi(r1, &build_args);

__ CompareObjectType(r1, r2, r3, JS_FUNCTION_TYPE);

__ b(ne, &build_args);

@@ -1889,8 +1889,8 @@

void CodeGenerator::Branch(bool if_true, JumpTarget* target) {

ASSERT(has_cc());

- Condition cc = if_true ? cc_reg_ : NegateCondition(cc_reg_);

- target->Branch(cc);

+ Condition cond = if_true ? cc_reg_ : NegateCondition(cc_reg_);

+ target->Branch(cond);

cc_reg_ = al;

}

@@ -2196,15 +2196,10 @@

DeleteFrame();

#ifdef DEBUG

- // Check that the size of the code used for returning matches what is

- // expected by the debugger. If the sp_delts above cannot be encoded in

- // the add instruction the add will generate two instructions.

- int return_sequence_length =

- masm_->InstructionsGeneratedSince(&check_exit_codesize);

- CHECK(return_sequence_length ==

- Assembler::kJSReturnSequenceInstructions ||

- return_sequence_length ==

- Assembler::kJSReturnSequenceInstructions + 1);

+ // Check that the size of the code used for returning is large enough

+ // for the debugger's requirements.

+ ASSERT(Assembler::kJSReturnSequenceInstructions <=

+ masm_->InstructionsGeneratedSince(&check_exit_codesize));

#endif

}

@@ -3259,7 +3254,7 @@

// If the loaded value is the sentinel that indicates that we

// haven't loaded the arguments object yet, we need to do it now.

JumpTarget exit;

- __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);

+ __ LoadRoot(ip, Heap::kArgumentsMarkerRootIndex);

__ cmp(tos, ip);

exit.Branch(ne);

frame_->Drop();

@@ -4185,8 +4180,11 @@

__ ldr(r1, frame_->Receiver());

frame_->EmitPush(r1);

- frame_->CallRuntime(Runtime::kResolvePossiblyDirectEvalNoLookup, 3);

+ // Push the strict mode flag.

+ frame_->EmitPush(Operand(Smi::FromInt(strict_mode_flag())));

+ frame_->CallRuntime(Runtime::kResolvePossiblyDirectEvalNoLookup, 4);

done.Jump();

slow.Bind();

}

@@ -4205,8 +4203,11 @@

__ ldr(r1, frame_->Receiver());

frame_->EmitPush(r1);

+ // Push the strict mode flag.

+ frame_->EmitPush(Operand(Smi::FromInt(strict_mode_flag())));

// Resolve the call.

- frame_->CallRuntime(Runtime::kResolvePossiblyDirectEval, 3);

+ frame_->CallRuntime(Runtime::kResolvePossiblyDirectEval, 4);

// If we generated fast-case code bind the jump-target where fast

// and slow case merge.

@@ -4628,8 +4629,8 @@

ASSERT(runtime.entry_frame() == NULL);

runtime.set_entry_frame(frame_);

- __ BranchOnNotSmi(exponent, &exponent_nonsmi);

- __ BranchOnNotSmi(base, &base_nonsmi);

+ __ JumpIfNotSmi(exponent, &exponent_nonsmi);

+ __ JumpIfNotSmi(base, &base_nonsmi);

heap_number_map = r6;

__ LoadRoot(heap_number_map, Heap::kHeapNumberMapRootIndex);

@@ -4677,8 +4678,7 @@

__ mov(scratch2, Operand(0x7FF00000));

__ mov(scratch1, Operand(0, RelocInfo::NONE));

__ vmov(d1, scratch1, scratch2); // Load infinity into d1.

- __ vcmp(d0, d1);

- __ vmrs(pc);

+ __ VFPCompareAndSetFlags(d0, d1);

runtime.Branch(eq); // d0 reached infinity.

__ vdiv(d0, d2, d0);

__ b(&allocate_return);

@@ -4709,12 +4709,15 @@

runtime.entry_label(),

AVOID_NANS_AND_INFINITIES);

+ // Convert -0 into +0 by adding +0.

+ __ vmov(d2, 0.0);

+ __ vadd(d0, d2, d0);

// Load 1.0 into d2.

__ vmov(d2, 1.0);

- // Calculate the reciprocal of the square root. 1/sqrt(x) = sqrt(1/x).

+ // Calculate the reciprocal of the square root.

+ __ vsqrt(d0, d0);

__ vdiv(d0, d2, d0);

- __ vsqrt(d0, d0);

__ b(&allocate_return);

@@ -4728,6 +4731,9 @@

scratch1, scratch2, heap_number_map, s0,

runtime.entry_label(),

AVOID_NANS_AND_INFINITIES);

+ // Convert -0 into +0 by adding +0.

+ __ vmov(d2, 0.0);

+ __ vadd(d0, d2, d0);

__ vsqrt(d0, d0);

__ bind(&allocate_return);

@@ -5583,7 +5589,7 @@

deferred->Branch(lt);

__ ldrb(tmp2, FieldMemOperand(tmp1, Map::kBitFieldOffset));

__ tst(tmp2, Operand(KeyedLoadIC::kSlowCaseBitFieldMask));

- deferred->Branch(nz);

+ deferred->Branch(ne);

// Check the object's elements are in fast case and writable.

__ ldr(tmp1, FieldMemOperand(object, JSObject::kElementsOffset));

@@ -5600,7 +5606,7 @@

__ mov(tmp2, index1);

__ orr(tmp2, tmp2, index2);

__ tst(tmp2, Operand(kSmiTagMask));

- deferred->Branch(nz);

+ deferred->Branch(ne);

// Check that both indices are valid.

__ ldr(tmp2, FieldMemOperand(object, JSArray::kLengthOffset));

@@ -5850,27 +5856,28 @@

if (property != NULL) {

Load(property->obj());

Load(property->key());

- frame_->InvokeBuiltin(Builtins::DELETE, CALL_JS, 2);

+ frame_->EmitPush(Operand(Smi::FromInt(strict_mode_flag())));

+ frame_->InvokeBuiltin(Builtins::DELETE, CALL_JS, 3);

frame_->EmitPush(r0);

} else if (variable != NULL) {

+ // Delete of an unqualified identifier is disallowed in strict mode

+ // so this code can only be reached in non-strict mode.

+ ASSERT(strict_mode_flag() == kNonStrictMode);

Slot* slot = variable->AsSlot();

if (variable->is_global()) {

LoadGlobal();

frame_->EmitPush(Operand(variable->name()));

- frame_->InvokeBuiltin(Builtins::DELETE, CALL_JS, 2);

+ frame_->EmitPush(Operand(Smi::FromInt(kNonStrictMode)));

+ frame_->InvokeBuiltin(Builtins::DELETE, CALL_JS, 3);

frame_->EmitPush(r0);

} else if (slot != NULL && slot->type() == Slot::LOOKUP) {

- // lookup the context holding the named variable

+ // Delete from the context holding the named variable.

frame_->EmitPush(cp);

frame_->EmitPush(Operand(variable->name()));

- frame_->CallRuntime(Runtime::kLookupContext, 2);

- // r0: context

+ frame_->CallRuntime(Runtime::kDeleteContextSlot, 2);

frame_->EmitPush(r0);

- frame_->EmitPush(Operand(variable->name()));

- frame_->InvokeBuiltin(Builtins::DELETE, CALL_JS, 2);

- frame_->EmitPush(r0);

} else {

// Default: Result of deleting non-global, not dynamically

@@ -6936,7 +6943,7 @@

Result result;

if (is_contextual || scope()->is_global_scope() || loop_nesting() == 0) {

- frame()->CallStoreIC(name, is_contextual);

+ frame()->CallStoreIC(name, is_contextual, strict_mode_flag());

} else {

// Inline the in-object property case.

JumpTarget slow, done;

« no previous file with comments | « src/arm/codegen-arm.h ('k') | src/arm/codegen-arm-inl.h » ('j') | no next file with comments »