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

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

Issue 7063008: Merge r8007 to 2.4 branch (Closed) Base URL: http://v8.googlecode.com/svn/branches/2.4/
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 7136 matching lines...) Expand 10 before | Expand all | Expand 10 after
7147 MemOperand(scratch1, key, LSL, 7147 MemOperand(scratch1, key, LSL,
7148 kPointerSizeLog2 - (kSmiTagSize + kSmiShiftSize))); 7148 kPointerSizeLog2 - (kSmiTagSize + kSmiShiftSize)));
7149 7149
7150 // Make sure that the expected number of instructions are generated. 7150 // Make sure that the expected number of instructions are generated.
7151 ASSERT_EQ(kInlinedKeyedStoreInstructionsAfterPatch, 7151 ASSERT_EQ(kInlinedKeyedStoreInstructionsAfterPatch,
7152 masm_->InstructionsGeneratedSince(&check_inlined_codesize)); 7152 masm_->InstructionsGeneratedSince(&check_inlined_codesize));
7153 } 7153 }
7154 7154
7155 ASSERT(we_remembered_the_write_barrier); 7155 ASSERT(we_remembered_the_write_barrier);
7156 7156
7157 // Make sure that r0 holds the value which is the result of the expression.
7158 __ Move(r0, value);
7159
7157 deferred->BindExit(); 7160 deferred->BindExit();
7158 } else { 7161 } else {
7159 frame()->CallKeyedStoreIC(); 7162 frame()->CallKeyedStoreIC();
7160 } 7163 }
7161 } 7164 }
7162 7165
7163 7166
7164 #ifdef DEBUG 7167 #ifdef DEBUG
7165 bool CodeGenerator::HasValidEntryRegisters() { return true; } 7168 bool CodeGenerator::HasValidEntryRegisters() { return true; }
7166 #endif 7169 #endif
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
7317 BinaryOpIC::GetName(runtime_operands_type_)); 7320 BinaryOpIC::GetName(runtime_operands_type_));
7318 return name_; 7321 return name_;
7319 } 7322 }
7320 7323
7321 7324
7322 #undef __ 7325 #undef __
7323 7326
7324 } } // namespace v8::internal 7327 } } // namespace v8::internal
7325 7328
7326 #endif // V8_TARGET_ARCH_ARM 7329 #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