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

Side by Side Diff: src/arm/ic-arm.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 | « no previous file | src/ia32/ic-ia32.cc » ('j') | src/objects.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 __ bind(&check_string); 827 __ bind(&check_string);
828 // The key is not a smi. 828 // The key is not a smi.
829 // Is it a string? 829 // Is it a string?
830 // r0: key 830 // r0: key
831 // r1: receiver 831 // r1: receiver
832 __ CompareObjectType(r0, r2, r3, FIRST_NONSTRING_TYPE); 832 __ CompareObjectType(r0, r2, r3, FIRST_NONSTRING_TYPE);
833 __ b(ge, &slow); 833 __ b(ge, &slow);
834 834
835 // Is the string an array index, with cached numeric value? 835 // Is the string an array index, with cached numeric value?
836 __ ldr(r3, FieldMemOperand(r0, String::kHashFieldOffset)); 836 __ ldr(r3, FieldMemOperand(r0, String::kHashFieldOffset));
837 __ tst(r3, Operand(String::kIsArrayIndexMask)); 837 __ tst(r3, Operand(String::kContainsCachedArrayIndexMask));
838 __ b(ne, &index_string); 838 __ b(eq, &index_string);
839 839
840 // Is the string a symbol? 840 // Is the string a symbol?
841 // r2: key map 841 // r2: key map
842 __ ldrb(r3, FieldMemOperand(r2, Map::kInstanceTypeOffset)); 842 __ ldrb(r3, FieldMemOperand(r2, Map::kInstanceTypeOffset));
843 ASSERT(kSymbolTag != 0); 843 ASSERT(kSymbolTag != 0);
844 __ tst(r3, Operand(kIsSymbolMask)); 844 __ tst(r3, Operand(kIsSymbolMask));
845 __ b(eq, &slow); 845 __ b(eq, &slow);
846 846
847 // If the receiver is a fast-case object, check the keyed lookup 847 // If the receiver is a fast-case object, check the keyed lookup
848 // cache. Otherwise probe the dictionary. 848 // cache. Otherwise probe the dictionary.
(...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after
1925 GenerateMiss(masm); 1925 GenerateMiss(masm);
1926 } 1926 }
1927 1927
1928 1928
1929 #undef __ 1929 #undef __
1930 1930
1931 1931
1932 } } // namespace v8::internal 1932 } } // namespace v8::internal
1933 1933
1934 #endif // V8_TARGET_ARCH_ARM 1934 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/ia32/ic-ia32.cc » ('j') | src/objects.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698