src/x64/full-codegen-x64.cc - Issue 157543002: A64: Synchronize with r18581.

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

Issue 157543002: A64: Synchronize with r18581. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/a64

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

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

index a56f22388484b0b0ef1414c1d933dafcf818d7e4..c9581479cd07ecac02b783886f27acbd24f94325 100644

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

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

@@ -132,17 +132,26 @@ void FullCodeGenerator::Generate() {

}

#endif

- // Strict mode functions and builtins need to replace the receiver

- // with undefined when called as functions (without an explicit

- // receiver object). rcx is zero for method calls and non-zero for

- // function calls.

- if (!info->is_classic_mode() || info->is_native()) {

+ // Classic mode functions and builtins need to replace the receiver with the

+ // global proxy when called as functions (without an explicit receiver

+ // object).

+ if (info->is_classic_mode() && !info->is_native()) {

Label ok;

__ testq(rcx, rcx);

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

+ // +1 for return address.

StackArgumentsAccessor args(rsp, info->scope()->num_parameters());

- __ LoadRoot(kScratchRegister, Heap::kUndefinedValueRootIndex);

- __ movq(args.GetReceiverOperand(), kScratchRegister);

+ __ movq(rcx, args.GetReceiverOperand());

+ __ CompareRoot(rcx, Heap::kUndefinedValueRootIndex);

+ __ j(not_equal, &ok, Label::kNear);

+ __ movq(rcx, GlobalObjectOperand());

+ __ movq(rcx, FieldOperand(rcx, GlobalObject::kGlobalReceiverOffset));

+ __ movq(args.GetReceiverOperand(), rcx);

__ bind(&ok);

}

@@ -302,7 +311,7 @@ void FullCodeGenerator::ClearAccumulator() {

void FullCodeGenerator::EmitProfilingCounterDecrement(int delta) {

- __ movq(rbx, profiling_counter_, RelocInfo::EMBEDDED_OBJECT);

+ __ Move(rbx, profiling_counter_, RelocInfo::EMBEDDED_OBJECT);

__ SmiAddConstant(FieldOperand(rbx, Cell::kValueOffset),

Smi::FromInt(-delta));

}

@@ -310,7 +319,7 @@ void FullCodeGenerator::EmitProfilingCounterDecrement(int delta) {

void FullCodeGenerator::EmitProfilingCounterReset() {

int reset_value = FLAG_interrupt_budget;

- __ movq(rbx, profiling_counter_, RelocInfo::EMBEDDED_OBJECT);

+ __ Move(rbx, profiling_counter_, RelocInfo::EMBEDDED_OBJECT);

__ Move(kScratchRegister, Smi::FromInt(reset_value));

__ movq(FieldOperand(rbx, Cell::kValueOffset), kScratchRegister);

}

@@ -630,7 +639,7 @@ void FullCodeGenerator::DoTest(Expression* condition,

Label* if_false,

Label* fall_through) {

Handle<Code> ic = ToBooleanStub::GetUninitialized(isolate());

- CallIC(ic, RelocInfo::CODE_TARGET, condition->test_id());

+ CallIC(ic, NOT_CONTEXTUAL, condition->test_id());

__ testq(result_register(), result_register());

// The stub returns nonzero for true.

Split(not_zero, if_true, if_false, fall_through);

@@ -983,7 +992,7 @@ void FullCodeGenerator::VisitSwitchStatement(SwitchStatement* stmt) {

// Record position before stub call for type feedback.

SetSourcePosition(clause->position());

Handle<Code> ic = CompareIC::GetUninitialized(isolate(), Token::EQ_STRICT);

- CallIC(ic, RelocInfo::CODE_TARGET, clause->CompareId());

+ CallIC(ic, NOT_CONTEXTUAL, clause->CompareId());

patch_site.EmitPatchInfo();

Label skip;

@@ -1353,11 +1362,10 @@ void FullCodeGenerator::EmitLoadGlobalCheckExtensions(Variable* var,

// load IC call.

__ movq(rax, GlobalObjectOperand());

__ Move(rcx, var->name());

- Handle<Code> ic = isolate()->builtins()->LoadIC_Initialize();

- RelocInfo::Mode mode = (typeof_state == INSIDE_TYPEOF)

- ? RelocInfo::CODE_TARGET

- : RelocInfo::CODE_TARGET_CONTEXT;

- CallIC(ic, mode);

+ ContextualMode mode = (typeof_state == INSIDE_TYPEOF)

+ ? NOT_CONTEXTUAL

+ : CONTEXTUAL;

+ CallLoadIC(mode);

}

@@ -1437,8 +1445,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) {

// object on the stack.

__ Move(rcx, var->name());

__ movq(rax, GlobalObjectOperand());

- Handle<Code> ic = isolate()->builtins()->LoadIC_Initialize();

- CallIC(ic, RelocInfo::CODE_TARGET_CONTEXT);

+ CallLoadIC(CONTEXTUAL);

context()->Plug(rax);

break;

}

@@ -1652,10 +1659,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {

VisitForAccumulatorValue(value);

__ Move(rcx, key->value());

__ movq(rdx, Operand(rsp, 0));

- Handle<Code> ic = is_classic_mode()

- ? isolate()->builtins()->StoreIC_Initialize()

- : isolate()->builtins()->StoreIC_Initialize_Strict();

- CallIC(ic, RelocInfo::CODE_TARGET, key->LiteralFeedbackId());

+ CallStoreIC(NOT_CONTEXTUAL, key->LiteralFeedbackId());

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

} else {

VisitForEffect(value);

@@ -1736,8 +1740,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {

Handle<FixedArrayBase> constant_elements_values(

FixedArrayBase::cast(constant_elements->get(1)));

- AllocationSiteMode allocation_site_mode = FLAG_track_allocation_sites

- ? TRACK_ALLOCATION_SITE : DONT_TRACK_ALLOCATION_SITE;

+ AllocationSiteMode allocation_site_mode = TRACK_ALLOCATION_SITE;

if (has_constant_fast_elements && !FLAG_allocation_site_pretenuring) {

// If the only customer of allocation sites is transitioning, then

// we can turn it off if we don't have anywhere else to transition to.

@@ -2077,8 +2080,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {

__ bind(&l_loop);

__ push(rax); // save result

__ LoadRoot(rcx, Heap::kdone_stringRootIndex); // "done"

- Handle<Code> done_ic = isolate()->builtins()->LoadIC_Initialize();

- CallIC(done_ic); // result.done in rax

+ CallLoadIC(NOT_CONTEXTUAL); // result.done in rax

Handle<Code> bool_ic = ToBooleanStub::GetUninitialized(isolate());

CallIC(bool_ic);

__ testq(result_register(), result_register());

@@ -2087,8 +2089,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {

// result.value

__ pop(rax); // result

__ LoadRoot(rcx, Heap::kvalue_stringRootIndex); // "value"

- Handle<Code> value_ic = isolate()->builtins()->LoadIC_Initialize();

- CallIC(value_ic); // result.value in rax

+ CallLoadIC(NOT_CONTEXTUAL); // result.value in rax

context()->DropAndPlug(2, rax); // drop iter and g

break;

}

@@ -2234,15 +2235,14 @@ void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) {

SetSourcePosition(prop->position());

Literal* key = prop->key()->AsLiteral();

__ Move(rcx, key->value());

- Handle<Code> ic = isolate()->builtins()->LoadIC_Initialize();

- CallIC(ic, RelocInfo::CODE_TARGET, prop->PropertyFeedbackId());

+ CallLoadIC(NOT_CONTEXTUAL, prop->PropertyFeedbackId());

}

void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) {

SetSourcePosition(prop->position());

Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize();

- CallIC(ic, RelocInfo::CODE_TARGET, prop->PropertyFeedbackId());

+ CallIC(ic, NOT_CONTEXTUAL, prop->PropertyFeedbackId());

}

@@ -2264,7 +2264,7 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,

__ bind(&stub_call);

__ movq(rax, rcx);

BinaryOpICStub stub(op, mode);

- CallIC(stub.GetCode(isolate()), RelocInfo::CODE_TARGET,

+ CallIC(stub.GetCode(isolate()), NOT_CONTEXTUAL,

expr->BinaryOperationFeedbackId());

patch_site.EmitPatchInfo();

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

@@ -2314,7 +2314,7 @@ void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr,

__ pop(rdx);

BinaryOpICStub stub(op, mode);

JumpPatchSite patch_site(masm_); // unbound, signals no inlined smi code.

- CallIC(stub.GetCode(isolate()), RelocInfo::CODE_TARGET,

+ CallIC(stub.GetCode(isolate()), NOT_CONTEXTUAL,

expr->BinaryOperationFeedbackId());

patch_site.EmitPatchInfo();

context()->Plug(rax);

@@ -2353,10 +2353,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) {

__ movq(rdx, rax);

__ pop(rax); // Restore value.

__ Move(rcx, prop->key()->AsLiteral()->value());

- Handle<Code> ic = is_classic_mode()

- ? isolate()->builtins()->StoreIC_Initialize()

- : isolate()->builtins()->StoreIC_Initialize_Strict();

- CallIC(ic);

+ CallStoreIC(NOT_CONTEXTUAL);

break;

}

case KEYED_PROPERTY: {

@@ -2383,10 +2380,7 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var,

// Global var, const, or let.

__ Move(rcx, var->name());

__ movq(rdx, GlobalObjectOperand());

- Handle<Code> ic = is_classic_mode()

- ? isolate()->builtins()->StoreIC_Initialize()

- : isolate()->builtins()->StoreIC_Initialize_Strict();

- CallIC(ic, RelocInfo::CODE_TARGET_CONTEXT);

+ CallStoreIC(CONTEXTUAL);

} else if (op == Token::INIT_CONST) {

// Const initializers need a write barrier.

ASSERT(!var->IsParameter()); // No const parameters.

@@ -2477,10 +2471,7 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) {

SetSourcePosition(expr->position());

__ Move(rcx, prop->key()->AsLiteral()->value());

__ pop(rdx);

- Handle<Code> ic = is_classic_mode()

- ? isolate()->builtins()->StoreIC_Initialize()

- : isolate()->builtins()->StoreIC_Initialize_Strict();

- CallIC(ic, RelocInfo::CODE_TARGET, expr->AssignmentFeedbackId());

+ CallStoreIC(NOT_CONTEXTUAL, expr->AssignmentFeedbackId());

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

context()->Plug(rax);

@@ -2497,7 +2488,7 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) {

Handle<Code> ic = is_classic_mode()

? isolate()->builtins()->KeyedStoreIC_Initialize()

: isolate()->builtins()->KeyedStoreIC_Initialize_Strict();

- CallIC(ic, RelocInfo::CODE_TARGET, expr->AssignmentFeedbackId());

+ CallIC(ic, NOT_CONTEXTUAL, expr->AssignmentFeedbackId());

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

context()->Plug(rax);

@@ -2524,16 +2515,17 @@ void FullCodeGenerator::VisitProperty(Property* expr) {

void FullCodeGenerator::CallIC(Handle<Code> code,

- RelocInfo::Mode rmode,

+ ContextualMode mode,

TypeFeedbackId ast_id) {

ic_total_count_++;

- __ call(code, rmode, ast_id);

+ ASSERT(mode != CONTEXTUAL || ast_id.IsNone());

+ __ call(code, RelocInfo::CODE_TARGET, ast_id);

}

void FullCodeGenerator::EmitCallWithIC(Call* expr,

Handle<Object> name,

- RelocInfo::Mode mode) {

+ ContextualMode mode) {

// Code common for calls using the IC.

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

int arg_count = args->length();

@@ -2548,7 +2540,10 @@ void FullCodeGenerator::EmitCallWithIC(Call* expr,

// Call the IC initialization code.

Handle<Code> ic =

isolate()->stub_cache()->ComputeCallInitialize(arg_count, mode);

- CallIC(ic, mode, expr->CallFeedbackId());

+ TypeFeedbackId ast_id = mode == CONTEXTUAL

+ ? TypeFeedbackId::None()

+ : expr->CallFeedbackId();

+ CallIC(ic, mode, ast_id);

RecordJSReturnSite(expr);

// Restore context register.

__ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset));

@@ -2581,7 +2576,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr,

Handle<Code> ic =

isolate()->stub_cache()->ComputeKeyedCallInitialize(arg_count);

__ movq(rcx, Operand(rsp, (arg_count + 1) * kPointerSize)); // Key.

- CallIC(ic, RelocInfo::CODE_TARGET, expr->CallFeedbackId());

+ CallIC(ic, NOT_CONTEXTUAL, expr->CallFeedbackId());

RecordJSReturnSite(expr);

// Restore context register.

__ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset));

@@ -2682,7 +2677,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {

}

// Record source position for debugger.

SetSourcePosition(expr->position());

- CallFunctionStub stub(arg_count, RECEIVER_MIGHT_BE_IMPLICIT);

+ CallFunctionStub stub(arg_count, NO_CALL_FUNCTION_FLAGS);

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

__ CallStub(&stub);

RecordJSReturnSite(expr);

@@ -2693,7 +2688,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {

// Call to a global variable. Push global object as receiver for the

// call IC lookup.

__ push(GlobalObjectOperand());

- EmitCallWithIC(expr, proxy->name(), RelocInfo::CODE_TARGET_CONTEXT);

+ EmitCallWithIC(expr, proxy->name(), CONTEXTUAL);

} else if (proxy != NULL && proxy->var()->IsLookupSlot()) {

// Call to a lookup slot (dynamically introduced variable).

Label slow, done;

@@ -2722,14 +2717,13 @@ void FullCodeGenerator::VisitCall(Call* expr) {

__ push(rax);

// The receiver is implicitly the global receiver. Indicate this by

// passing the hole to the call function stub.

- __ PushRoot(Heap::kTheHoleValueRootIndex);

+ __ PushRoot(Heap::kUndefinedValueRootIndex);

__ bind(&call);

}

// The receiver is either the global receiver or an object found by

- // LoadContextSlot. That object could be the hole if the receiver is

- // implicitly the global object.

- EmitCallWithStub(expr, RECEIVER_MIGHT_BE_IMPLICIT);

+ // LoadContextSlot.

+ EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS);

} else if (property != NULL) {

{ PreservePositionScope scope(masm()->positions_recorder());

VisitForStackValue(property->obj());

@@ -2737,7 +2731,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {

if (property->key()->IsPropertyName()) {

EmitCallWithIC(expr,

property->key()->AsLiteral()->value(),

- RelocInfo::CODE_TARGET);

+ NOT_CONTEXTUAL);

} else {

EmitKeyedCallWithIC(expr, property->key());

}

@@ -2746,9 +2740,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {

{ PreservePositionScope scope(masm()->positions_recorder());

VisitForStackValue(callee);

}

- // Load global receiver object.

- __ movq(rbx, GlobalObjectOperand());

- __ push(FieldOperand(rbx, GlobalObject::kGlobalReceiverOffset));

+ __ PushRoot(Heap::kUndefinedValueRootIndex);

// Emit function call.

EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS);

}

@@ -3356,7 +3348,7 @@ void FullCodeGenerator::EmitDateField(CallRuntime* expr) {

__ bind(&runtime);

__ PrepareCallCFunction(2);

__ movq(arg_reg_1, object);

- __ movq(arg_reg_2, index, RelocInfo::NONE64);

+ __ Move(arg_reg_2, index, RelocInfo::NONE64);

__ CallCFunction(ExternalReference::get_date_field_function(isolate()), 2);

__ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset));

__ jmp(&done);

@@ -3676,7 +3668,7 @@ void FullCodeGenerator::EmitCallFunction(CallRuntime* expr) {

__ movq(rdi, result_register());

ParameterCount count(arg_count);

__ InvokeFunction(rdi, count, CALL_FUNCTION,

- NullCallWrapper(), CALL_AS_METHOD);

+ NullCallWrapper(), CALL_AS_FUNCTION);

__ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset));

__ jmp(&done);

@@ -4146,7 +4138,7 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) {

if (expr->is_jsruntime()) {

// Call the JS runtime function using a call IC.

__ Move(rcx, expr->name());

- RelocInfo::Mode mode = RelocInfo::CODE_TARGET;

+ ContextualMode mode = NOT_CONTEXTUAL;

Handle<Code> ic =

isolate()->stub_cache()->ComputeCallInitialize(arg_count, mode);

CallIC(ic, mode, expr->CallRuntimeFeedbackId());

@@ -4400,7 +4392,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {

__ Move(rax, Smi::FromInt(1));

BinaryOpICStub stub(expr->binary_op(), NO_OVERWRITE);

CallIC(stub.GetCode(isolate()),

- RelocInfo::CODE_TARGET,

+ NOT_CONTEXTUAL,

expr->CountBinOpFeedbackId());

patch_site.EmitPatchInfo();

__ bind(&done);

@@ -4432,10 +4424,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {

case NAMED_PROPERTY: {

__ Move(rcx, prop->key()->AsLiteral()->value());

__ pop(rdx);

- Handle<Code> ic = is_classic_mode()

- ? isolate()->builtins()->StoreIC_Initialize()

- : isolate()->builtins()->StoreIC_Initialize_Strict();

- CallIC(ic, RelocInfo::CODE_TARGET, expr->CountStoreFeedbackId());

+ CallStoreIC(NOT_CONTEXTUAL, expr->CountStoreFeedbackId());

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

if (expr->is_postfix()) {

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

@@ -4452,7 +4441,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {

Handle<Code> ic = is_classic_mode()

? isolate()->builtins()->KeyedStoreIC_Initialize()

: isolate()->builtins()->KeyedStoreIC_Initialize_Strict();

- CallIC(ic, RelocInfo::CODE_TARGET, expr->CountStoreFeedbackId());

+ CallIC(ic, NOT_CONTEXTUAL, expr->CountStoreFeedbackId());

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

if (expr->is_postfix()) {

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

@@ -4476,10 +4465,9 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) {

Comment cmnt(masm_, "Global variable");

__ Move(rcx, proxy->name());

__ movq(rax, GlobalObjectOperand());

- Handle<Code> ic = isolate()->builtins()->LoadIC_Initialize();

// Use a regular load, not a contextual load, to avoid a reference

// error.

- CallIC(ic);

+ CallLoadIC(NOT_CONTEXTUAL);

PrepareForBailout(expr, TOS_REG);

context()->Plug(rax);

} else if (proxy != NULL && proxy->var()->IsLookupSlot()) {

@@ -4641,7 +4629,7 @@ void FullCodeGenerator::VisitCompareOperation(CompareOperation* expr) {

// Record position and call the compare IC.

SetSourcePosition(expr->position());

Handle<Code> ic = CompareIC::GetUninitialized(isolate(), op);

- CallIC(ic, RelocInfo::CODE_TARGET, expr->CompareOperationFeedbackId());

+ CallIC(ic, NOT_CONTEXTUAL, expr->CompareOperationFeedbackId());

patch_site.EmitPatchInfo();

PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);

@@ -4676,7 +4664,7 @@ void FullCodeGenerator::EmitLiteralCompareNil(CompareOperation* expr,

Split(equal, if_true, if_false, fall_through);

} else {

Handle<Code> ic = CompareNilICStub::GetUninitialized(isolate(), nil);

- CallIC(ic, RelocInfo::CODE_TARGET, expr->CompareOperationFeedbackId());

+ CallIC(ic, NOT_CONTEXTUAL, expr->CompareOperationFeedbackId());

__ testq(rax, rax);

Split(not_zero, if_true, if_false, fall_through);

}

« no previous file with comments | « src/x64/frames-x64.cc ('k') | src/x64/ic-x64.cc » ('j') | no next file with comments »