| Index: src/arm/deoptimizer-arm.cc
|
| diff --git a/src/arm/deoptimizer-arm.cc b/src/arm/deoptimizer-arm.cc
|
| index 6a7c1466a8c3bdd2e09d3b7df6d0dfaef1f3dd88..06415edadaf5dd6e3a4a31a75fdf6af1f80984fb 100644
|
| --- a/src/arm/deoptimizer-arm.cc
|
| +++ b/src/arm/deoptimizer-arm.cc
|
| @@ -643,7 +643,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
|
| output_frame->SetFrameSlot(output_offset, value);
|
| intptr_t fp_value = top_address + output_offset;
|
| output_frame->SetFp(fp_value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's fp\n",
|
| fp_value, output_offset, value);
|
| }
|
| @@ -652,7 +652,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
|
| output_offset -= kPointerSize;
|
| value = output_[frame_index - 1]->GetContext();
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context\n",
|
| top_address + output_offset, output_offset, value);
|
| }
|
| @@ -661,7 +661,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
|
| output_offset -= kPointerSize;
|
| value = reinterpret_cast<intptr_t>(Smi::FromInt(StackFrame::CONSTRUCT));
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function (construct sentinel)\n",
|
| top_address + output_offset, output_offset, value);
|
| }
|
| @@ -670,7 +670,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
|
| output_offset -= kPointerSize;
|
| value = reinterpret_cast<intptr_t>(construct_stub);
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; code object\n",
|
| top_address + output_offset, output_offset, value);
|
| }
|
| @@ -679,7 +679,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
|
| output_offset -= kPointerSize;
|
| value = reinterpret_cast<uint32_t>(Smi::FromInt(height - 1));
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; argc (%d)\n",
|
| top_address + output_offset, output_offset, value, height - 1);
|
| }
|
| @@ -688,7 +688,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
|
| output_offset -= kPointerSize;
|
| value = reinterpret_cast<intptr_t>(function);
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; constructor function\n",
|
| top_address + output_offset, output_offset, value);
|
| }
|
| @@ -698,7 +698,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator,
|
| output_offset -= kPointerSize;
|
| value = output_frame->GetFrameSlot(output_frame_size - kPointerSize);
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; allocated receiver\n",
|
| top_address + output_offset, output_offset, value);
|
| }
|
| @@ -722,7 +722,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
|
| unsigned height = 0;
|
| unsigned height_in_bytes = height * kPointerSize;
|
| const char* kind = is_setter_stub_frame ? "setter" : "getter";
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" translating %s stub => height=%u\n", kind, height_in_bytes);
|
| }
|
|
|
| @@ -755,7 +755,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
|
| output_offset -= kPointerSize;
|
| intptr_t callers_pc = output_[frame_index - 1]->GetPc();
|
| output_frame->SetFrameSlot(output_offset, callers_pc);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08" V8PRIxPTR ": [top + %u] <- 0x%08" V8PRIxPTR
|
| " ; caller's pc\n",
|
| top_address + output_offset, output_offset, callers_pc);
|
| @@ -767,7 +767,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
|
| output_frame->SetFrameSlot(output_offset, value);
|
| intptr_t fp_value = top_address + output_offset;
|
| output_frame->SetFp(fp_value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08" V8PRIxPTR ": [top + %u] <- 0x%08" V8PRIxPTR
|
| " ; caller's fp\n",
|
| fp_value, output_offset, value);
|
| @@ -777,7 +777,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
|
| output_offset -= kPointerSize;
|
| value = output_[frame_index - 1]->GetContext();
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08" V8PRIxPTR ": [top + %u] <- 0x%08" V8PRIxPTR
|
| " ; context\n",
|
| top_address + output_offset, output_offset, value);
|
| @@ -787,7 +787,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
|
| output_offset -= kPointerSize;
|
| value = reinterpret_cast<intptr_t>(Smi::FromInt(StackFrame::INTERNAL));
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08" V8PRIxPTR ": [top + %u] <- 0x%08" V8PRIxPTR
|
| " ; function (%s sentinel)\n",
|
| top_address + output_offset, output_offset, value, kind);
|
| @@ -801,7 +801,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator,
|
| Code* accessor_stub = isolate_->builtins()->builtin(name);
|
| value = reinterpret_cast<intptr_t>(accessor_stub);
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08" V8PRIxPTR ": [top + %u] <- 0x%08" V8PRIxPTR
|
| " ; code object\n",
|
| top_address + output_offset, output_offset, value);
|
| @@ -847,7 +847,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
|
| }
|
| unsigned height = iterator->Next();
|
| unsigned height_in_bytes = height * kPointerSize;
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" translating ");
|
| function->PrintName();
|
| PrintF(" => node=%d, height=%d\n", node_id.ToInt(), height_in_bytes);
|
| @@ -911,7 +911,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
|
| value = output_[frame_index - 1]->GetPc();
|
| }
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's pc\n",
|
| top_address + output_offset, output_offset, value);
|
| }
|
| @@ -934,7 +934,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
|
| if (is_topmost) {
|
| output_frame->SetRegister(fp.code(), fp_value);
|
| }
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's fp\n",
|
| fp_value, output_offset, value);
|
| }
|
| @@ -952,7 +952,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
|
| output_frame->SetFrameSlot(output_offset, value);
|
| output_frame->SetContext(value);
|
| if (is_topmost) output_frame->SetRegister(cp.code(), value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context\n",
|
| top_address + output_offset, output_offset, value);
|
| }
|
| @@ -965,7 +965,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator,
|
| // input frame.
|
| ASSERT(!is_bottommost || input_->GetFrameSlot(input_offset) == value);
|
| output_frame->SetFrameSlot(output_offset, value);
|
| - if (FLAG_trace_deopt) {
|
| + if (trace_) {
|
| PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function\n",
|
| top_address + output_offset, output_offset, value);
|
| }
|
|
|