diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-06-21 00:33:44 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-06-21 00:33:44 +0200 |
| commit | 6b26583e8450e837886b84610305698fa447fa7e (patch) | |
| tree | 340368e8ac7b2e6efe700833c6b74d78db98b267 /deps/v8/src/arm | |
| parent | fe464a2fea93880a7da883138f83a2ae8ad6a30f (diff) | |
| download | node-6b26583e8450e837886b84610305698fa447fa7e.tar.gz | |
v8: upgrade to v3.11.10.10
Diffstat (limited to 'deps/v8/src/arm')
| -rw-r--r-- | deps/v8/src/arm/full-codegen-arm.cc | 2 | ||||
| -rw-r--r-- | deps/v8/src/arm/lithium-codegen-arm.cc | 12 | ||||
| -rw-r--r-- | deps/v8/src/arm/macro-assembler-arm.cc | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/deps/v8/src/arm/full-codegen-arm.cc b/deps/v8/src/arm/full-codegen-arm.cc index 30c131c64..ff7c3c139 100644 --- a/deps/v8/src/arm/full-codegen-arm.cc +++ b/deps/v8/src/arm/full-codegen-arm.cc @@ -328,7 +328,7 @@ void FullCodeGenerator::EmitProfilingCounterReset() { } if (isolate()->IsDebuggerActive()) { // Detect debug break requests as soon as possible. - reset_value = FLAG_interrupt_budget >> 4; + reset_value = 10; } __ mov(r2, Operand(profiling_counter_)); __ mov(r3, Operand(Smi::FromInt(reset_value))); diff --git a/deps/v8/src/arm/lithium-codegen-arm.cc b/deps/v8/src/arm/lithium-codegen-arm.cc index 256d180f2..b03ba8c39 100644 --- a/deps/v8/src/arm/lithium-codegen-arm.cc +++ b/deps/v8/src/arm/lithium-codegen-arm.cc @@ -2594,15 +2594,15 @@ void LCodeGen::EmitLoadFieldOrConstantFunction(Register result, } else { // Negative lookup. // Check prototypes. - HeapObject* current = HeapObject::cast((*type)->prototype()); + Handle<HeapObject> current(HeapObject::cast((*type)->prototype())); Heap* heap = type->GetHeap(); - while (current != heap->null_value()) { - Handle<HeapObject> link(current); - __ LoadHeapObject(result, link); + while (*current != heap->null_value()) { + __ LoadHeapObject(result, current); __ ldr(result, FieldMemOperand(result, HeapObject::kMapOffset)); - __ cmp(result, Operand(Handle<Map>(JSObject::cast(current)->map()))); + __ cmp(result, Operand(Handle<Map>(current->map()))); DeoptimizeIf(ne, env); - current = HeapObject::cast(current->map()->prototype()); + current = + Handle<HeapObject>(HeapObject::cast(current->map()->prototype())); } __ LoadRoot(result, Heap::kUndefinedValueRootIndex); } diff --git a/deps/v8/src/arm/macro-assembler-arm.cc b/deps/v8/src/arm/macro-assembler-arm.cc index 7c49e9e58..933399e00 100644 --- a/deps/v8/src/arm/macro-assembler-arm.cc +++ b/deps/v8/src/arm/macro-assembler-arm.cc @@ -2878,7 +2878,8 @@ void MacroAssembler::LoadTransitionedArrayMapConditional( Context::SlotOffset(Context::JS_ARRAY_MAPS_INDEX))); size_t offset = expected_kind * kPointerSize + FixedArrayBase::kHeaderSize; - cmp(map_in_out, scratch); + ldr(ip, FieldMemOperand(scratch, offset)); + cmp(map_in_out, ip); b(ne, no_map_match); // Use the transitioned cached map. |