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

Side by Side Diff: src/ia32/macro-assembler-ia32.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/code-stubs-hydrogen.cc ('k') | src/x64/code-stubs-x64.cc » ('j') | 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 1394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1405 int token_offset = Context::kHeaderSize + 1405 int token_offset = Context::kHeaderSize +
1406 Context::SECURITY_TOKEN_INDEX * kPointerSize; 1406 Context::SECURITY_TOKEN_INDEX * kPointerSize;
1407 mov(scratch1, FieldOperand(scratch1, token_offset)); 1407 mov(scratch1, FieldOperand(scratch1, token_offset));
1408 cmp(scratch1, FieldOperand(scratch2, token_offset)); 1408 cmp(scratch1, FieldOperand(scratch2, token_offset));
1409 j(not_equal, miss); 1409 j(not_equal, miss);
1410 1410
1411 bind(&same_contexts); 1411 bind(&same_contexts);
1412 } 1412 }
1413 1413
1414 1414
1415 // Compute the hash code from the untagged key. This must be kept in sync 1415 // Compute the hash code from the untagged key. This must be kept in sync with
1416 // with ComputeIntegerHash in utils.h. 1416 // ComputeIntegerHash in utils.h and KeyedLoadGenericElementStub in
1417 // code-stub-hydrogen.cc
1417 // 1418 //
1418 // Note: r0 will contain hash code 1419 // Note: r0 will contain hash code
1419 void MacroAssembler::GetNumberHash(Register r0, Register scratch) { 1420 void MacroAssembler::GetNumberHash(Register r0, Register scratch) {
1420 // Xor original key with a seed. 1421 // Xor original key with a seed.
1421 if (Serializer::enabled()) { 1422 if (Serializer::enabled()) {
1422 ExternalReference roots_array_start = 1423 ExternalReference roots_array_start =
1423 ExternalReference::roots_array_start(isolate()); 1424 ExternalReference::roots_array_start(isolate());
1424 mov(scratch, Immediate(Heap::kHashSeedRootIndex)); 1425 mov(scratch, Immediate(Heap::kHashSeedRootIndex));
1425 mov(scratch, 1426 mov(scratch,
1426 Operand::StaticArray(scratch, times_pointer_size, roots_array_start)); 1427 Operand::StaticArray(scratch, times_pointer_size, roots_array_start));
(...skipping 2187 matching lines...) Expand 10 before | Expand all | Expand 10 after
3614 cmp(scratch1, Immediate(DICTIONARY_ELEMENTS)); 3615 cmp(scratch1, Immediate(DICTIONARY_ELEMENTS));
3615 j(equal, found); 3616 j(equal, found);
3616 mov(current, FieldOperand(current, Map::kPrototypeOffset)); 3617 mov(current, FieldOperand(current, Map::kPrototypeOffset));
3617 cmp(current, Immediate(factory->null_value())); 3618 cmp(current, Immediate(factory->null_value()));
3618 j(not_equal, &loop_again); 3619 j(not_equal, &loop_again);
3619 } 3620 }
3620 3621
3621 } } // namespace v8::internal 3622 } } // namespace v8::internal
3622 3623
3623 #endif // V8_TARGET_ARCH_IA32 3624 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/code-stubs-hydrogen.cc ('k') | src/x64/code-stubs-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698