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

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

Issue 7064004: Merge r8007 to 3.0 branch (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.0/
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 7185 matching lines...) Expand 10 before | Expand all | Expand 10 after
7196 MemOperand(scratch1, key, LSL, 7196 MemOperand(scratch1, key, LSL,
7197 kPointerSizeLog2 - (kSmiTagSize + kSmiShiftSize))); 7197 kPointerSizeLog2 - (kSmiTagSize + kSmiShiftSize)));
7198 7198
7199 // Make sure that the expected number of instructions are generated. 7199 // Make sure that the expected number of instructions are generated.
7200 ASSERT_EQ(kInlinedKeyedStoreInstructionsAfterPatch, 7200 ASSERT_EQ(kInlinedKeyedStoreInstructionsAfterPatch,
7201 masm_->InstructionsGeneratedSince(&check_inlined_codesize)); 7201 masm_->InstructionsGeneratedSince(&check_inlined_codesize));
7202 } 7202 }
7203 7203
7204 ASSERT(we_remembered_the_write_barrier); 7204 ASSERT(we_remembered_the_write_barrier);
7205 7205
7206 // Make sure that r0 holds the value which is the result of the expression.
7207 __ Move(r0, value);
7208
7206 deferred->BindExit(); 7209 deferred->BindExit();
7207 } else { 7210 } else {
7208 frame()->CallKeyedStoreIC(); 7211 frame()->CallKeyedStoreIC();
7209 } 7212 }
7210 } 7213 }
7211 7214
7212 7215
7213 #ifdef DEBUG 7216 #ifdef DEBUG
7214 bool CodeGenerator::HasValidEntryRegisters() { return true; } 7217 bool CodeGenerator::HasValidEntryRegisters() { return true; }
7215 #endif 7218 #endif
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
7366 BinaryOpIC::GetName(runtime_operands_type_)); 7369 BinaryOpIC::GetName(runtime_operands_type_));
7367 return name_; 7370 return name_;
7368 } 7371 }
7369 7372
7370 7373
7371 #undef __ 7374 #undef __
7372 7375
7373 } } // namespace v8::internal 7376 } } // namespace v8::internal
7374 7377
7375 #endif // V8_TARGET_ARCH_ARM 7378 #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