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

Side by Side Diff: src/x64/deoptimizer-x64.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 | « src/arm/deoptimizer-arm.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 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 output_frame->SetState(Smi::FromInt(state)); 598 output_frame->SetState(Smi::FromInt(state));
599 599
600 // Set the continuation for the topmost frame. 600 // Set the continuation for the topmost frame.
601 if (is_topmost && bailout_type_ != DEBUGGER) { 601 if (is_topmost && bailout_type_ != DEBUGGER) {
602 Code* continuation = (bailout_type_ == EAGER) 602 Code* continuation = (bailout_type_ == EAGER)
603 ? isolate_->builtins()->builtin(Builtins::kNotifyDeoptimized) 603 ? isolate_->builtins()->builtin(Builtins::kNotifyDeoptimized)
604 : isolate_->builtins()->builtin(Builtins::kNotifyLazyDeoptimized); 604 : isolate_->builtins()->builtin(Builtins::kNotifyLazyDeoptimized);
605 output_frame->SetContinuation( 605 output_frame->SetContinuation(
606 reinterpret_cast<intptr_t>(continuation->entry())); 606 reinterpret_cast<intptr_t>(continuation->entry()));
607 } 607 }
608
609 if (output_count_ - 1 == frame_index) iterator->Done();
610 } 608 }
611 609
612 610
613 void Deoptimizer::FillInputFrame(Address tos, JavaScriptFrame* frame) { 611 void Deoptimizer::FillInputFrame(Address tos, JavaScriptFrame* frame) {
614 // Set the register values. The values are not important as there are no 612 // Set the register values. The values are not important as there are no
615 // callee saved registers in JavaScript frames, so all registers are 613 // callee saved registers in JavaScript frames, so all registers are
616 // spilled. Registers rbp and rsp are set to the correct values though. 614 // spilled. Registers rbp and rsp are set to the correct values though.
617 for (int i = 0; i < Register::kNumRegisters; i++) { 615 for (int i = 0; i < Register::kNumRegisters; i++) {
618 input_->SetRegister(i, i * 4); 616 input_->SetRegister(i, i * 4);
619 } 617 }
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 } 838 }
841 __ bind(&done); 839 __ bind(&done);
842 } 840 }
843 841
844 #undef __ 842 #undef __
845 843
846 844
847 } } // namespace v8::internal 845 } } // namespace v8::internal
848 846
849 #endif // V8_TARGET_ARCH_X64 847 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/arm/deoptimizer-arm.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698