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

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

Issue 6093004: Merge bleeding edge r6036 to 2.4 branch: Fix x64 compilation. (Closed) Base URL: http://v8.googlecode.com/svn/branches/2.4/
Patch Set: Created 9 years, 12 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 184
185 { Comment cmnt(masm_, "[ return <undefined>;"); 185 { Comment cmnt(masm_, "[ return <undefined>;");
186 // Emit a 'return undefined' in case control fell off the end of the body. 186 // Emit a 'return undefined' in case control fell off the end of the body.
187 __ LoadRoot(rax, Heap::kUndefinedValueRootIndex); 187 __ LoadRoot(rax, Heap::kUndefinedValueRootIndex);
188 EmitReturnSequence(); 188 EmitReturnSequence();
189 } 189 }
190 } 190 }
191 191
192 192
193 void FullCodeGenerator::ClearAccumulator() { 193 void FullCodeGenerator::ClearAccumulator() {
194 __ xor(rax, rax); 194 __ xor_(rax, rax);
195 } 195 }
196 196
197 197
198 void FullCodeGenerator::EmitReturnSequence() { 198 void FullCodeGenerator::EmitReturnSequence() {
199 Comment cmnt(masm_, "[ Return sequence"); 199 Comment cmnt(masm_, "[ Return sequence");
200 if (return_label_.is_bound()) { 200 if (return_label_.is_bound()) {
201 __ jmp(&return_label_); 201 __ jmp(&return_label_);
202 } else { 202 } else {
203 __ bind(&return_label_); 203 __ bind(&return_label_);
204 if (FLAG_trace) { 204 if (FLAG_trace) {
(...skipping 3219 matching lines...) Expand 10 before | Expand all | Expand 10 after
3424 __ ret(0); 3424 __ ret(0);
3425 } 3425 }
3426 3426
3427 3427
3428 #undef __ 3428 #undef __
3429 3429
3430 3430
3431 } } // namespace v8::internal 3431 } } // namespace v8::internal
3432 3432
3433 #endif // V8_TARGET_ARCH_X64 3433 #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