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

Side by Side Diff: src/arm/macro-assembler-arm.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 | « no previous file | src/code-stubs-hydrogen.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 1482 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 1493
1494 ldr(scratch, FieldMemOperand(scratch, token_offset)); 1494 ldr(scratch, FieldMemOperand(scratch, token_offset));
1495 ldr(ip, FieldMemOperand(ip, token_offset)); 1495 ldr(ip, FieldMemOperand(ip, token_offset));
1496 cmp(scratch, Operand(ip)); 1496 cmp(scratch, Operand(ip));
1497 b(ne, miss); 1497 b(ne, miss);
1498 1498
1499 bind(&same_contexts); 1499 bind(&same_contexts);
1500 } 1500 }
1501 1501
1502 1502
1503 // Compute the hash code from the untagged key. This must be kept in sync with
1504 // ComputeIntegerHash in utils.h and KeyedLoadGenericElementStub in
1505 // code-stub-hydrogen.cc
1503 void MacroAssembler::GetNumberHash(Register t0, Register scratch) { 1506 void MacroAssembler::GetNumberHash(Register t0, Register scratch) {
1504 // First of all we assign the hash seed to scratch. 1507 // First of all we assign the hash seed to scratch.
1505 LoadRoot(scratch, Heap::kHashSeedRootIndex); 1508 LoadRoot(scratch, Heap::kHashSeedRootIndex);
1506 SmiUntag(scratch); 1509 SmiUntag(scratch);
1507 1510
1508 // Xor original key with a seed. 1511 // Xor original key with a seed.
1509 eor(t0, t0, Operand(scratch)); 1512 eor(t0, t0, Operand(scratch));
1510 1513
1511 // Compute the hash code from the untagged key. This must be kept in sync 1514 // Compute the hash code from the untagged key. This must be kept in sync
1512 // with ComputeIntegerHash in utils.h. 1515 // with ComputeIntegerHash in utils.h.
(...skipping 2446 matching lines...) Expand 10 before | Expand all | Expand 10 after
3959 void CodePatcher::EmitCondition(Condition cond) { 3962 void CodePatcher::EmitCondition(Condition cond) {
3960 Instr instr = Assembler::instr_at(masm_.pc_); 3963 Instr instr = Assembler::instr_at(masm_.pc_);
3961 instr = (instr & ~kCondMask) | cond; 3964 instr = (instr & ~kCondMask) | cond;
3962 masm_.emit(instr); 3965 masm_.emit(instr);
3963 } 3966 }
3964 3967
3965 3968
3966 } } // namespace v8::internal 3969 } } // namespace v8::internal
3967 3970
3968 #endif // V8_TARGET_ARCH_ARM 3971 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/code-stubs-hydrogen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698