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

Side by Side Diff: src/ia32/lithium-ia32.h

Issue 6461022: Merge a number of assertion failure fixes to the 3.0 branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.0/
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
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 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 true_block_id_ = true_block_id; 531 true_block_id_ = true_block_id;
532 false_block_id_ = false_block_id; 532 false_block_id_ = false_block_id;
533 } 533 }
534 534
535 private: 535 private:
536 int true_block_id_; 536 int true_block_id_;
537 int false_block_id_; 537 int false_block_id_;
538 }; 538 };
539 539
540 540
541 class LApplyArguments: public LTemplateInstruction<1, 4, 0> { 541 class LApplyArguments: public LTemplateInstruction<1, 4, 1> {
542 public: 542 public:
543 LApplyArguments(LOperand* function, 543 LApplyArguments(LOperand* function,
544 LOperand* receiver, 544 LOperand* receiver,
545 LOperand* length, 545 LOperand* length,
546 LOperand* elements) { 546 LOperand* elements,
547 LOperand* temp) {
547 inputs_[0] = function; 548 inputs_[0] = function;
548 inputs_[1] = receiver; 549 inputs_[1] = receiver;
549 inputs_[2] = length; 550 inputs_[2] = length;
550 inputs_[3] = elements; 551 inputs_[3] = elements;
552 temps_[0] = temp;
551 } 553 }
552 554
553 DECLARE_CONCRETE_INSTRUCTION(ApplyArguments, "apply-arguments") 555 DECLARE_CONCRETE_INSTRUCTION(ApplyArguments, "apply-arguments")
554 556
555 LOperand* function() { return inputs_[0]; } 557 LOperand* function() { return inputs_[0]; }
556 LOperand* receiver() { return inputs_[1]; } 558 LOperand* receiver() { return inputs_[1]; }
557 LOperand* length() { return inputs_[2]; } 559 LOperand* length() { return inputs_[2]; }
558 LOperand* elements() { return inputs_[3]; } 560 LOperand* elements() { return inputs_[3]; }
559 }; 561 };
560 562
(...skipping 1460 matching lines...) Expand 10 before | Expand all | Expand 10 after
2021 DISALLOW_COPY_AND_ASSIGN(LChunkBuilder); 2023 DISALLOW_COPY_AND_ASSIGN(LChunkBuilder);
2022 }; 2024 };
2023 2025
2024 #undef DECLARE_HYDROGEN_ACCESSOR 2026 #undef DECLARE_HYDROGEN_ACCESSOR
2025 #undef DECLARE_INSTRUCTION 2027 #undef DECLARE_INSTRUCTION
2026 #undef DECLARE_CONCRETE_INSTRUCTION 2028 #undef DECLARE_CONCRETE_INSTRUCTION
2027 2029
2028 } } // namespace v8::internal 2030 } } // namespace v8::internal
2029 2031
2030 #endif // V8_IA32_LITHIUM_IA32_H_ 2032 #endif // V8_IA32_LITHIUM_IA32_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698