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

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

Issue 6052004: Merge bleeding edge r6035 to 2.5 branch. Fix for push of random value... (Closed) Base URL: http://v8.googlecode.com/svn/branches/2.5/
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 | « no previous file | src/full-codegen.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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 196
197 { Comment cmnt(masm_, "[ return <undefined>;"); 197 { Comment cmnt(masm_, "[ return <undefined>;");
198 // Emit a 'return undefined' in case control fell off the end of the 198 // Emit a 'return undefined' in case control fell off the end of the
199 // body. 199 // body.
200 __ LoadRoot(r0, Heap::kUndefinedValueRootIndex); 200 __ LoadRoot(r0, Heap::kUndefinedValueRootIndex);
201 } 201 }
202 EmitReturnSequence(); 202 EmitReturnSequence();
203 } 203 }
204 204
205 205
206 void FullCodeGenerator::ClearAccumulator() {
207 __ mov(r0, Operand(Smi::FromInt(0)));
208 }
209
210
206 void FullCodeGenerator::EmitReturnSequence() { 211 void FullCodeGenerator::EmitReturnSequence() {
207 Comment cmnt(masm_, "[ Return sequence"); 212 Comment cmnt(masm_, "[ Return sequence");
208 if (return_label_.is_bound()) { 213 if (return_label_.is_bound()) {
209 __ b(&return_label_); 214 __ b(&return_label_);
210 } else { 215 } else {
211 __ bind(&return_label_); 216 __ bind(&return_label_);
212 if (FLAG_trace) { 217 if (FLAG_trace) {
213 // Push the return value on the stack as the parameter. 218 // Push the return value on the stack as the parameter.
214 // Runtime::TraceExit returns its parameter in r0. 219 // Runtime::TraceExit returns its parameter in r0.
215 __ push(r0); 220 __ push(r0);
(...skipping 3222 matching lines...) Expand 10 before | Expand all | Expand 10 after
3438 __ mov(r1, Operand(r1, ASR, 1)); // Un-smi-tag value. 3443 __ mov(r1, Operand(r1, ASR, 1)); // Un-smi-tag value.
3439 __ add(pc, r1, Operand(masm_->CodeObject())); 3444 __ add(pc, r1, Operand(masm_->CodeObject()));
3440 } 3445 }
3441 3446
3442 3447
3443 #undef __ 3448 #undef __
3444 3449
3445 } } // namespace v8::internal 3450 } } // namespace v8::internal
3446 3451
3447 #endif // V8_TARGET_ARCH_ARM 3452 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/full-codegen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698