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

Side by Side Diff: src/arm/codegen-arm.cc

Issue 7066008: Merge r8007 to 2.2 branch (Closed) Base URL: http://v8.googlecode.com/svn/branches/2.2/
Patch Set: Created 9 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | src/version.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 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 6482 matching lines...) Expand 10 before | Expand all | Expand 10 after
6493 MemOperand(scratch1, key, LSL, 6493 MemOperand(scratch1, key, LSL,
6494 kPointerSizeLog2 - (kSmiTagSize + kSmiShiftSize))); 6494 kPointerSizeLog2 - (kSmiTagSize + kSmiShiftSize)));
6495 6495
6496 // Make sure that the expected number of instructions are generated. 6496 // Make sure that the expected number of instructions are generated.
6497 ASSERT_EQ(kInlinedKeyedStoreInstructionsAfterPatch, 6497 ASSERT_EQ(kInlinedKeyedStoreInstructionsAfterPatch,
6498 masm_->InstructionsGeneratedSince(&check_inlined_codesize)); 6498 masm_->InstructionsGeneratedSince(&check_inlined_codesize));
6499 } 6499 }
6500 6500
6501 ASSERT(we_remembered_the_write_barrier); 6501 ASSERT(we_remembered_the_write_barrier);
6502 6502
6503 // Make sure that r0 holds the value which is the result of the expression.
6504 __ Move(r0, value);
6505
6503 deferred->BindExit(); 6506 deferred->BindExit();
6504 } else { 6507 } else {
6505 frame()->CallKeyedStoreIC(); 6508 frame()->CallKeyedStoreIC();
6506 } 6509 }
6507 } 6510 }
6508 6511
6509 6512
6510 #ifdef DEBUG 6513 #ifdef DEBUG
6511 bool CodeGenerator::HasValidEntryRegisters() { return true; } 6514 bool CodeGenerator::HasValidEntryRegisters() { return true; }
6512 #endif 6515 #endif
(...skipping 4751 matching lines...) Expand 10 before | Expand all | Expand 10 after
11264 __ bind(&string_add_runtime); 11267 __ bind(&string_add_runtime);
11265 __ TailCallRuntime(Runtime::kStringAdd, 2, 1); 11268 __ TailCallRuntime(Runtime::kStringAdd, 2, 1);
11266 } 11269 }
11267 11270
11268 11271
11269 #undef __ 11272 #undef __
11270 11273
11271 } } // namespace v8::internal 11274 } } // namespace v8::internal
11272 11275
11273 #endif // V8_TARGET_ARCH_ARM 11276 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698