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

Side by Side Diff: src/x64/macro-assembler-x64.cc

Issue 73923004: Correct r17804 to match latest version of uploaded CL (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « src/x64/code-stubs-x64.cc ('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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 3888 matching lines...) Expand 10 before | Expand all | Expand 10 after
3899 int token_offset = 3899 int token_offset =
3900 Context::kHeaderSize + Context::SECURITY_TOKEN_INDEX * kPointerSize; 3900 Context::kHeaderSize + Context::SECURITY_TOKEN_INDEX * kPointerSize;
3901 movq(scratch, FieldOperand(scratch, token_offset)); 3901 movq(scratch, FieldOperand(scratch, token_offset));
3902 cmpq(scratch, FieldOperand(kScratchRegister, token_offset)); 3902 cmpq(scratch, FieldOperand(kScratchRegister, token_offset));
3903 j(not_equal, miss); 3903 j(not_equal, miss);
3904 3904
3905 bind(&same_contexts); 3905 bind(&same_contexts);
3906 } 3906 }
3907 3907
3908 3908
3909 // Compute the hash code from the untagged key. This must be kept in sync with
3910 // ComputeIntegerHash in utils.h and KeyedLoadGenericElementStub in
3911 // code-stub-hydrogen.cc
3909 void MacroAssembler::GetNumberHash(Register r0, Register scratch) { 3912 void MacroAssembler::GetNumberHash(Register r0, Register scratch) {
3910 // First of all we assign the hash seed to scratch. 3913 // First of all we assign the hash seed to scratch.
3911 LoadRoot(scratch, Heap::kHashSeedRootIndex); 3914 LoadRoot(scratch, Heap::kHashSeedRootIndex);
3912 SmiToInteger32(scratch, scratch); 3915 SmiToInteger32(scratch, scratch);
3913 3916
3914 // Xor original key with a seed. 3917 // Xor original key with a seed.
3915 xorl(r0, scratch); 3918 xorl(r0, scratch);
3916 3919
3917 // Compute the hash code from the untagged key. This must be kept in sync 3920 // Compute the hash code from the untagged key. This must be kept in sync
3918 // with ComputeIntegerHash in utils.h. 3921 // with ComputeIntegerHash in utils.h.
(...skipping 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
4982 j(equal, found); 4985 j(equal, found);
4983 movq(current, FieldOperand(current, Map::kPrototypeOffset)); 4986 movq(current, FieldOperand(current, Map::kPrototypeOffset));
4984 CompareRoot(current, Heap::kNullValueRootIndex); 4987 CompareRoot(current, Heap::kNullValueRootIndex);
4985 j(not_equal, &loop_again); 4988 j(not_equal, &loop_again);
4986 } 4989 }
4987 4990
4988 4991
4989 } } // namespace v8::internal 4992 } } // namespace v8::internal
4990 4993
4991 #endif // V8_TARGET_ARCH_X64 4994 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/code-stubs-x64.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698