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

Side by Side Diff: src/codegen.cc

Issue 7172030: Revert "Merge arguments branch to bleeding merge." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 6 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 | « src/code-stubs.h ('k') | src/compiler.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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 } 202 }
203 return false; 203 return false;
204 } 204 }
205 205
206 206
207 void ArgumentsAccessStub::Generate(MacroAssembler* masm) { 207 void ArgumentsAccessStub::Generate(MacroAssembler* masm) {
208 switch (type_) { 208 switch (type_) {
209 case READ_ELEMENT: 209 case READ_ELEMENT:
210 GenerateReadElement(masm); 210 GenerateReadElement(masm);
211 break; 211 break;
212 case NEW_NON_STRICT_FAST: 212 case NEW_NON_STRICT:
213 GenerateNewNonStrictFast(masm);
214 break;
215 case NEW_NON_STRICT_SLOW:
216 GenerateNewNonStrictSlow(masm);
217 break;
218 case NEW_STRICT: 213 case NEW_STRICT:
219 GenerateNewStrict(masm); 214 GenerateNewObject(masm);
220 break; 215 break;
221 } 216 }
222 } 217 }
223 218
224 219
225 int CEntryStub::MinorKey() { 220 int CEntryStub::MinorKey() {
226 ASSERT(result_size_ == 1 || result_size_ == 2); 221 ASSERT(result_size_ == 1 || result_size_ == 2);
227 int result = save_doubles_ ? 1 : 0; 222 int result = save_doubles_ ? 1 : 0;
228 #ifdef _WIN64 223 #ifdef _WIN64
229 return result | ((result_size_ == 1) ? 0 : 2); 224 return result | ((result_size_ == 1) ? 0 : 2);
230 #else 225 #else
231 return result; 226 return result;
232 #endif 227 #endif
233 } 228 }
234 229
235 230
236 } } // namespace v8::internal 231 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/code-stubs.h ('k') | src/compiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698