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

Side by Side Diff: src/mips/lithium-codegen-mips.cc

Issue 12383076: MIPS: Fix materialization of arguments objects with unknown values. (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.16
Patch Set: Created 7 years, 9 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/mips/lithium-codegen-mips.h ('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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 566
567 567
568 MemOperand LCodeGen::ToHighMemOperand(LOperand* op) const { 568 MemOperand LCodeGen::ToHighMemOperand(LOperand* op) const {
569 ASSERT(op->IsDoubleStackSlot()); 569 ASSERT(op->IsDoubleStackSlot());
570 return MemOperand(fp, StackSlotOffset(op->index()) + kPointerSize); 570 return MemOperand(fp, StackSlotOffset(op->index()) + kPointerSize);
571 } 571 }
572 572
573 573
574 void LCodeGen::WriteTranslation(LEnvironment* environment, 574 void LCodeGen::WriteTranslation(LEnvironment* environment,
575 Translation* translation, 575 Translation* translation,
576 int* arguments_index, 576 int* pushed_arguments_index,
577 int* arguments_count) { 577 int* pushed_arguments_count) {
578 if (environment == NULL) return; 578 if (environment == NULL) return;
579 579
580 // The translation includes one command per value in the environment. 580 // The translation includes one command per value in the environment.
581 int translation_size = environment->values()->length(); 581 int translation_size = environment->values()->length();
582 // The output frame height does not include the parameters. 582 // The output frame height does not include the parameters.
583 int height = translation_size - environment->parameter_count(); 583 int height = translation_size - environment->parameter_count();
584 584
585 // Function parameters are arguments to the outermost environment. The 585 // Function parameters are arguments to the outermost environment. The
586 // arguments index points to the first element of a sequence of tagged 586 // arguments index points to the first element of a sequence of tagged
587 // values on the stack that represent the arguments. This needs to be 587 // values on the stack that represent the arguments. This needs to be
588 // kept in sync with the LArgumentsElements implementation. 588 // kept in sync with the LArgumentsElements implementation.
589 *arguments_index = -environment->parameter_count(); 589 *pushed_arguments_index = -environment->parameter_count();
590 *arguments_count = environment->parameter_count(); 590 *pushed_arguments_count = environment->parameter_count();
591 591
592 WriteTranslation(environment->outer(), 592 WriteTranslation(environment->outer(),
593 translation, 593 translation,
594 arguments_index, 594 pushed_arguments_index,
595 arguments_count); 595 pushed_arguments_count);
596 bool has_closure_id = !info()->closure().is_null() && 596 bool has_closure_id = !info()->closure().is_null() &&
597 *info()->closure() != *environment->closure(); 597 *info()->closure() != *environment->closure();
598 int closure_id = has_closure_id 598 int closure_id = has_closure_id
599 ? DefineDeoptimizationLiteral(environment->closure()) 599 ? DefineDeoptimizationLiteral(environment->closure())
600 : Translation::kSelfLiteralId; 600 : Translation::kSelfLiteralId;
601 601
602 switch (environment->frame_type()) { 602 switch (environment->frame_type()) {
603 case JS_FUNCTION: 603 case JS_FUNCTION:
604 translation->BeginJSFrame(environment->ast_id(), closure_id, height); 604 translation->BeginJSFrame(environment->ast_id(), closure_id, height);
605 break; 605 break;
(...skipping 12 matching lines...) Expand all
618 break; 618 break;
619 case STUB: 619 case STUB:
620 translation->BeginCompiledStubFrame(); 620 translation->BeginCompiledStubFrame();
621 break; 621 break;
622 case ARGUMENTS_ADAPTOR: 622 case ARGUMENTS_ADAPTOR:
623 translation->BeginArgumentsAdaptorFrame(closure_id, translation_size); 623 translation->BeginArgumentsAdaptorFrame(closure_id, translation_size);
624 break; 624 break;
625 } 625 }
626 626
627 // Inlined frames which push their arguments cause the index to be 627 // Inlined frames which push their arguments cause the index to be
628 // bumped and a new stack area to be used for materialization. 628 // bumped and another stack area to be used for materialization,
629 if (environment->entry() != NULL && 629 // otherwise actual argument values are unknown for inlined frames.
630 environment->entry()->arguments_pushed()) { 630 bool arguments_known = true;
631 *arguments_index = *arguments_index < 0 631 int arguments_index = *pushed_arguments_index;
632 ? GetStackSlotCount() 632 int arguments_count = *pushed_arguments_count;
633 : *arguments_index + *arguments_count; 633 if (environment->entry() != NULL) {
634 *arguments_count = environment->entry()->arguments_count() + 1; 634 arguments_known = environment->entry()->arguments_pushed();
635 arguments_index = arguments_index < 0
636 ? GetStackSlotCount() : arguments_index + arguments_count;
637 arguments_count = environment->entry()->arguments_count() + 1;
638 if (environment->entry()->arguments_pushed()) {
639 *pushed_arguments_index = arguments_index;
640 *pushed_arguments_count = arguments_count;
641 }
635 } 642 }
636 643
637 for (int i = 0; i < translation_size; ++i) { 644 for (int i = 0; i < translation_size; ++i) {
638 LOperand* value = environment->values()->at(i); 645 LOperand* value = environment->values()->at(i);
639 // spilled_registers_ and spilled_double_registers_ are either 646 // spilled_registers_ and spilled_double_registers_ are either
640 // both NULL or both set. 647 // both NULL or both set.
641 if (environment->spilled_registers() != NULL && value != NULL) { 648 if (environment->spilled_registers() != NULL && value != NULL) {
642 if (value->IsRegister() && 649 if (value->IsRegister() &&
643 environment->spilled_registers()[value->index()] != NULL) { 650 environment->spilled_registers()[value->index()] != NULL) {
644 translation->MarkDuplicate(); 651 translation->MarkDuplicate();
645 AddToTranslation(translation, 652 AddToTranslation(translation,
646 environment->spilled_registers()[value->index()], 653 environment->spilled_registers()[value->index()],
647 environment->HasTaggedValueAt(i), 654 environment->HasTaggedValueAt(i),
648 environment->HasUint32ValueAt(i), 655 environment->HasUint32ValueAt(i),
649 *arguments_index, 656 arguments_known,
650 *arguments_count); 657 arguments_index,
658 arguments_count);
651 } else if ( 659 } else if (
652 value->IsDoubleRegister() && 660 value->IsDoubleRegister() &&
653 environment->spilled_double_registers()[value->index()] != NULL) { 661 environment->spilled_double_registers()[value->index()] != NULL) {
654 translation->MarkDuplicate(); 662 translation->MarkDuplicate();
655 AddToTranslation( 663 AddToTranslation(
656 translation, 664 translation,
657 environment->spilled_double_registers()[value->index()], 665 environment->spilled_double_registers()[value->index()],
658 false, 666 false,
659 false, 667 false,
660 *arguments_index, 668 arguments_known,
661 *arguments_count); 669 arguments_index,
670 arguments_count);
662 } 671 }
663 } 672 }
664 673
665 AddToTranslation(translation, 674 AddToTranslation(translation,
666 value, 675 value,
667 environment->HasTaggedValueAt(i), 676 environment->HasTaggedValueAt(i),
668 environment->HasUint32ValueAt(i), 677 environment->HasUint32ValueAt(i),
669 *arguments_index, 678 arguments_known,
670 *arguments_count); 679 arguments_index,
680 arguments_count);
671 } 681 }
672 } 682 }
673 683
674 684
675 void LCodeGen::AddToTranslation(Translation* translation, 685 void LCodeGen::AddToTranslation(Translation* translation,
676 LOperand* op, 686 LOperand* op,
677 bool is_tagged, 687 bool is_tagged,
678 bool is_uint32, 688 bool is_uint32,
689 bool arguments_known,
679 int arguments_index, 690 int arguments_index,
680 int arguments_count) { 691 int arguments_count) {
681 if (op == NULL) { 692 if (op == NULL) {
682 // TODO(twuerthinger): Introduce marker operands to indicate that this value 693 // TODO(twuerthinger): Introduce marker operands to indicate that this value
683 // is not present and must be reconstructed from the deoptimizer. Currently 694 // is not present and must be reconstructed from the deoptimizer. Currently
684 // this is only used for the arguments object. 695 // this is only used for the arguments object.
685 translation->StoreArgumentsObject(arguments_index, arguments_count); 696 translation->StoreArgumentsObject(
697 arguments_known, arguments_index, arguments_count);
686 } else if (op->IsStackSlot()) { 698 } else if (op->IsStackSlot()) {
687 if (is_tagged) { 699 if (is_tagged) {
688 translation->StoreStackSlot(op->index()); 700 translation->StoreStackSlot(op->index());
689 } else if (is_uint32) { 701 } else if (is_uint32) {
690 translation->StoreUint32StackSlot(op->index()); 702 translation->StoreUint32StackSlot(op->index());
691 } else { 703 } else {
692 translation->StoreInt32StackSlot(op->index()); 704 translation->StoreInt32StackSlot(op->index());
693 } 705 }
694 } else if (op->IsDoubleStackSlot()) { 706 } else if (op->IsDoubleStackSlot()) {
695 translation->StoreDoubleStackSlot(op->index()); 707 translation->StoreDoubleStackSlot(op->index());
(...skipping 5342 matching lines...) Expand 10 before | Expand all | Expand 10 after
6038 __ Subu(scratch, result, scratch); 6050 __ Subu(scratch, result, scratch);
6039 __ lw(result, FieldMemOperand(scratch, 6051 __ lw(result, FieldMemOperand(scratch,
6040 FixedArray::kHeaderSize - kPointerSize)); 6052 FixedArray::kHeaderSize - kPointerSize));
6041 __ bind(&done); 6053 __ bind(&done);
6042 } 6054 }
6043 6055
6044 6056
6045 #undef __ 6057 #undef __
6046 6058
6047 } } // namespace v8::internal 6059 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/mips/lithium-codegen-mips.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698