| OLD | NEW |
| 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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 // |>------------ translation_size ------------<| | 529 // |>------------ translation_size ------------<| |
| 530 | 530 |
| 531 int frame_count = 0; | 531 int frame_count = 0; |
| 532 int jsframe_count = 0; | 532 int jsframe_count = 0; |
| 533 for (LEnvironment* e = environment; e != NULL; e = e->outer()) { | 533 for (LEnvironment* e = environment; e != NULL; e = e->outer()) { |
| 534 ++frame_count; | 534 ++frame_count; |
| 535 if (e->frame_type() == JS_FUNCTION) { | 535 if (e->frame_type() == JS_FUNCTION) { |
| 536 ++jsframe_count; | 536 ++jsframe_count; |
| 537 } | 537 } |
| 538 } | 538 } |
| 539 Translation translation(&translations_, frame_count, jsframe_count); | 539 Translation translation(&translations_, frame_count, jsframe_count, |
| 540 zone()); |
| 540 WriteTranslation(environment, &translation); | 541 WriteTranslation(environment, &translation); |
| 541 int deoptimization_index = deoptimizations_.length(); | 542 int deoptimization_index = deoptimizations_.length(); |
| 542 int pc_offset = masm()->pc_offset(); | 543 int pc_offset = masm()->pc_offset(); |
| 543 environment->Register(deoptimization_index, | 544 environment->Register(deoptimization_index, |
| 544 translation.index(), | 545 translation.index(), |
| 545 (mode == Safepoint::kLazyDeopt) ? pc_offset : -1); | 546 (mode == Safepoint::kLazyDeopt) ? pc_offset : -1); |
| 546 deoptimizations_.Add(environment); | 547 deoptimizations_.Add(environment); |
| 547 } | 548 } |
| 548 } | 549 } |
| 549 | 550 |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 Safepoint::Kind kind, | 677 Safepoint::Kind kind, |
| 677 int arguments, | 678 int arguments, |
| 678 Safepoint::DeoptMode deopt_mode) { | 679 Safepoint::DeoptMode deopt_mode) { |
| 679 ASSERT(kind == expected_safepoint_kind_); | 680 ASSERT(kind == expected_safepoint_kind_); |
| 680 const ZoneList<LOperand*>* operands = pointers->GetNormalizedOperands(); | 681 const ZoneList<LOperand*>* operands = pointers->GetNormalizedOperands(); |
| 681 Safepoint safepoint = | 682 Safepoint safepoint = |
| 682 safepoints_.DefineSafepoint(masm(), kind, arguments, deopt_mode); | 683 safepoints_.DefineSafepoint(masm(), kind, arguments, deopt_mode); |
| 683 for (int i = 0; i < operands->length(); i++) { | 684 for (int i = 0; i < operands->length(); i++) { |
| 684 LOperand* pointer = operands->at(i); | 685 LOperand* pointer = operands->at(i); |
| 685 if (pointer->IsStackSlot()) { | 686 if (pointer->IsStackSlot()) { |
| 686 safepoint.DefinePointerSlot(pointer->index()); | 687 safepoint.DefinePointerSlot(pointer->index(), zone()); |
| 687 } else if (pointer->IsRegister() && (kind & Safepoint::kWithRegisters)) { | 688 } else if (pointer->IsRegister() && (kind & Safepoint::kWithRegisters)) { |
| 688 safepoint.DefinePointerRegister(ToRegister(pointer)); | 689 safepoint.DefinePointerRegister(ToRegister(pointer)); |
| 689 } | 690 } |
| 690 } | 691 } |
| 691 } | 692 } |
| 692 | 693 |
| 693 | 694 |
| 694 void LCodeGen::RecordSafepoint(LPointerMap* pointers, | 695 void LCodeGen::RecordSafepoint(LPointerMap* pointers, |
| 695 Safepoint::DeoptMode mode) { | 696 Safepoint::DeoptMode mode) { |
| 696 RecordSafepoint(pointers, Safepoint::kSimple, 0, mode); | 697 RecordSafepoint(pointers, Safepoint::kSimple, 0, mode); |
| (...skipping 4398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5095 FixedArray::kHeaderSize - kPointerSize)); | 5096 FixedArray::kHeaderSize - kPointerSize)); |
| 5096 __ bind(&done); | 5097 __ bind(&done); |
| 5097 } | 5098 } |
| 5098 | 5099 |
| 5099 | 5100 |
| 5100 #undef __ | 5101 #undef __ |
| 5101 | 5102 |
| 5102 } } // namespace v8::internal | 5103 } } // namespace v8::internal |
| 5103 | 5104 |
| 5104 #endif // V8_TARGET_ARCH_IA32 | 5105 #endif // V8_TARGET_ARCH_IA32 |
| OLD | NEW |