Chromium Code Reviews| Index: runtime/vm/stub_code_x64.cc |
| diff --git a/runtime/vm/stub_code_x64.cc b/runtime/vm/stub_code_x64.cc |
| index 99393ac530d2f1b6f8c89084f09940461a46db27..b5ac6b55af9437cdae2c14f80b3c5a07b605c65d 100644 |
| --- a/runtime/vm/stub_code_x64.cc |
| +++ b/runtime/vm/stub_code_x64.cc |
| @@ -2016,6 +2016,8 @@ void StubCode::GenerateOptimizedIdenticalWithNumberCheckStub( |
| // CODE_REG: target Code |
| // R10: arguments descriptor |
| void StubCode::GenerateMegamorphicLookupStub(Assembler* assembler) { |
| + __ NoMonomorphicCheckedEntry(); |
| + |
| // Jump if receiver is a smi. |
| Label smi_case; |
| __ testq(RDI, Immediate(kSmiTagMask)); |
| @@ -2062,8 +2064,7 @@ void StubCode::GenerateMegamorphicLookupStub(Assembler* assembler) { |
| FieldAddress(RBX, MegamorphicCache::arguments_descriptor_offset())); |
| __ movq(RCX, FieldAddress(RAX, Function::entry_point_offset())); |
| __ movq(CODE_REG, FieldAddress(RAX, Function::code_offset())); |
| - |
| - __ ret(); |
| + __ jmp(RCX); |
| // Probe failed, check if it is a miss. |
| __ Bind(&probe_failed); |
| @@ -2089,6 +2090,8 @@ void StubCode::GenerateMegamorphicLookupStub(Assembler* assembler) { |
| // CODE_REG: target Code object |
| // R10: arguments descriptor |
| void StubCode::GenerateICLookupThroughFunctionStub(Assembler* assembler) { |
| + __ NoMonomorphicCheckedEntry(); |
| + |
| Label loop, found, miss; |
| __ movq(R13, FieldAddress(RBX, ICData::ic_data_offset())); |
| @@ -2116,17 +2119,19 @@ void StubCode::GenerateICLookupThroughFunctionStub(Assembler* assembler) { |
| __ movq(RAX, Address(R13, target_offset)); |
| __ movq(RCX, FieldAddress(RAX, Function::entry_point_offset())); |
| __ movq(CODE_REG, FieldAddress(RAX, Function::code_offset())); |
| - __ ret(); |
| + __ jmp(RCX); |
| __ Bind(&miss); |
| __ LoadIsolate(RAX); |
| __ movq(CODE_REG, Address(RAX, Isolate::ic_miss_code_offset())); |
| __ movq(RCX, FieldAddress(CODE_REG, Code::entry_point_offset())); |
| - __ ret(); |
| + __ jmp(RCX); |
| } |
| void StubCode::GenerateICLookupThroughCodeStub(Assembler* assembler) { |
| + __ NoMonomorphicCheckedEntry(); |
| + |
| Label loop, found, miss; |
| __ movq(R13, FieldAddress(RBX, ICData::ic_data_offset())); |
| @@ -2154,13 +2159,33 @@ void StubCode::GenerateICLookupThroughCodeStub(Assembler* assembler) { |
| const intptr_t entry_offset = ICData::EntryPointIndexFor(1) * kWordSize; |
| __ movq(RCX, Address(R13, entry_offset)); |
| __ movq(CODE_REG, Address(R13, code_offset)); |
| - __ ret(); |
| + __ jmp(RCX); |
| __ Bind(&miss); |
| __ LoadIsolate(RAX); |
| __ movq(CODE_REG, Address(RAX, Isolate::ic_miss_code_offset())); |
| __ movq(RCX, FieldAddress(CODE_REG, Code::entry_point_offset())); |
| - __ ret(); |
| + __ jmp(RCX); |
| +} |
| + |
| + |
| + |
| +// RDI: receiver |
| +void StubCode::GenerateMonomorphicMissStub(Assembler* assembler) { |
| + __ EnterStubFrame(); |
| + __ pushq(RDI); // Preserve receiver. |
| + |
| + __ PushObject(Object::null_object()); // Result. |
| + __ pushq(RDI); // Arg0: Receiver / stub out |
|
Florian Schneider
2016/08/10 02:32:14
formatting: align //
rmacnak
2016/08/11 00:17:49
Done.
|
| + __ CallRuntime(kMonomorphicMissRuntimeEntry, 1); |
| + __ popq(CODE_REG); |
| + __ popq(RBX); // result = IC |
| + |
| + __ popq(RDI); // Restore receiver. |
| + __ LeaveStubFrame(); |
| + |
| + __ movq(RCX, FieldAddress(CODE_REG, Code::checked_entry_point_offset())); |
| + __ jmp(RCX); |
| } |