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

Side by Side Diff: src/x64/ic-x64.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
« src/objects.h ('K') | « src/utils.h ('k') | no next file » | no next file with comments »
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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 435
436 __ bind(&check_string); 436 __ bind(&check_string);
437 // The key is not a smi. 437 // The key is not a smi.
438 // Is it a string? 438 // Is it a string?
439 // rdx: receiver 439 // rdx: receiver
440 // rax: key 440 // rax: key
441 __ CmpObjectType(rax, FIRST_NONSTRING_TYPE, rcx); 441 __ CmpObjectType(rax, FIRST_NONSTRING_TYPE, rcx);
442 __ j(above_equal, &slow); 442 __ j(above_equal, &slow);
443 // Is the string an array index, with cached numeric value? 443 // Is the string an array index, with cached numeric value?
444 __ movl(rbx, FieldOperand(rax, String::kHashFieldOffset)); 444 __ movl(rbx, FieldOperand(rax, String::kHashFieldOffset));
445 __ testl(rbx, Immediate(String::kIsArrayIndexMask)); 445 __ testl(rbx, Immediate(String::kContainsCachedArrayIndexMask));
446 __ j(not_zero, &index_string); // The value in rbx is used at jump target. 446 __ j(zero, &index_string); // The value in rbx is used at jump target.
447 447
448 // Is the string a symbol? 448 // Is the string a symbol?
449 ASSERT(kSymbolTag != 0); 449 ASSERT(kSymbolTag != 0);
450 __ testb(FieldOperand(rcx, Map::kInstanceTypeOffset), 450 __ testb(FieldOperand(rcx, Map::kInstanceTypeOffset),
451 Immediate(kIsSymbolMask)); 451 Immediate(kIsSymbolMask));
452 __ j(zero, &slow); 452 __ j(zero, &slow);
453 453
454 // If the receiver is a fast-case object, check the keyed lookup 454 // If the receiver is a fast-case object, check the keyed lookup
455 // cache. Otherwise probe the dictionary leaving result in rcx. 455 // cache. Otherwise probe the dictionary leaving result in rcx.
456 __ movq(rbx, FieldOperand(rdx, JSObject::kPropertiesOffset)); 456 __ movq(rbx, FieldOperand(rdx, JSObject::kPropertiesOffset));
(...skipping 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 GenerateMiss(masm); 1581 GenerateMiss(masm);
1582 } 1582 }
1583 1583
1584 1584
1585 #undef __ 1585 #undef __
1586 1586
1587 1587
1588 } } // namespace v8::internal 1588 } } // namespace v8::internal
1589 1589
1590 #endif // V8_TARGET_ARCH_X64 1590 #endif // V8_TARGET_ARCH_X64
OLDNEW
« src/objects.h ('K') | « src/utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698