Index: src/ia32/deoptimizer-ia32.cc |
diff --git a/src/ia32/deoptimizer-ia32.cc b/src/ia32/deoptimizer-ia32.cc |
index e4377ce6c7fd81ff2fc99549626ee43dcff92496..9743b65f0b30fc85b71a40ae96574952d41779e0 100644 |
--- a/src/ia32/deoptimizer-ia32.cc |
+++ b/src/ia32/deoptimizer-ia32.cc |
@@ -468,7 +468,7 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator, |
JSFunction* function = JSFunction::cast(ComputeLiteral(iterator->Next())); |
unsigned height = iterator->Next(); |
unsigned height_in_bytes = height * kPointerSize; |
- if (FLAG_trace_deopt) { |
+ if (trace_) { |
PrintF(" translating arguments adaptor => height=%d\n", height_in_bytes); |
} |
@@ -503,7 +503,7 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(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%08x: [top + %d] <- 0x%08x ; caller's pc\n", |
top_address + output_offset, output_offset, callers_pc); |
} |
@@ -514,7 +514,7 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(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); |
} |
@@ -524,7 +524,7 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator, |
intptr_t context = reinterpret_cast<intptr_t>( |
Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR)); |
output_frame->SetFrameSlot(output_offset, context); |
- if (FLAG_trace_deopt) { |
+ if (trace_) { |
PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context (adaptor sentinel)\n", |
top_address + output_offset, output_offset, context); |
} |
@@ -533,7 +533,7 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(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 ; function\n", |
top_address + output_offset, output_offset, value); |
} |
@@ -542,7 +542,7 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(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); |
} |
@@ -703,7 +703,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator, |
JSFunction* function = JSFunction::cast(ComputeLiteral(iterator->Next())); |
unsigned height = iterator->Next(); |
unsigned height_in_bytes = height * kPointerSize; |
- if (FLAG_trace_deopt) { |
+ if (trace_) { |
PrintF(" translating construct stub => height=%d\n", height_in_bytes); |
} |
@@ -738,7 +738,7 @@ void Deoptimizer::DoComputeConstructStubFrame(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%08x: [top + %d] <- 0x%08x ; caller's pc\n", |
top_address + output_offset, output_offset, callers_pc); |
} |
@@ -749,7 +749,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); |
} |
@@ -758,7 +758,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); |
} |
@@ -767,7 +767,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); |
} |
@@ -776,7 +776,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); |
} |
@@ -785,7 +785,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); |
} |
@@ -795,7 +795,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); |
} |
@@ -819,7 +819,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); |
} |
@@ -853,7 +853,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); |
@@ -865,7 +865,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); |
@@ -875,7 +875,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); |
@@ -885,7 +885,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); |
@@ -899,7 +899,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); |
@@ -942,7 +942,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); |
@@ -1020,7 +1020,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); |
} |
@@ -1043,7 +1043,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator, |
fp_value); |
output_frame->SetFp(fp_value); |
if (is_topmost) output_frame->SetRegister(ebp.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); |
} |
@@ -1063,7 +1063,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator, |
output_frame->SetFrameSlot(output_offset, value); |
output_frame->SetContext(value); |
if (is_topmost) output_frame->SetRegister(esi.code(), value); |
- if (FLAG_trace_deopt) { |
+ if (trace_) { |
PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context\n", |
top_address + output_offset, output_offset, value); |
} |
@@ -1076,7 +1076,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); |
} |