src/full-codegen/x64/full-codegen-x64.cc - Issue 1986353002: Revert of [Interpreter] Remove InterpreterExitTrampoline and replace with returning to the entry trampoline.

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

Issue 1986353002: Revert of [Interpreter] Remove InterpreterExitTrampoline and replace with returning to the entry trampoline. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master

Patch Set: Created 4 years, 7 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/full-codegen/x64/full-codegen-x64.cc

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

index a7eb7dd18e7acf930b335a0ad9451cce122eb1c5..74dbdf08ae5141d00101ca26403fa5f02ad7d8f7 100644

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

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

@@ -166,8 +166,7 @@

__ Push(rdi);

__ Push(info->scope()->GetScopeInfo(info->isolate()));

__ CallRuntime(Runtime::kNewScriptContext);

- PrepareForBailoutForId(BailoutId::ScriptContext(),

- BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(BailoutId::ScriptContext(), TOS_REG);

// The new target value is not used, clobbering is safe.

DCHECK_NULL(info->scope()->new_target_var());

} else {

@@ -223,8 +222,7 @@

// Register holding this function and new target are both trashed in case we

// bailout here. But since that can happen only when new target is not used

// and we allocate a context, the value of |function_in_register| is correct.

- PrepareForBailoutForId(BailoutId::FunctionContext(),

- BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(BailoutId::FunctionContext(), NO_REGISTERS);

// Possibly set up a local binding to the this function which is used in

// derived constructors with super calls.

@@ -288,8 +286,7 @@

// Visit the declarations and body unless there is an illegal

// redeclaration.

- PrepareForBailoutForId(BailoutId::FunctionEntry(),

- BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);

{

Comment cmnt(masm_, "[ Declarations");

VisitDeclarations(scope()->declarations());

@@ -302,8 +299,7 @@

{

Comment cmnt(masm_, "[ Stack check");

- PrepareForBailoutForId(BailoutId::Declarations(),

- BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(BailoutId::Declarations(), NO_REGISTERS);

Label ok;

__ CompareRoot(rsp, Heap::kStackLimitRootIndex);

__ j(above_equal, &ok, Label::kNear);

@@ -376,11 +372,11 @@

}

__ bind(&ok);

- PrepareForBailoutForId(stmt->EntryId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(stmt->EntryId(), NO_REGISTERS);

// Record a mapping of the OSR id to this PC. This is used if the OSR

// entry becomes the target of a bailout. We don't expect it to be, but

// we want it to work if it is.

- PrepareForBailoutForId(stmt->OsrEntryId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(stmt->OsrEntryId(), NO_REGISTERS);

}

void FullCodeGenerator::EmitProfilingCounterHandlingForReturnSequence(

@@ -696,7 +692,7 @@

Label skip;

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

- PrepareForBailout(expr, BailoutState::TOS_REGISTER);

+ PrepareForBailout(expr, TOS_REG);

if (should_normalize) {

__ CompareRoot(rax, Heap::kTrueValueRootIndex);

Split(equal, if_true, if_false, NULL);

@@ -752,7 +748,7 @@

__ LoadRoot(kScratchRegister, Heap::kTheHoleValueRootIndex);

__ movp(ContextOperand(rsi, variable->index()), kScratchRegister);

// No write barrier since the hole value is in old space.

- PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(proxy->id(), NO_REGISTERS);

}

break;

@@ -772,7 +768,7 @@

}

__ Push(Smi::FromInt(variable->DeclarationPropertyAttributes()));

__ CallRuntime(Runtime::kDeclareLookupSlot);

- PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(proxy->id(), NO_REGISTERS);

break;

}

@@ -817,7 +813,7 @@

kDontSaveFPRegs,

EMIT_REMEMBERED_SET,

OMIT_SMI_CHECK);

- PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(proxy->id(), NO_REGISTERS);

break;

}

@@ -827,7 +823,7 @@

VisitForStackValue(declaration->fun());

PushOperand(Smi::FromInt(variable->DeclarationPropertyAttributes()));

CallRuntimeWithOperands(Runtime::kDeclareLookupSlot);

- PrepareForBailoutForId(proxy->id(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(proxy->id(), NO_REGISTERS);

break;

}

@@ -858,7 +854,7 @@

// Keep the switch value on the stack until a case matches.

VisitForStackValue(stmt->tag());

- PrepareForBailoutForId(stmt->EntryId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(stmt->EntryId(), NO_REGISTERS);

ZoneList<CaseClause*>* clauses = stmt->cases();

CaseClause* default_clause = NULL; // Can occur anywhere in the list.

@@ -908,7 +904,7 @@

Label skip;

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

- PrepareForBailout(clause, BailoutState::TOS_REGISTER);

+ PrepareForBailout(clause, TOS_REG);

__ CompareRoot(rax, Heap::kTrueValueRootIndex);

__ j(not_equal, &next_test);

__ Drop(1);

@@ -936,12 +932,12 @@

Comment cmnt(masm_, "[ Case body");

CaseClause* clause = clauses->at(i);

__ bind(clause->body_target());

- PrepareForBailoutForId(clause->EntryId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(clause->EntryId(), NO_REGISTERS);

VisitStatements(clause->statements());

}

__ bind(nested_statement.break_label());

- PrepareForBailoutForId(stmt->ExitId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(stmt->ExitId(), NO_REGISTERS);

}

@@ -974,7 +970,7 @@

ToObjectStub stub(isolate());

__ CallStub(&stub);

__ bind(&done_convert);

- PrepareForBailoutForId(stmt->ToObjectId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(stmt->ToObjectId(), TOS_REG);

__ Push(rax);

// Check cache validity in generated code. If we cannot guarantee cache

@@ -994,7 +990,7 @@

__ bind(&call_runtime);

__ Push(rax); // Duplicate the enumerable object on the stack.

__ CallRuntime(Runtime::kForInEnumerate);

- PrepareForBailoutForId(stmt->EnumId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(stmt->EnumId(), TOS_REG);

// If we got a map from the runtime call, we can do a fast

// modification check. Otherwise, we got a fixed array, and we have

@@ -1036,7 +1032,7 @@

__ Push(rax); // Array

__ movp(rax, FieldOperand(rax, FixedArray::kLengthOffset));

__ Push(rax); // Fixed array length (as smi).

- PrepareForBailoutForId(stmt->PrepareId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(stmt->PrepareId(), NO_REGISTERS);

__ Push(Smi::FromInt(0)); // Initial index.

// Generate code for doing the condition check.

@@ -1078,7 +1074,7 @@

__ Push(rcx); // Enumerable.

__ Push(rbx); // Current entry.

__ CallRuntime(Runtime::kForInFilter);

- PrepareForBailoutForId(stmt->FilterId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(stmt->FilterId(), TOS_REG);

__ CompareRoot(rax, Heap::kUndefinedValueRootIndex);

__ j(equal, loop_statement.continue_label());

__ movp(rbx, rax);

@@ -1090,11 +1086,11 @@

// Perform the assignment as if via '='.

{ EffectContext context(this);

EmitAssignment(stmt->each(), stmt->EachFeedbackSlot());

- PrepareForBailoutForId(stmt->AssignmentId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(stmt->AssignmentId(), NO_REGISTERS);

}

// Both Crankshaft and Turbofan expect BodyId to be right before stmt->body().

- PrepareForBailoutForId(stmt->BodyId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(stmt->BodyId(), NO_REGISTERS);

// Generate code for the body of the loop.

Visit(stmt->body());

@@ -1111,7 +1107,7 @@

DropOperands(5);

// Exit and decrement the loop depth.

- PrepareForBailoutForId(stmt->ExitId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(stmt->ExitId(), NO_REGISTERS);

__ bind(&exit);

decrement_loop_depth();

}

@@ -1270,7 +1266,7 @@

TypeofMode typeof_mode) {

// Record position before possible IC call.

SetExpressionPosition(proxy);

- PrepareForBailoutForId(proxy->BeforeId(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(proxy->BeforeId(), NO_REGISTERS);

Variable* var = proxy->var();

// Three cases: global variables, lookup variables, and all other types of

@@ -1380,7 +1376,7 @@

__ CallStub(&stub);

RestoreContext();

}

- PrepareForBailoutForId(expr->CreateLiteralId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->CreateLiteralId(), TOS_REG);

// If result_saved is true the result is on top of the stack. If

// result_saved is false the result is in rax.

@@ -1416,7 +1412,7 @@

__ movp(StoreDescriptor::ReceiverRegister(), Operand(rsp, 0));

EmitLoadStoreICSlot(property->GetSlot(0));

CallStoreIC();

- PrepareForBailoutForId(key->id(), BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(key->id(), NO_REGISTERS);

if (NeedsHomeObject(value)) {

EmitSetHomeObjectAccumulator(value, 0, property->GetSlot(1));

@@ -1445,7 +1441,7 @@

DCHECK(property->emit_store());

CallRuntimeWithOperands(Runtime::kInternalSetPrototype);

PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),

- BailoutState::NO_REGISTERS);

+ NO_REGISTERS);

break;

case ObjectLiteral::Property::GETTER:

if (property->emit_store()) {

@@ -1499,7 +1495,7 @@

DCHECK(property->emit_store());

CallRuntimeWithOperands(Runtime::kInternalSetPrototype);

PrepareForBailoutForId(expr->GetIdForPropertySet(property_index),

- BailoutState::NO_REGISTERS);

+ NO_REGISTERS);

} else {

EmitPropertyKey(property, expr->GetIdForPropertyName(property_index));

VisitForStackValue(value);

@@ -1572,7 +1568,7 @@

FastCloneShallowArrayStub stub(isolate(), allocation_site_mode);

__ CallStub(&stub);

}

- PrepareForBailoutForId(expr->CreateLiteralId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->CreateLiteralId(), TOS_REG);

bool result_saved = false; // Is the result saved to the stack?

ZoneList<Expression*>* subexprs = expr->values();

@@ -1602,8 +1598,7 @@

CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();

CallIC(ic);

- PrepareForBailoutForId(expr->GetIdForElement(array_index),

- BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS);

}

// In case the array literal contains spread expressions it has two parts. The

@@ -1623,8 +1618,7 @@

VisitForStackValue(subexpr);

CallRuntimeWithOperands(Runtime::kAppendElement);

- PrepareForBailoutForId(expr->GetIdForElement(array_index),

- BailoutState::NO_REGISTERS);

+ PrepareForBailoutForId(expr->GetIdForElement(array_index), NO_REGISTERS);

}

if (result_saved) {

@@ -1702,27 +1696,23 @@

switch (assign_type) {

case VARIABLE:

EmitVariableLoad(expr->target()->AsVariableProxy());

- PrepareForBailout(expr->target(), BailoutState::TOS_REGISTER);

+ PrepareForBailout(expr->target(), TOS_REG);

break;

case NAMED_PROPERTY:

EmitNamedPropertyLoad(property);

- PrepareForBailoutForId(property->LoadId(),

- BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(property->LoadId(), TOS_REG);

break;

case NAMED_SUPER_PROPERTY:

EmitNamedSuperPropertyLoad(property);

- PrepareForBailoutForId(property->LoadId(),

- BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(property->LoadId(), TOS_REG);

break;

case KEYED_SUPER_PROPERTY:

EmitKeyedSuperPropertyLoad(property);

- PrepareForBailoutForId(property->LoadId(),

- BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(property->LoadId(), TOS_REG);

break;

case KEYED_PROPERTY:

EmitKeyedPropertyLoad(property);

- PrepareForBailoutForId(property->LoadId(),

- BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(property->LoadId(), TOS_REG);

break;

}

@@ -1741,7 +1731,7 @@

EmitBinaryOp(expr->binary_operation(), op);

}

// Deoptimization point in case the binary operation may have side effects.

- PrepareForBailout(expr->binary_operation(), BailoutState::TOS_REGISTER);

+ PrepareForBailout(expr->binary_operation(), TOS_REG);

} else {

VisitForAccumulatorValue(expr->value());

}

@@ -1753,7 +1743,7 @@

case VARIABLE:

EmitVariableAssignment(expr->target()->AsVariableProxy()->var(),

expr->op(), expr->AssignmentSlot());

- PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);

context()->Plug(rax);

break;

case NAMED_PROPERTY:

@@ -2176,7 +2166,7 @@

EmitLoadStoreICSlot(expr->AssignmentSlot());

CallStoreIC();

- PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);

context()->Plug(rax);

}

@@ -2220,7 +2210,7 @@

EmitLoadStoreICSlot(expr->AssignmentSlot());

CallIC(ic);

- PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);

context()->Plug(rax);

}

@@ -2241,7 +2231,7 @@

if (callee->IsVariableProxy()) {

{ StackValueContext context(this);

EmitVariableLoad(callee->AsVariableProxy());

- PrepareForBailout(callee, BailoutState::NO_REGISTERS);

+ PrepareForBailout(callee, NO_REGISTERS);

}

// Push undefined as receiver. This is patched in the Call builtin if it

// is a sloppy mode method.

@@ -2253,8 +2243,7 @@

DCHECK(!callee->AsProperty()->IsSuperAccess());

__ movp(LoadDescriptor::ReceiverRegister(), Operand(rsp, 0));

EmitNamedPropertyLoad(callee->AsProperty());

- PrepareForBailoutForId(callee->AsProperty()->LoadId(),

- BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG);

// Push the target function under the receiver.

PushOperand(Operand(rsp, 0));

__ movp(Operand(rsp, kPointerSize), rax);

@@ -2290,7 +2279,7 @@

// - home_object

// - key

CallRuntimeWithOperands(Runtime::kLoadFromSuper);

- PrepareForBailoutForId(prop->LoadId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(prop->LoadId(), TOS_REG);

// Replace home_object with target function.

__ movp(Operand(rsp, kPointerSize), rax);

@@ -2315,8 +2304,7 @@

__ movp(LoadDescriptor::ReceiverRegister(), Operand(rsp, 0));

__ Move(LoadDescriptor::NameRegister(), rax);

EmitKeyedPropertyLoad(callee->AsProperty());

- PrepareForBailoutForId(callee->AsProperty()->LoadId(),

- BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG);

// Push the target function under the receiver.

PushOperand(Operand(rsp, 0));

@@ -2349,7 +2337,7 @@

// - home_object

// - key

CallRuntimeWithOperands(Runtime::kLoadKeyedFromSuper);

- PrepareForBailoutForId(prop->LoadId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(prop->LoadId(), TOS_REG);

// Replace home_object with target function.

__ movp(Operand(rsp, kPointerSize), rax);

@@ -2369,7 +2357,7 @@

VisitForStackValue(args->at(i));

}

- PrepareForBailoutForId(expr->CallId(), BailoutState::NO_REGISTERS);

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

SetCallPosition(expr, expr->tail_call_mode());

if (expr->tail_call_mode() == TailCallMode::kAllow) {

if (FLAG_trace) {

@@ -2437,7 +2425,7 @@

__ CallRuntime(Runtime::kLoadLookupSlotForCall);

PushOperand(rax); // Function.

PushOperand(rdx); // Receiver.

- PrepareForBailoutForId(expr->LookupId(), BailoutState::NO_REGISTERS);

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

// If fast case code has been generated, emit code to push the function

// and receiver and have the slow path jump around this code.

@@ -2483,7 +2471,7 @@

// Touch up the callee.

__ movp(Operand(rsp, (arg_count + 1) * kPointerSize), rax);

- PrepareForBailoutForId(expr->EvalId(), BailoutState::NO_REGISTERS);

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

SetCallPosition(expr);

__ movp(rdi, Operand(rsp, (arg_count + 1) * kPointerSize));

@@ -2532,7 +2520,7 @@

CallConstructStub stub(isolate());

__ Call(stub.GetCode(), RelocInfo::CODE_TARGET);

OperandStackDepthDecrement(arg_count + 1);

- PrepareForBailoutForId(expr->ReturnId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->ReturnId(), TOS_REG);

RestoreContext();

context()->Plug(rax);

}

@@ -2965,7 +2953,7 @@

for (Expression* const arg : *args) {

VisitForStackValue(arg);

}

- PrepareForBailoutForId(expr->CallId(), BailoutState::NO_REGISTERS);

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

// Move target to rdi.

int const argc = args->length() - 2;

__ movp(rdi, Operand(rsp, (argc + 1) * kPointerSize));

@@ -3178,8 +3166,7 @@

&materialize_true);

if (!context()->IsAccumulatorValue()) OperandStackDepthIncrement(1);

__ bind(&materialize_true);

- PrepareForBailoutForId(expr->MaterializeTrueId(),

- BailoutState::NO_REGISTERS);

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

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

__ LoadRoot(rax, Heap::kTrueValueRootIndex);

} else {

@@ -3187,8 +3174,7 @@

}

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

__ bind(&materialize_false);

- PrepareForBailoutForId(expr->MaterializeFalseId(),

- BailoutState::NO_REGISTERS);

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

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

__ LoadRoot(rax, Heap::kFalseValueRootIndex);

} else {

@@ -3287,9 +3273,9 @@

// We need a second deoptimization point after loading the value

// in case evaluating the property load my have a side effect.

if (assign_type == VARIABLE) {

- PrepareForBailout(expr->expression(), BailoutState::TOS_REGISTER);

+ PrepareForBailout(expr->expression(), TOS_REG);

} else {

- PrepareForBailoutForId(prop->LoadId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(prop->LoadId(), TOS_REG);

}

// Inline smi case if we are in a loop.

@@ -3342,7 +3328,7 @@

// Convert old value into a number.

ToNumberStub convert_stub(isolate());

__ CallStub(&convert_stub);

- PrepareForBailoutForId(expr->ToNumberId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->ToNumberId(), TOS_REG);

// Save result for postfix expressions.

if (expr->is_postfix()) {

@@ -3390,8 +3376,7 @@

{ EffectContext context(this);

EmitVariableAssignment(expr->expression()->AsVariableProxy()->var(),

Token::ASSIGN, expr->CountSlot());

- PrepareForBailoutForId(expr->AssignmentId(),

- BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);

context.Plug(rax);

}

// For all contexts except kEffect: We have the result on

@@ -3403,8 +3388,7 @@

// Perform the assignment as if via '='.

EmitVariableAssignment(expr->expression()->AsVariableProxy()->var(),

Token::ASSIGN, expr->CountSlot());

- PrepareForBailoutForId(expr->AssignmentId(),

- BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);

context()->Plug(rax);

}

break;

@@ -3414,7 +3398,7 @@

PopOperand(StoreDescriptor::ReceiverRegister());

EmitLoadStoreICSlot(expr->CountSlot());

CallStoreIC();

- PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);

if (expr->is_postfix()) {

if (!context()->IsEffect()) {

context()->PlugTOS();

@@ -3453,7 +3437,7 @@

CodeFactory::KeyedStoreIC(isolate(), language_mode()).code();

EmitLoadStoreICSlot(expr->CountSlot());

CallIC(ic);

- PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER);

+ PrepareForBailoutForId(expr->AssignmentId(), TOS_REG);

if (expr->is_postfix()) {

if (!context()->IsEffect()) {

context()->PlugTOS();

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