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

Side by Side Diff: src/x64/deoptimizer-x64.cc

Issue 6576033: Fix compile failure from revision 6934 and win64 compile failure from revisio... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 10 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/runtime.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 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 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 USE(node_id); 297 USE(node_id);
298 ASSERT(node_id == ast_id); 298 ASSERT(node_id == ast_id);
299 JSFunction* function = JSFunction::cast(ComputeLiteral(iterator.Next())); 299 JSFunction* function = JSFunction::cast(ComputeLiteral(iterator.Next()));
300 USE(function); 300 USE(function);
301 ASSERT(function == function_); 301 ASSERT(function == function_);
302 unsigned height = iterator.Next(); 302 unsigned height = iterator.Next();
303 unsigned height_in_bytes = height * kPointerSize; 303 unsigned height_in_bytes = height * kPointerSize;
304 USE(height_in_bytes); 304 USE(height_in_bytes);
305 305
306 unsigned fixed_size = ComputeFixedSize(function_); 306 unsigned fixed_size = ComputeFixedSize(function_);
307 unsigned input_frame_size = input_->GetFrameSize(); 307 unsigned input_frame_size = static_cast<unsigned>(input_->GetFrameSize());
308 ASSERT(fixed_size + height_in_bytes == input_frame_size); 308 ASSERT(fixed_size + height_in_bytes == input_frame_size);
309 309
310 unsigned stack_slot_size = optimized_code_->stack_slots() * kPointerSize; 310 unsigned stack_slot_size = optimized_code_->stack_slots() * kPointerSize;
311 unsigned outgoing_height = data->ArgumentsStackHeight(bailout_id)->value(); 311 unsigned outgoing_height = data->ArgumentsStackHeight(bailout_id)->value();
312 unsigned outgoing_size = outgoing_height * kPointerSize; 312 unsigned outgoing_size = outgoing_height * kPointerSize;
313 unsigned output_frame_size = fixed_size + stack_slot_size + outgoing_size; 313 unsigned output_frame_size = fixed_size + stack_slot_size + outgoing_size;
314 ASSERT(outgoing_size == 0); // OSR does not happen in the middle of a call. 314 ASSERT(outgoing_size == 0); // OSR does not happen in the middle of a call.
315 315
316 if (FLAG_trace_osr) { 316 if (FLAG_trace_osr) {
317 PrintF("[on-stack replacement: begin 0x%08" V8PRIxPTR " ", 317 PrintF("[on-stack replacement: begin 0x%08" V8PRIxPTR " ",
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 } 772 }
773 __ bind(&done); 773 __ bind(&done);
774 } 774 }
775 775
776 #undef __ 776 #undef __
777 777
778 778
779 } } // namespace v8::internal 779 } } // namespace v8::internal
780 780
781 #endif // V8_TARGET_ARCH_X64 781 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/runtime.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698