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

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

Issue 7067003: Merge r8007 to 2.3 branch (Closed) Base URL: http://v8.googlecode.com/svn/branches/2.3/
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 6909 matching lines...) Expand 10 before | Expand all | Expand 10 after
6920 MemOperand(scratch1, key, LSL, 6920 MemOperand(scratch1, key, LSL,
6921 kPointerSizeLog2 - (kSmiTagSize + kSmiShiftSize))); 6921 kPointerSizeLog2 - (kSmiTagSize + kSmiShiftSize)));
6922 6922
6923 // Make sure that the expected number of instructions are generated. 6923 // Make sure that the expected number of instructions are generated.
6924 ASSERT_EQ(kInlinedKeyedStoreInstructionsAfterPatch, 6924 ASSERT_EQ(kInlinedKeyedStoreInstructionsAfterPatch,
6925 masm_->InstructionsGeneratedSince(&check_inlined_codesize)); 6925 masm_->InstructionsGeneratedSince(&check_inlined_codesize));
6926 } 6926 }
6927 6927
6928 ASSERT(we_remembered_the_write_barrier); 6928 ASSERT(we_remembered_the_write_barrier);
6929 6929
6930 // Make sure that r0 holds the value which is the result of the expression.
6931 __ Move(r0, value);
6932
6930 deferred->BindExit(); 6933 deferred->BindExit();
6931 } else { 6934 } else {
6932 frame()->CallKeyedStoreIC(); 6935 frame()->CallKeyedStoreIC();
6933 } 6936 }
6934 } 6937 }
6935 6938
6936 6939
6937 #ifdef DEBUG 6940 #ifdef DEBUG
6938 bool CodeGenerator::HasValidEntryRegisters() { return true; } 6941 bool CodeGenerator::HasValidEntryRegisters() { return true; }
6939 #endif 6942 #endif
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
7090 BinaryOpIC::GetName(runtime_operands_type_)); 7093 BinaryOpIC::GetName(runtime_operands_type_));
7091 return name_; 7094 return name_;
7092 } 7095 }
7093 7096
7094 7097
7095 #undef __ 7098 #undef __
7096 7099
7097 } } // namespace v8::internal 7100 } } // namespace v8::internal
7098 7101
7099 #endif // V8_TARGET_ARCH_ARM 7102 #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