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

Side by Side Diff: src/x64/full-codegen-x64.cc

Issue 6060009: Merge bleeding edge r6036 to 2.5 branch: Fix x64 compilation. (Closed) Base URL: http://v8.googlecode.com/svn/branches/2.5/
Patch Set: Created 9 years, 11 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/version.cc ('k') | no next file » | 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 191
192 { Comment cmnt(masm_, "[ return <undefined>;"); 192 { Comment cmnt(masm_, "[ return <undefined>;");
193 // Emit a 'return undefined' in case control fell off the end of the body. 193 // Emit a 'return undefined' in case control fell off the end of the body.
194 __ LoadRoot(rax, Heap::kUndefinedValueRootIndex); 194 __ LoadRoot(rax, Heap::kUndefinedValueRootIndex);
195 EmitReturnSequence(); 195 EmitReturnSequence();
196 } 196 }
197 } 197 }
198 198
199 199
200 void FullCodeGenerator::ClearAccumulator() { 200 void FullCodeGenerator::ClearAccumulator() {
201 __ xor(rax, rax); 201 __ xor_(rax, rax);
202 } 202 }
203 203
204 204
205 void FullCodeGenerator::EmitReturnSequence() { 205 void FullCodeGenerator::EmitReturnSequence() {
206 Comment cmnt(masm_, "[ Return sequence"); 206 Comment cmnt(masm_, "[ Return sequence");
207 if (return_label_.is_bound()) { 207 if (return_label_.is_bound()) {
208 __ jmp(&return_label_); 208 __ jmp(&return_label_);
209 } else { 209 } else {
210 __ bind(&return_label_); 210 __ bind(&return_label_);
211 if (FLAG_trace) { 211 if (FLAG_trace) {
(...skipping 3262 matching lines...) Expand 10 before | Expand all | Expand 10 after
3474 __ ret(0); 3474 __ ret(0);
3475 } 3475 }
3476 3476
3477 3477
3478 #undef __ 3478 #undef __
3479 3479
3480 3480
3481 } } // namespace v8::internal 3481 } } // namespace v8::internal
3482 3482
3483 #endif // V8_TARGET_ARCH_X64 3483 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/version.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698