src/ia32/full-codegen-ia32.cc - Issue 8386037: Remove the forward-bailout stack from the non-optimizing compiler.

Unified Diff: src/ia32/full-codegen-ia32.cc

Issue 8386037: Remove the forward-bailout stack from the non-optimizing compiler. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 9 years, 1 month 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/ia32/full-codegen-ia32.cc

diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc

index 0c59335d283fefb3d4b60eb1b6a61b7e33ff8fa8..0af30f079fbb7935f94d7f24789df12370c3ee3c 100644

--- a/src/ia32/full-codegen-ia32.cc

+++ b/src/ia32/full-codegen-ia32.cc

@@ -384,7 +384,7 @@ void FullCodeGenerator::StackValueContext::Plug(Variable* var) const {

void FullCodeGenerator::TestContext::Plug(Variable* var) const {

// For simplicity we always test the accumulator register.

codegen()->GetVar(result_register(), var);

- codegen()->PrepareForBailoutBeforeSplit(TOS_REG, false, NULL, NULL);

+ codegen()->PrepareForBailoutBeforeSplit(condition(), false, NULL, NULL);

codegen()->DoTest(this);

}

@@ -435,7 +435,7 @@ void FullCodeGenerator::StackValueContext::Plug(Handle<Object> lit) const {

void FullCodeGenerator::TestContext::Plug(Handle<Object> lit) const {

- codegen()->PrepareForBailoutBeforeSplit(TOS_REG,

+ codegen()->PrepareForBailoutBeforeSplit(condition(),

true,

true_label_,

false_label_);

@@ -494,7 +494,7 @@ void FullCodeGenerator::TestContext::DropAndPlug(int count,

// For simplicity we always test the accumulator register.

__ Drop(count);

__ Move(result_register(), reg);

- codegen()->PrepareForBailoutBeforeSplit(TOS_REG, false, NULL, NULL);

+ codegen()->PrepareForBailoutBeforeSplit(condition(), false, NULL, NULL);

codegen()->DoTest(this);

}

@@ -560,7 +560,7 @@ void FullCodeGenerator::StackValueContext::Plug(bool flag) const {

void FullCodeGenerator::TestContext::Plug(bool flag) const {

- codegen()->PrepareForBailoutBeforeSplit(TOS_REG,

+ codegen()->PrepareForBailoutBeforeSplit(condition(),

true,

true_label_,

false_label_);

@@ -653,7 +653,7 @@ void FullCodeGenerator::SetVar(Variable* var,

}

-void FullCodeGenerator::PrepareForBailoutBeforeSplit(State state,

+void FullCodeGenerator::PrepareForBailoutBeforeSplit(Expression* expr,

bool should_normalize,

Label* if_true,

Label* if_false) {

@@ -664,13 +664,7 @@ void FullCodeGenerator::PrepareForBailoutBeforeSplit(State state,

Label skip;

if (should_normalize) __ jmp(&skip, Label::kNear);

- ForwardBailoutStack* current = forward_bailout_stack_;

- while (current != NULL) {

- PrepareForBailout(current->expr(), state);

- current = current->parent();

- }

+ PrepareForBailout(expr, TOS_REG);

if (should_normalize) {

__ cmp(eax, isolate()->factory()->true_value());

Split(equal, if_true, if_false, NULL);

@@ -2270,7 +2264,8 @@ void FullCodeGenerator::VisitCallNew(CallNew* expr) {

}

-void FullCodeGenerator::EmitIsSmi(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitIsSmi(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2282,7 +2277,7 @@ void FullCodeGenerator::EmitIsSmi(ZoneList<Expression*>* args) {

context()->PrepareTest(&materialize_true, &materialize_false,

&if_true, &if_false, &fall_through);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

__ test(eax, Immediate(kSmiTagMask));

Split(zero, if_true, if_false, fall_through);

@@ -2290,7 +2285,8 @@ void FullCodeGenerator::EmitIsSmi(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitIsNonNegativeSmi(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitIsNonNegativeSmi(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2302,7 +2298,7 @@ void FullCodeGenerator::EmitIsNonNegativeSmi(ZoneList<Expression*>* args) {

context()->PrepareTest(&materialize_true, &materialize_false,

&if_true, &if_false, &fall_through);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

__ test(eax, Immediate(kSmiTagMask | 0x80000000));

Split(zero, if_true, if_false, fall_through);

@@ -2310,7 +2306,8 @@ void FullCodeGenerator::EmitIsNonNegativeSmi(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitIsObject(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitIsObject(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2334,14 +2331,15 @@ void FullCodeGenerator::EmitIsObject(ZoneList<Expression*>* args) {

__ cmp(ecx, FIRST_NONCALLABLE_SPEC_OBJECT_TYPE);

__ j(below, if_false);

__ cmp(ecx, LAST_NONCALLABLE_SPEC_OBJECT_TYPE);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Split(below_equal, if_true, if_false, fall_through);

context()->Plug(if_true, if_false);

}

-void FullCodeGenerator::EmitIsSpecObject(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2355,14 +2353,15 @@ void FullCodeGenerator::EmitIsSpecObject(ZoneList<Expression*>* args) {

__ JumpIfSmi(eax, if_false);

__ CmpObjectType(eax, FIRST_SPEC_OBJECT_TYPE, ebx);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Split(above_equal, if_true, if_false, fall_through);

context()->Plug(if_true, if_false);

}

-void FullCodeGenerator::EmitIsUndetectableObject(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitIsUndetectableObject(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2378,7 +2377,7 @@ void FullCodeGenerator::EmitIsUndetectableObject(ZoneList<Expression*>* args) {

__ mov(ebx, FieldOperand(eax, HeapObject::kMapOffset));

__ movzx_b(ebx, FieldOperand(ebx, Map::kBitFieldOffset));

__ test(ebx, Immediate(1 << Map::kIsUndetectable));

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Split(not_zero, if_true, if_false, fall_through);

context()->Plug(if_true, if_false);

@@ -2386,7 +2385,8 @@ void FullCodeGenerator::EmitIsUndetectableObject(ZoneList<Expression*>* args) {

void FullCodeGenerator::EmitIsStringWrapperSafeForDefaultValueOf(

- ZoneList<Expression*>* args) {

+ CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2463,12 +2463,13 @@ void FullCodeGenerator::EmitIsStringWrapperSafeForDefaultValueOf(

Immediate(1 << Map::kStringWrapperSafeForDefaultValueOf));

__ jmp(if_true);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

context()->Plug(if_true, if_false);

}

-void FullCodeGenerator::EmitIsFunction(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitIsFunction(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2482,14 +2483,15 @@ void FullCodeGenerator::EmitIsFunction(ZoneList<Expression*>* args) {

__ JumpIfSmi(eax, if_false);

__ CmpObjectType(eax, JS_FUNCTION_TYPE, ebx);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Split(equal, if_true, if_false, fall_through);

context()->Plug(if_true, if_false);

}

-void FullCodeGenerator::EmitIsArray(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitIsArray(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2503,14 +2505,15 @@ void FullCodeGenerator::EmitIsArray(ZoneList<Expression*>* args) {

__ JumpIfSmi(eax, if_false);

__ CmpObjectType(eax, JS_ARRAY_TYPE, ebx);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Split(equal, if_true, if_false, fall_through);

context()->Plug(if_true, if_false);

}

-void FullCodeGenerator::EmitIsRegExp(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitIsRegExp(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2524,7 +2527,7 @@ void FullCodeGenerator::EmitIsRegExp(ZoneList<Expression*>* args) {

__ JumpIfSmi(eax, if_false);

__ CmpObjectType(eax, JS_REGEXP_TYPE, ebx);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Split(equal, if_true, if_false, fall_through);

context()->Plug(if_true, if_false);

@@ -2532,8 +2535,8 @@ void FullCodeGenerator::EmitIsRegExp(ZoneList<Expression*>* args) {

-void FullCodeGenerator::EmitIsConstructCall(ZoneList<Expression*>* args) {

- ASSERT(args->length() == 0);

+void FullCodeGenerator::EmitIsConstructCall(CallRuntime* expr) {

+ ASSERT(expr->arguments()->length() == 0);

Label materialize_true, materialize_false;

Label* if_true = NULL;

@@ -2556,14 +2559,15 @@ void FullCodeGenerator::EmitIsConstructCall(ZoneList<Expression*>* args) {

__ bind(&check_frame_marker);

__ cmp(Operand(eax, StandardFrameConstants::kMarkerOffset),

Immediate(Smi::FromInt(StackFrame::CONSTRUCT)));

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Split(equal, if_true, if_false, fall_through);

context()->Plug(if_true, if_false);

}

-void FullCodeGenerator::EmitObjectEquals(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitObjectEquals(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 2);

// Load the two objects into registers and perform the comparison.

@@ -2579,14 +2583,15 @@ void FullCodeGenerator::EmitObjectEquals(ZoneList<Expression*>* args) {

__ pop(ebx);

__ cmp(eax, ebx);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Split(equal, if_true, if_false, fall_through);

context()->Plug(if_true, if_false);

}

-void FullCodeGenerator::EmitArguments(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitArguments(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

// ArgumentsAccessStub expects the key in edx and the formal

@@ -2600,8 +2605,8 @@ void FullCodeGenerator::EmitArguments(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitArgumentsLength(ZoneList<Expression*>* args) {

- ASSERT(args->length() == 0);

+void FullCodeGenerator::EmitArgumentsLength(CallRuntime* expr) {

+ ASSERT(expr->arguments()->length() == 0);

Label exit;

// Get the number of formal parameters.

@@ -2623,7 +2628,8 @@ void FullCodeGenerator::EmitArgumentsLength(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitClassOf(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitClassOf(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

Label done, null, function, non_function_constructor;

@@ -2683,7 +2689,7 @@ void FullCodeGenerator::EmitClassOf(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitLog(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitLog(CallRuntime* expr) {

// Conditionally generate a log call.

// Args:

// 0 (literal string): The type of logging (corresponds to the flags).

@@ -2691,6 +2697,7 @@ void FullCodeGenerator::EmitLog(ZoneList<Expression*>* args) {

// 1 (string): Format string. Access the string at argument index 2

// with '%2s' (see Logger::LogRuntime for all the formats).

// 2 (array): Arguments to the format string.

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT_EQ(args->length(), 3);

if (CodeGenerator::ShouldGenerateLog(args->at(0))) {

VisitForStackValue(args->at(1));

@@ -2703,8 +2710,8 @@ void FullCodeGenerator::EmitLog(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitRandomHeapNumber(ZoneList<Expression*>* args) {

- ASSERT(args->length() == 0);

+void FullCodeGenerator::EmitRandomHeapNumber(CallRuntime* expr) {

+ ASSERT(expr->arguments()->length() == 0);

Label slow_allocate_heapnumber;

Label heapnumber_allocated;

@@ -2754,9 +2761,10 @@ void FullCodeGenerator::EmitRandomHeapNumber(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitSubString(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitSubString(CallRuntime* expr) {

// Load the arguments on the stack and call the stub.

SubStringStub stub;

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 3);

VisitForStackValue(args->at(0));

VisitForStackValue(args->at(1));

@@ -2766,9 +2774,10 @@ void FullCodeGenerator::EmitSubString(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitRegExpExec(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitRegExpExec(CallRuntime* expr) {

// Load the arguments on the stack and call the stub.

RegExpExecStub stub;

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 4);

VisitForStackValue(args->at(0));

VisitForStackValue(args->at(1));

@@ -2779,7 +2788,8 @@ void FullCodeGenerator::EmitRegExpExec(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitValueOf(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitValueOf(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0)); // Load the object.

@@ -2797,8 +2807,9 @@ void FullCodeGenerator::EmitValueOf(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitMathPow(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitMathPow(CallRuntime* expr) {

// Load the arguments on the stack and call the runtime function.

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 2);

VisitForStackValue(args->at(0));

VisitForStackValue(args->at(1));

@@ -2813,7 +2824,8 @@ void FullCodeGenerator::EmitMathPow(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitSetValueOf(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitSetValueOf(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 2);

VisitForStackValue(args->at(0)); // Load the object.

@@ -2841,7 +2853,8 @@ void FullCodeGenerator::EmitSetValueOf(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitNumberToString(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitNumberToString(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT_EQ(args->length(), 1);

// Load the argument on the stack and call the stub.

@@ -2853,7 +2866,8 @@ void FullCodeGenerator::EmitNumberToString(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitStringCharFromCode(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitStringCharFromCode(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -2871,7 +2885,8 @@ void FullCodeGenerator::EmitStringCharFromCode(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitStringCharCodeAt(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitStringCharCodeAt(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 2);

VisitForStackValue(args->at(0));

@@ -2918,7 +2933,8 @@ void FullCodeGenerator::EmitStringCharCodeAt(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitStringCharAt(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitStringCharAt(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 2);

VisitForStackValue(args->at(0));

@@ -2967,7 +2983,8 @@ void FullCodeGenerator::EmitStringCharAt(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitStringAdd(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitStringAdd(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT_EQ(2, args->length());

VisitForStackValue(args->at(0));

@@ -2979,7 +2996,8 @@ void FullCodeGenerator::EmitStringAdd(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitStringCompare(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitStringCompare(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT_EQ(2, args->length());

VisitForStackValue(args->at(0));

@@ -2991,10 +3009,11 @@ void FullCodeGenerator::EmitStringCompare(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitMathSin(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitMathSin(CallRuntime* expr) {

// Load the argument on the stack and call the stub.

TranscendentalCacheStub stub(TranscendentalCache::SIN,

TranscendentalCacheStub::TAGGED);

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForStackValue(args->at(0));

__ CallStub(&stub);

@@ -3002,10 +3021,11 @@ void FullCodeGenerator::EmitMathSin(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitMathCos(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitMathCos(CallRuntime* expr) {

// Load the argument on the stack and call the stub.

TranscendentalCacheStub stub(TranscendentalCache::COS,

TranscendentalCacheStub::TAGGED);

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForStackValue(args->at(0));

__ CallStub(&stub);

@@ -3013,10 +3033,11 @@ void FullCodeGenerator::EmitMathCos(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitMathLog(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitMathLog(CallRuntime* expr) {

// Load the argument on the stack and call the stub.

TranscendentalCacheStub stub(TranscendentalCache::LOG,

TranscendentalCacheStub::TAGGED);

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForStackValue(args->at(0));

__ CallStub(&stub);

@@ -3024,8 +3045,9 @@ void FullCodeGenerator::EmitMathLog(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitMathSqrt(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitMathSqrt(CallRuntime* expr) {

// Load the argument on the stack and call the runtime function.

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForStackValue(args->at(0));

__ CallRuntime(Runtime::kMath_sqrt, 1);

@@ -3033,7 +3055,8 @@ void FullCodeGenerator::EmitMathSqrt(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitCallFunction(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitCallFunction(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() >= 2);

int arg_count = args->length() - 2; // 2 ~ receiver and function.

@@ -3052,9 +3075,10 @@ void FullCodeGenerator::EmitCallFunction(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitRegExpConstructResult(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitRegExpConstructResult(CallRuntime* expr) {

// Load the arguments on the stack and call the stub.

RegExpConstructResultStub stub;

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 3);

VisitForStackValue(args->at(0));

VisitForStackValue(args->at(1));

@@ -3064,7 +3088,8 @@ void FullCodeGenerator::EmitRegExpConstructResult(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitSwapElements(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitSwapElements(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 3);

VisitForStackValue(args->at(0));

VisitForStackValue(args->at(1));

@@ -3156,7 +3181,8 @@ void FullCodeGenerator::EmitSwapElements(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitGetFromCache(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitGetFromCache(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT_EQ(2, args->length());

ASSERT_NE(NULL, args->at(0)->AsLiteral());

@@ -3204,7 +3230,8 @@ void FullCodeGenerator::EmitGetFromCache(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitIsRegExpEquivalent(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitIsRegExpEquivalent(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT_EQ(2, args->length());

@@ -3241,7 +3268,8 @@ void FullCodeGenerator::EmitIsRegExpEquivalent(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitHasCachedArrayIndex(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitHasCachedArrayIndex(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -3259,14 +3287,15 @@ void FullCodeGenerator::EmitHasCachedArrayIndex(ZoneList<Expression*>* args) {

__ test(FieldOperand(eax, String::kHashFieldOffset),

Immediate(String::kContainsCachedArrayIndexMask));

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Split(zero, if_true, if_false, fall_through);

context()->Plug(if_true, if_false);

}

-void FullCodeGenerator::EmitGetCachedArrayIndex(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitGetCachedArrayIndex(CallRuntime* expr) {

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 1);

VisitForAccumulatorValue(args->at(0));

@@ -3281,11 +3310,12 @@ void FullCodeGenerator::EmitGetCachedArrayIndex(ZoneList<Expression*>* args) {

}

-void FullCodeGenerator::EmitFastAsciiArrayJoin(ZoneList<Expression*>* args) {

+void FullCodeGenerator::EmitFastAsciiArrayJoin(CallRuntime* expr) {

Label bailout, done, one_char_separator, long_separator,

non_trivial_array, not_size_one_array, loop,

loop_1, loop_1_condition, loop_2, loop_2_entry, loop_3, loop_3_entry;

+ ZoneList<Expression*>* args = expr->arguments();

ASSERT(args->length() == 2);

// We will leave the separator on the stack until the end of the function.

VisitForStackValue(args->at(1));

@@ -3643,18 +3673,41 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) {

// Unary NOT has no side effects so it's only necessary to visit the

// subexpression. Match the optimizing compiler by not branching.

VisitForEffect(expr->expression());

+ } else if (context()->IsTest()) {

+ const TestContext* test = TestContext::cast(context());

+ // The labels are swapped for the recursive call.

+ VisitForControl(expr->expression(),

+ test->false_label(),

+ test->true_label(),

+ test->fall_through());

+ context()->Plug(test->true_label(), test->false_label());

} else {

- Label materialize_true, materialize_false;

- Label* if_true = NULL;

- Label* if_false = NULL;

- Label* fall_through = NULL;

- // Notice that the labels are swapped.

- context()->PrepareTest(&materialize_true, &materialize_false,

- &if_false, &if_true, &fall_through);

- if (context()->IsTest()) ForwardBailoutToChild(expr);

- VisitForControl(expr->expression(), if_true, if_false, fall_through);

- context()->Plug(if_false, if_true); // Labels swapped.

+ // We handle value contexts explicitly rather than simply visiting

+ // for control and plugging the control flow into the context,

+ // because we need to prepare a pair of extra administrative AST ids

+ // for the optimizing compiler.

+ ASSERT(context()->IsAccumulatorValue() || context()->IsStackValue());

+ Label materialize_true, materialize_false, done;

+ VisitForControl(expr->expression(),

+ &materialize_false,

+ &materialize_true,

+ &materialize_true);

+ __ bind(&materialize_true);

+ PrepareForBailoutForId(expr->MaterializeTrueId(), NO_REGISTERS);

+ if (context()->IsAccumulatorValue()) {

+ __ mov(eax, isolate()->factory()->true_value());

+ } else {

+ __ push(isolate()->factory()->true_value());

+ }

+ __ jmp(&done, Label::kNear);

+ __ bind(&materialize_false);

+ PrepareForBailoutForId(expr->MaterializeFalseId(), NO_REGISTERS);

+ if (context()->IsAccumulatorValue()) {

+ __ mov(eax, isolate()->factory()->false_value());

+ } else {

+ __ push(isolate()->factory()->false_value());

+ }

+ __ bind(&done);

}

break;

}

@@ -3925,12 +3978,13 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) {

context()->Plug(eax);

} else {

// This expression cannot throw a reference error at the top level.

- VisitInCurrentContext(expr);

+ VisitInDuplicateContext(expr);

}

void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr,

+ Expression* sub_expr,

Handle<String> check) {

Label materialize_true, materialize_false;

Label* if_true = NULL;

@@ -3940,9 +3994,9 @@ void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr,

&if_true, &if_false, &fall_through);

{ AccumulatorValueContext context(this);

- VisitForTypeofValue(expr);

+ VisitForTypeofValue(sub_expr);

}

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

if (check->Equals(isolate()->heap()->number_symbol())) {

__ JumpIfSmi(eax, if_true);

@@ -4026,7 +4080,7 @@ void FullCodeGenerator::VisitCompareOperation(CompareOperation* expr) {

case Token::IN:

VisitForStackValue(expr->right());

__ InvokeBuiltin(Builtins::IN, CALL_FUNCTION);

- PrepareForBailoutBeforeSplit(TOS_REG, false, NULL, NULL);

+ PrepareForBailoutBeforeSplit(expr, false, NULL, NULL);

__ cmp(eax, isolate()->factory()->true_value());

Split(equal, if_true, if_false, fall_through);

break;

@@ -4035,7 +4089,7 @@ void FullCodeGenerator::VisitCompareOperation(CompareOperation* expr) {

VisitForStackValue(expr->right());

InstanceofStub stub(InstanceofStub::kNoFlags);

__ CallStub(&stub);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

__ test(eax, eax);

// The stub returns 0 for true.

Split(zero, if_true, if_false, fall_through);

@@ -4087,7 +4141,7 @@ void FullCodeGenerator::VisitCompareOperation(CompareOperation* expr) {

__ call(ic, RelocInfo::CODE_TARGET, expr->id());

patch_site.EmitPatchInfo();

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

__ test(eax, eax);

Split(cc, if_true, if_false, fall_through);

}

@@ -4110,7 +4164,7 @@ void FullCodeGenerator::EmitLiteralCompareNil(CompareOperation* expr,

&if_true, &if_false, &fall_through);

VisitForAccumulatorValue(sub_expr);

- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);

+ PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

Handle<Object> nil_value = nil == kNullValue ?

isolate()->factory()->null_value() :

isolate()->factory()->undefined_value();

« no previous file with comments | « src/hydrogen.cc ('k') | src/mips/full-codegen-mips.cc » ('j') | no next file with comments »