diff options
author | Ryan <ry@tinyclouds.org> | 2009-09-09 22:01:54 +0200 |
---|---|---|
committer | Ryan <ry@tinyclouds.org> | 2009-09-09 22:01:54 +0200 |
commit | fcff66bf29fef8a9d568ebb4cb7192ab32afe3f7 (patch) | |
tree | 8ea321ed7f248a54403d86154d4df325960d41ef /deps/v8/src/ia32/codegen-ia32.cc | |
parent | efb2b703a655b29a692819c8bdb191792da6416e (diff) | |
download | node-new-fcff66bf29fef8a9d568ebb4cb7192ab32afe3f7.tar.gz |
Upgrade v8 to 1.3.10
Diffstat (limited to 'deps/v8/src/ia32/codegen-ia32.cc')
-rw-r--r-- | deps/v8/src/ia32/codegen-ia32.cc | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/deps/v8/src/ia32/codegen-ia32.cc b/deps/v8/src/ia32/codegen-ia32.cc index a9face1d70..400a3607b7 100644 --- a/deps/v8/src/ia32/codegen-ia32.cc +++ b/deps/v8/src/ia32/codegen-ia32.cc @@ -6886,7 +6886,7 @@ void GenericBinaryOpStub::Generate(MacroAssembler* masm) { __ j(above_equal, &string1); // First and second argument are strings. - __ TailCallRuntime(ExternalReference(Runtime::kStringAdd), 2); + __ TailCallRuntime(ExternalReference(Runtime::kStringAdd), 2, 1); // Only first argument is a string. __ bind(&string1); @@ -6954,12 +6954,11 @@ void FloatingPointHelper::AllocateHeapNumber(MacroAssembler* masm, scratch1, scratch2, need_gc, - false); + TAG_OBJECT); - // Set the map and tag the result. - __ mov(Operand(result, HeapObject::kMapOffset), + // Set the map. + __ mov(FieldOperand(result, HeapObject::kMapOffset), Immediate(Factory::heap_number_map())); - __ or_(Operand(result), Immediate(kHeapObjectTag)); } @@ -7176,7 +7175,7 @@ void ArgumentsAccessStub::GenerateReadElement(MacroAssembler* masm) { __ pop(ebx); // Return address. __ push(edx); __ push(ebx); - __ TailCallRuntime(ExternalReference(Runtime::kGetArgumentsProperty), 1); + __ TailCallRuntime(ExternalReference(Runtime::kGetArgumentsProperty), 1, 1); } @@ -7201,7 +7200,7 @@ void ArgumentsAccessStub::GenerateNewObject(MacroAssembler* masm) { // Do the runtime call to allocate the arguments object. __ bind(&runtime); - __ TailCallRuntime(ExternalReference(Runtime::kNewArgumentsFast), 3); + __ TailCallRuntime(ExternalReference(Runtime::kNewArgumentsFast), 3, 1); } @@ -7437,7 +7436,7 @@ void StackCheckStub::Generate(MacroAssembler* masm) { __ push(eax); // Do tail-call to runtime routine. - __ TailCallRuntime(ExternalReference(Runtime::kStackGuard), 1); + __ TailCallRuntime(ExternalReference(Runtime::kStackGuard), 1, 1); } @@ -7469,6 +7468,13 @@ void CallFunctionStub::Generate(MacroAssembler* masm) { } +int CEntryStub::MinorKey() { + ASSERT(result_size_ <= 2); + // Result returned in eax, or eax+edx if result_size_ is 2. + return 0; +} + + void CEntryStub::GenerateThrowTOS(MacroAssembler* masm) { // eax holds the exception. |