Index: src/x64/stub-cache-x64.cc |
=================================================================== |
--- src/x64/stub-cache-x64.cc (revision 5040) |
+++ src/x64/stub-cache-x64.cc (working copy) |
@@ -81,6 +81,113 @@ |
} |
+// Helper function used to check that the dictionary doesn't contain |
+// the property. This function may return false negatives, so miss_label |
+// must always call a backup property check that is complete. |
+// This function is safe to call if the receiver has fast properties. |
+// Name must be a symbol and receiver must be a heap object. |
+static void GenerateDictionaryNegativeLookup(MacroAssembler* masm, |
+ Label* miss_label, |
+ Register receiver, |
+ String* name, |
+ Register r0, |
+ Register extra) { |
+ ASSERT(name->IsSymbol()); |
+ __ IncrementCounter(&Counters::negative_lookups, 1); |
+ __ IncrementCounter(&Counters::negative_lookups_miss, 1); |
+ |
+ Label done; |
+ __ movq(r0, FieldOperand(receiver, HeapObject::kMapOffset)); |
+ |
+ const int kInterceptorOrAccessCheckNeededMask = |
+ (1 << Map::kHasNamedInterceptor) | (1 << Map::kIsAccessCheckNeeded); |
+ |
+ // Bail out if the receiver has a named interceptor or requires access checks. |
+ __ testb(FieldOperand(r0, Map::kBitFieldOffset), |
+ Immediate(kInterceptorOrAccessCheckNeededMask)); |
+ __ j(not_zero, miss_label); |
+ |
+ // Check that receiver is a JSObject. |
+ __ CmpInstanceType(r0, FIRST_JS_OBJECT_TYPE); |
+ __ j(below, miss_label); |
+ |
+ // Load properties array. |
+ Register properties = r0; |
+ __ movq(properties, FieldOperand(receiver, JSObject::kPropertiesOffset)); |
+ |
+ // Check that the properties array is a dictionary. |
+ __ CompareRoot(FieldOperand(properties, HeapObject::kMapOffset), |
+ Heap::kHashTableMapRootIndex); |
+ __ j(not_equal, miss_label); |
+ |
+ // Compute the capacity mask. |
+ const int kCapacityOffset = |
+ StringDictionary::kHeaderSize + |
+ StringDictionary::kCapacityIndex * kPointerSize; |
+ |
+ // Generate an unrolled loop that performs a few probes before |
+ // giving up. |
+ static const int kProbes = 4; |
+ const int kElementsStartOffset = |
+ StringDictionary::kHeaderSize + |
+ StringDictionary::kElementsStartIndex * kPointerSize; |
+ |
+ // If names of slots in range from 1 to kProbes - 1 for the hash value are |
+ // not equal to the name and kProbes-th slot is not used (its name is the |
+ // undefined value), it guarantees the hash table doesn't contain the |
+ // property. It's true even if some slots represent deleted properties |
+ // (their names are the null value). |
+ for (int i = 0; i < kProbes; i++) { |
+ // r0 points to properties hash. |
+ // Compute the masked index: (hash + i + i * i) & mask. |
+ if (extra.is(no_reg)) { |
+ __ push(receiver); |
+ } |
+ Register index = extra.is(no_reg) ? receiver : extra; |
+ // Capacity is smi 2^n. |
+ __ SmiToInteger32(index, FieldOperand(properties, kCapacityOffset)); |
+ __ decl(index); |
+ __ and_(index, |
+ Immediate(name->Hash() + StringDictionary::GetProbeOffset(i))); |
+ |
+ // Scale the index by multiplying by the entry size. |
+ ASSERT(StringDictionary::kEntrySize == 3); |
+ __ lea(index, Operand(index, index, times_2, 0)); // index *= 3. |
+ |
+ Register entity_name = extra.is(no_reg) ? properties : extra; |
+ // Having undefined at this place means the name is not contained. |
+ ASSERT_EQ(kSmiTagSize, 1); |
+ __ movq(entity_name, Operand(properties, index, times_pointer_size, |
+ kElementsStartOffset - kHeapObjectTag)); |
+ __ Cmp(entity_name, Factory::undefined_value()); |
+ if (extra.is(no_reg)) { |
+ // 'receiver' shares a register with 'entity_name'. |
+ __ pop(receiver); |
+ } |
+ // __ jmp(miss_label); |
+ if (i != kProbes - 1) { |
+ __ j(equal, &done); |
+ |
+ // Stop if found the property. |
+ __ Cmp(entity_name, Handle<String>(name)); |
+ __ j(equal, miss_label); |
+ |
+ if (extra.is(no_reg)) { |
+ // Restore the properties if their register was occupied by the name. |
+ __ movq(properties, |
+ FieldOperand(receiver, JSObject::kPropertiesOffset)); |
+ } |
+ } else { |
+ // Give up probing if still not found the undefined value. |
+ __ j(not_equal, miss_label); |
+ } |
+ } |
+ |
+ __ bind(&done); |
+ __ DecrementCounter(&Counters::negative_lookups_miss, 1); |
+} |
+ |
+ |
void StubCompiler::GenerateLoadMiss(MacroAssembler* masm, Code::Kind kind) { |
ASSERT(kind == Code::LOAD_IC || kind == Code::KEYED_LOAD_IC); |
Code* code = NULL; |
@@ -784,7 +891,7 @@ |
// Check that the maps haven't changed. |
CheckPrototypes(JSObject::cast(object), rdx, holder, |
- rbx, rax, name, depth, &miss); |
+ rbx, rax, name, depth, &miss, rdi); |
// Patch the receiver on the stack with the global proxy if |
// necessary. |
@@ -807,7 +914,7 @@ |
GenerateDirectLoadGlobalFunctionPrototype( |
masm(), Context::STRING_FUNCTION_INDEX, rax); |
CheckPrototypes(JSObject::cast(object->GetPrototype()), rax, holder, |
- rbx, rdx, name, &miss); |
+ rbx, rdx, name, &miss, rdi); |
} |
break; |
@@ -826,7 +933,7 @@ |
GenerateDirectLoadGlobalFunctionPrototype( |
masm(), Context::NUMBER_FUNCTION_INDEX, rax); |
CheckPrototypes(JSObject::cast(object->GetPrototype()), rax, holder, |
- rbx, rdx, name, &miss); |
+ rbx, rdx, name, &miss, rdi); |
} |
break; |
} |
@@ -847,7 +954,7 @@ |
GenerateDirectLoadGlobalFunctionPrototype( |
masm(), Context::BOOLEAN_FUNCTION_INDEX, rax); |
CheckPrototypes(JSObject::cast(object->GetPrototype()), rax, holder, |
- rbx, rdx, name, &miss); |
+ rbx, rdx, name, &miss, rdi); |
} |
break; |
} |
@@ -902,7 +1009,8 @@ |
__ JumpIfSmi(rdx, &miss); |
// Do the right check and compute the holder register. |
- Register reg = CheckPrototypes(object, rdx, holder, rbx, rax, name, &miss); |
+ Register reg = CheckPrototypes(object, rdx, holder, rbx, rax, |
+ name, &miss, rdi); |
GenerateFastPropertyLoad(masm(), rdi, reg, holder, index); |
@@ -966,7 +1074,8 @@ |
rbx, |
rax, |
name, |
- &miss); |
+ &miss, |
+ rdi); |
if (argc == 0) { |
// Noop, return the length. |
@@ -1119,7 +1228,7 @@ |
CheckPrototypes(JSObject::cast(object), rdx, |
holder, rbx, |
- rax, name, &miss); |
+ rax, name, &miss, rdi); |
// Get the elements array of the object. |
__ movq(rbx, FieldOperand(rdx, JSArray::kElementsOffset)); |
@@ -1288,7 +1397,7 @@ |
} |
// Check that the maps haven't changed. |
- CheckPrototypes(object, rdx, holder, rbx, rax, name, &miss); |
+ CheckPrototypes(object, rdx, holder, rbx, rax, name, &miss, rdi); |
// Get the value from the cell. |
__ Move(rdi, Handle<JSGlobalPropertyCell>(cell)); |
@@ -1401,7 +1510,7 @@ |
// Check the maps of the full prototype chain. Also check that |
// global property cells up to (but not including) the last object |
// in the prototype chain are empty. |
- CheckPrototypes(object, rax, last, rbx, rdx, name, &miss); |
+ CheckPrototypes(object, rax, last, rbx, rdx, name, &miss, rdi); |
// If the last object in the prototype chain is a global object, |
// check that the global property cell is empty. |
@@ -1500,7 +1609,7 @@ |
} |
// Check that the maps haven't changed. |
- CheckPrototypes(object, rax, holder, rbx, rdx, name, &miss); |
+ CheckPrototypes(object, rax, holder, rbx, rdx, name, &miss, rdi); |
// Get the value from the cell. |
__ Move(rbx, Handle<JSGlobalPropertyCell>(cell)); |
@@ -2127,36 +2236,137 @@ |
int save_at_depth, |
Label* miss, |
Register extra) { |
- // Check that the maps haven't changed. |
- Register result = |
- masm()->CheckMaps(object, |
- object_reg, |
- holder, |
- holder_reg, |
- scratch, |
- save_at_depth, |
- miss); |
+ // Make sure there's no overlap between scratch and the other |
+ // registers. |
+ ASSERT(!scratch.is(object_reg) && !scratch.is(holder_reg)); |
+ // Keep track of the current object in register reg. On the first |
+ // iteration, reg is an alias for object_reg, on later iterations, |
+ // it is an alias for holder_reg. |
+ Register reg = object_reg; |
+ int depth = 0; |
+ |
+ if (save_at_depth == depth) { |
+ __ movq(Operand(rsp, kPointerSize), object_reg); |
+ } |
+ |
+ // Check the maps in the prototype chain. |
+ // Traverse the prototype chain from the object and do map checks. |
+ JSObject* current = object; |
+ while (current != holder) { |
+ depth++; |
+ |
+ // Only global objects and objects that do not require access |
+ // checks are allowed in stubs. |
+ ASSERT(current->IsJSGlobalProxy() || !current->IsAccessCheckNeeded()); |
+ |
+ JSObject* prototype = JSObject::cast(current->GetPrototype()); |
+ if (!current->HasFastProperties() && |
+ !current->IsJSGlobalObject() && |
+ !current->IsJSGlobalProxy()) { |
+ if (!name->IsSymbol()) { |
+ Object* lookup_result = Heap::LookupSymbol(name); |
+ if (lookup_result->IsFailure()) { |
+ set_failure(Failure::cast(lookup_result)); |
+ return reg; |
+ } else { |
+ name = String::cast(lookup_result); |
+ } |
+ } |
+ ASSERT(current->property_dictionary()->FindEntry(name) == |
+ StringDictionary::kNotFound); |
+ |
+ GenerateDictionaryNegativeLookup(masm(), |
+ miss, |
+ reg, |
+ name, |
+ scratch, |
+ extra); |
+ __ movq(scratch, FieldOperand(reg, HeapObject::kMapOffset)); |
+ reg = holder_reg; // from now the object is in holder_reg |
+ __ movq(reg, FieldOperand(scratch, Map::kPrototypeOffset)); |
+ } else if (Heap::InNewSpace(prototype)) { |
+ // Get the map of the current object. |
+ __ movq(scratch, FieldOperand(reg, HeapObject::kMapOffset)); |
+ __ Cmp(scratch, Handle<Map>(current->map())); |
+ // Branch on the result of the map check. |
+ __ j(not_equal, miss); |
+ // Check access rights to the global object. This has to happen |
+ // after the map check so that we know that the object is |
+ // actually a global object. |
+ if (current->IsJSGlobalProxy()) { |
+ __ CheckAccessGlobalProxy(reg, scratch, miss); |
+ |
+ // Restore scratch register to be the map of the object. |
+ // We load the prototype from the map in the scratch register. |
+ __ movq(scratch, FieldOperand(reg, HeapObject::kMapOffset)); |
+ } |
+ // The prototype is in new space; we cannot store a reference |
+ // to it in the code. Load it from the map. |
+ reg = holder_reg; // from now the object is in holder_reg |
+ __ movq(reg, FieldOperand(scratch, Map::kPrototypeOffset)); |
+ |
+ } else { |
+ // Check the map of the current object. |
+ __ Cmp(FieldOperand(reg, HeapObject::kMapOffset), |
+ Handle<Map>(current->map())); |
+ // Branch on the result of the map check. |
+ __ j(not_equal, miss); |
+ // Check access rights to the global object. This has to happen |
+ // after the map check so that we know that the object is |
+ // actually a global object. |
+ if (current->IsJSGlobalProxy()) { |
+ __ CheckAccessGlobalProxy(reg, scratch, miss); |
+ } |
+ // The prototype is in old space; load it directly. |
+ reg = holder_reg; // from now the object is in holder_reg |
+ __ Move(reg, Handle<JSObject>(prototype)); |
+ } |
+ |
+ if (save_at_depth == depth) { |
+ __ movq(Operand(rsp, kPointerSize), reg); |
+ } |
+ |
+ // Go to the next object in the prototype chain. |
+ current = prototype; |
+ } |
+ |
+ // Check the holder map. |
+ __ Cmp(FieldOperand(reg, HeapObject::kMapOffset), Handle<Map>(holder->map())); |
+ __ j(not_equal, miss); |
+ |
+ // Log the check depth. |
+ LOG(IntEvent("check-maps-depth", depth + 1)); |
+ |
+ // Perform security check for access to the global object and return |
+ // the holder register. |
+ ASSERT(current == holder); |
+ ASSERT(current->IsJSGlobalProxy() || !current->IsAccessCheckNeeded()); |
+ if (current->IsJSGlobalProxy()) { |
+ __ CheckAccessGlobalProxy(reg, scratch, miss); |
+ } |
+ |
// If we've skipped any global objects, it's not enough to verify |
// that their maps haven't changed. We also need to check that the |
// property cell for the property is still empty. |
- while (object != holder) { |
- if (object->IsGlobalObject()) { |
+ current = object; |
+ while (current != holder) { |
+ if (current->IsGlobalObject()) { |
Object* cell = GenerateCheckPropertyCell(masm(), |
- GlobalObject::cast(object), |
+ GlobalObject::cast(current), |
name, |
scratch, |
miss); |
if (cell->IsFailure()) { |
set_failure(Failure::cast(cell)); |
- return result; |
+ return reg; |
} |
} |
- object = JSObject::cast(object->GetPrototype()); |
+ current = JSObject::cast(current->GetPrototype()); |
} |
// Return the register containing the holder. |
- return result; |
+ return reg; |
} |