Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Side by Side Diff: src/ia32/ic-ia32.cc

Issue 2701003: Revert r4782. Fix issues 728, 732. (Closed)
Patch Set: fix review remarks, add static checks Created 10 years, 6 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 unified diff | Download patch
« no previous file with comments | « src/arm/ic-arm.cc ('k') | src/objects.h » ('j') | src/objects.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 397
398 __ bind(&check_string); 398 __ bind(&check_string);
399 // The key is not a smi. 399 // The key is not a smi.
400 // Is it a string? 400 // Is it a string?
401 // edx: receiver 401 // edx: receiver
402 // eax: key 402 // eax: key
403 __ CmpObjectType(eax, FIRST_NONSTRING_TYPE, ecx); 403 __ CmpObjectType(eax, FIRST_NONSTRING_TYPE, ecx);
404 __ j(above_equal, &slow); 404 __ j(above_equal, &slow);
405 // Is the string an array index, with cached numeric value? 405 // Is the string an array index, with cached numeric value?
406 __ mov(ebx, FieldOperand(eax, String::kHashFieldOffset)); 406 __ mov(ebx, FieldOperand(eax, String::kHashFieldOffset));
407 __ test(ebx, Immediate(String::kIsArrayIndexMask)); 407 __ test(ebx, Immediate(String::kContainsCachedArrayIndexMask));
408 __ j(not_zero, &index_string, not_taken); 408 __ j(zero, &index_string, not_taken);
409 409
410 // Is the string a symbol? 410 // Is the string a symbol?
411 // ecx: key map. 411 // ecx: key map.
412 ASSERT(kSymbolTag != 0); 412 ASSERT(kSymbolTag != 0);
413 __ test_b(FieldOperand(ecx, Map::kInstanceTypeOffset), kIsSymbolMask); 413 __ test_b(FieldOperand(ecx, Map::kInstanceTypeOffset), kIsSymbolMask);
414 __ j(zero, &slow, not_taken); 414 __ j(zero, &slow, not_taken);
415 415
416 // If the receiver is a fast-case object, check the keyed lookup 416 // If the receiver is a fast-case object, check the keyed lookup
417 // cache. Otherwise probe the dictionary. 417 // cache. Otherwise probe the dictionary.
418 __ mov(ebx, FieldOperand(edx, JSObject::kPropertiesOffset)); 418 __ mov(ebx, FieldOperand(edx, JSObject::kPropertiesOffset));
(...skipping 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1615 ExternalReference ref = ExternalReference(IC_Utility(kKeyedStoreIC_Miss)); 1615 ExternalReference ref = ExternalReference(IC_Utility(kKeyedStoreIC_Miss));
1616 __ TailCallExternalReference(ref, 3, 1); 1616 __ TailCallExternalReference(ref, 3, 1);
1617 } 1617 }
1618 1618
1619 #undef __ 1619 #undef __
1620 1620
1621 1621
1622 } } // namespace v8::internal 1622 } } // namespace v8::internal
1623 1623
1624 #endif // V8_TARGET_ARCH_IA32 1624 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/arm/ic-arm.cc ('k') | src/objects.h » ('j') | src/objects.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698