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

Side by Side Diff: src/codegen.cc

Issue 7945009: Merge experimental/gc branch to the bleeding_edge. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 3 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.cc ('k') | src/compiler-intrinsics.h » ('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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 GenerateNewNonStrictSlow(masm); 211 GenerateNewNonStrictSlow(masm);
212 break; 212 break;
213 case NEW_STRICT: 213 case NEW_STRICT:
214 GenerateNewStrict(masm); 214 GenerateNewStrict(masm);
215 break; 215 break;
216 } 216 }
217 } 217 }
218 218
219 219
220 int CEntryStub::MinorKey() { 220 int CEntryStub::MinorKey() {
221 int result = (save_doubles_ == kSaveFPRegs) ? 1 : 0;
221 ASSERT(result_size_ == 1 || result_size_ == 2); 222 ASSERT(result_size_ == 1 || result_size_ == 2);
222 int result = save_doubles_ ? 1 : 0;
223 #ifdef _WIN64 223 #ifdef _WIN64
224 return result | ((result_size_ == 1) ? 0 : 2); 224 return result | ((result_size_ == 1) ? 0 : 2);
225 #else 225 #else
226 return result; 226 return result;
227 #endif 227 #endif
228 } 228 }
229 229
230 230
231 } } // namespace v8::internal 231 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/code-stubs.cc ('k') | src/compiler-intrinsics.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698