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

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

Issue 7491087: Fix compilation error on X64 and ARM. Error was introduced in r8851. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: add X64 change. Created 9 years, 4 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/x64/deoptimizer-x64.cc » ('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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 523
524 // Set the continuation for the topmost frame. 524 // Set the continuation for the topmost frame.
525 if (is_topmost && bailout_type_ != DEBUGGER) { 525 if (is_topmost && bailout_type_ != DEBUGGER) {
526 Builtins* builtins = isolate_->builtins(); 526 Builtins* builtins = isolate_->builtins();
527 Code* continuation = (bailout_type_ == EAGER) 527 Code* continuation = (bailout_type_ == EAGER)
528 ? builtins->builtin(Builtins::kNotifyDeoptimized) 528 ? builtins->builtin(Builtins::kNotifyDeoptimized)
529 : builtins->builtin(Builtins::kNotifyLazyDeoptimized); 529 : builtins->builtin(Builtins::kNotifyLazyDeoptimized);
530 output_frame->SetContinuation( 530 output_frame->SetContinuation(
531 reinterpret_cast<uint32_t>(continuation->entry())); 531 reinterpret_cast<uint32_t>(continuation->entry()));
532 } 532 }
533
534 if (output_count_ - 1 == frame_index) iterator->Done();
535 } 533 }
536 534
537 535
538 void Deoptimizer::FillInputFrame(Address tos, JavaScriptFrame* frame) { 536 void Deoptimizer::FillInputFrame(Address tos, JavaScriptFrame* frame) {
539 // Set the register values. The values are not important as there are no 537 // Set the register values. The values are not important as there are no
540 // callee saved registers in JavaScript frames, so all registers are 538 // callee saved registers in JavaScript frames, so all registers are
541 // spilled. Registers fp and sp are set to the correct values though. 539 // spilled. Registers fp and sp are set to the correct values though.
542 540
543 for (int i = 0; i < Register::kNumRegisters; i++) { 541 for (int i = 0; i < Register::kNumRegisters; i++) {
544 input_->SetRegister(i, i * 4); 542 input_->SetRegister(i, i * 4);
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 __ push(ip); 760 __ push(ip);
763 __ b(&done); 761 __ b(&done);
764 ASSERT(masm()->pc_offset() - start == table_entry_size_); 762 ASSERT(masm()->pc_offset() - start == table_entry_size_);
765 } 763 }
766 __ bind(&done); 764 __ bind(&done);
767 } 765 }
768 766
769 #undef __ 767 #undef __
770 768
771 } } // namespace v8::internal 769 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/x64/deoptimizer-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698