Chromium Code Reviews| Index: runtime/vm/flow_graph_allocator.cc |
| =================================================================== |
| --- runtime/vm/flow_graph_allocator.cc (revision 26375) |
| +++ runtime/vm/flow_graph_allocator.cc (working copy) |
| @@ -369,7 +369,7 @@ |
| return; |
| } |
| - OS::Print(" live range v%"Pd" [%"Pd", %"Pd") in ", vreg(), Start(), End()); |
| + OS::Print(" live range v%" Pd " [%" Pd ", %" Pd ") in ", vreg(), Start(), End()); |
|
siva
2013/08/20 19:54:51
indent as
OS::Print(" live range v%" Pd " [%" Pd
Jacob
2013/08/20 20:32:15
Done.
|
| assigned_location().Print(); |
| OS::Print("\n"); |
| @@ -377,11 +377,11 @@ |
| for (UseInterval* interval = first_use_interval_; |
| interval != NULL; |
| interval = interval->next()) { |
| - OS::Print(" use interval [%"Pd", %"Pd")\n", |
| + OS::Print(" use interval [%" Pd ", %" Pd ")\n", |
| interval->start(), |
| interval->end()); |
| while ((use_pos != NULL) && (use_pos->pos() <= interval->end())) { |
| - OS::Print(" use at %"Pd"", use_pos->pos()); |
| + OS::Print(" use at %" Pd "", use_pos->pos()); |
| if (use_pos->location_slot() != NULL) { |
| OS::Print(" as "); |
| use_pos->location_slot()->Print(); |
| @@ -1482,7 +1482,7 @@ |
| first_safepoint_after_split, |
| next_sibling_); |
| - TRACE_ALLOC(OS::Print(" split sibling [%"Pd", %"Pd")\n", |
| + TRACE_ALLOC(OS::Print(" split sibling [%" Pd ", %" Pd ")\n", |
| next_sibling_->Start(), next_sibling_->End())); |
| last_use_interval_ = last_before_split; |
| @@ -1499,7 +1499,7 @@ |
| LiveRange* FlowGraphAllocator::SplitBetween(LiveRange* range, |
| intptr_t from, |
| intptr_t to) { |
| - TRACE_ALLOC(OS::Print("split v%"Pd" [%"Pd", %"Pd") between [%"Pd", %"Pd")\n", |
| + TRACE_ALLOC(OS::Print("split v%" Pd " [%" Pd ", %" Pd ") between [%" Pd ", %" Pd ")\n", |
|
siva
2013/08/20 19:54:51
TRACE_ALLOC(OS::Print("split v%" Pd " [%" Pd ", %"
Jacob
2013/08/20 20:32:15
Done.
|
| range->vreg(), range->Start(), range->End(), from, to)); |
| intptr_t split_pos = kIllegalPosition; |
| @@ -1537,8 +1537,8 @@ |
| intptr_t from, |
| intptr_t to) { |
| ASSERT(from < to); |
| - TRACE_ALLOC(OS::Print("spill v%"Pd" [%"Pd", %"Pd") " |
| - "between [%"Pd", %"Pd")\n", |
| + TRACE_ALLOC(OS::Print("spill v%" Pd " [%" Pd ", %" Pd ") " |
| + "between [%" Pd ", %" Pd ")\n", |
| range->vreg(), range->Start(), range->End(), from, to)); |
| LiveRange* tail = range->SplitAt(from); |
| @@ -1555,7 +1555,7 @@ |
| void FlowGraphAllocator::SpillAfter(LiveRange* range, intptr_t from) { |
| - TRACE_ALLOC(OS::Print("spill v%"Pd" [%"Pd", %"Pd") after %"Pd"\n", |
| + TRACE_ALLOC(OS::Print("spill v%" Pd " [%" Pd ", %" Pd ") after %" Pd "\n", |
| range->vreg(), range->Start(), range->End(), from)); |
| // When spilling the value inside the loop check if this spill can |
| @@ -1569,7 +1569,7 @@ |
| RangeHasOnlyUnconstrainedUsesInLoop(range, loop_header->loop_id())) { |
| ASSERT(loop_header->entry()->start_pos() <= from); |
| from = loop_header->entry()->start_pos(); |
| - TRACE_ALLOC(OS::Print(" moved spill position to loop header %"Pd"\n", |
| + TRACE_ALLOC(OS::Print(" moved spill position to loop header %" Pd "\n", |
| from)); |
| } |
| } |
| @@ -1791,7 +1791,7 @@ |
| candidate = hint.register_code(); |
| } |
| - TRACE_ALLOC(OS::Print("found hint %s for v%"Pd": free until %"Pd"\n", |
| + TRACE_ALLOC(OS::Print("found hint %s for v%" Pd ": free until %" Pd "\n", |
| hint.Name(), |
| unallocated->vreg(), |
| free_until)); |
| @@ -1853,8 +1853,8 @@ |
| if (used_on_backedge[candidate]) { |
| TRACE_ALLOC(OS::Print( |
| - "considering %s for v%"Pd": has interference on the back edge" |
| - " {loop [%"Pd", %"Pd")}\n", |
| + "considering %s for v%" Pd ": has interference on the back edge" |
| + " {loop [%" Pd ", %" Pd ")}\n", |
| MakeRegisterLocation(candidate).Name(), |
| unallocated->vreg(), |
| loop_header->entry()->start_pos(), |
| @@ -1872,7 +1872,7 @@ |
| candidate = reg; |
| free_until = intersection; |
| TRACE_ALLOC(OS::Print( |
| - "found %s for v%"Pd" with no interference on the back edge\n", |
| + "found %s for v%" Pd " with no interference on the back edge\n", |
| MakeRegisterLocation(candidate).Name(), |
| candidate)); |
| break; |
| @@ -1883,11 +1883,11 @@ |
| TRACE_ALLOC(OS::Print("assigning free register ")); |
| TRACE_ALLOC(MakeRegisterLocation(candidate).Print()); |
| - TRACE_ALLOC(OS::Print(" to v%"Pd"\n", unallocated->vreg())); |
| + TRACE_ALLOC(OS::Print(" to v%" Pd "\n", unallocated->vreg())); |
| if (free_until != kMaxPosition) { |
| // There was an intersection. Split unallocated. |
| - TRACE_ALLOC(OS::Print(" splitting at %"Pd"\n", free_until)); |
| + TRACE_ALLOC(OS::Print(" splitting at %" Pd "\n", free_until)); |
| LiveRange* tail = unallocated->SplitAt(free_until); |
| AddToUnallocated(tail); |
| } |
| @@ -1985,7 +1985,7 @@ |
| TRACE_ALLOC(OS::Print("assigning blocked register ")); |
| TRACE_ALLOC(MakeRegisterLocation(candidate).Print()); |
| - TRACE_ALLOC(OS::Print(" to live range v%"Pd" until %"Pd"\n", |
| + TRACE_ALLOC(OS::Print(" to live range v%" Pd " until %" Pd "\n", |
| unallocated->vreg(), blocked_at)); |
| if (blocked_at < unallocated->End()) { |
| @@ -2142,7 +2142,7 @@ |
| ASSERT(use->location_slot() != NULL); |
| Location* slot = use->location_slot(); |
| ASSERT(slot->IsUnallocated()); |
| - TRACE_ALLOC(OS::Print(" use at %"Pd" converted to ", use->pos())); |
| + TRACE_ALLOC(OS::Print(" use at %" Pd " converted to ", use->pos())); |
| TRACE_ALLOC(loc.Print()); |
| TRACE_ALLOC(OS::Print("\n")); |
| *slot = loc; |
| @@ -2155,8 +2155,8 @@ |
| const Location loc = range->assigned_location(); |
| ASSERT(!loc.IsInvalid()); |
| - TRACE_ALLOC(OS::Print("range [%"Pd", %"Pd") " |
| - "for v%"Pd" has been allocated to ", |
| + TRACE_ALLOC(OS::Print("range [%" Pd ", %" Pd ") " |
| + "for v%" Pd " has been allocated to ", |
| range->Start(), range->End(), range->vreg())); |
| TRACE_ALLOC(loc.Print()); |
| TRACE_ALLOC(OS::Print(":\n")); |
| @@ -2321,8 +2321,8 @@ |
| while (!unallocated_.is_empty()) { |
| LiveRange* range = unallocated_.RemoveLast(); |
| const intptr_t start = range->Start(); |
| - TRACE_ALLOC(OS::Print("Processing live range for v%"Pd" " |
| - "starting at %"Pd"\n", |
| + TRACE_ALLOC(OS::Print("Processing live range for v%" Pd " " |
| + "starting at %" Pd "\n", |
| range->vreg(), |
| start)); |
| @@ -2358,13 +2358,13 @@ |
| void FlowGraphAllocator::ConnectSplitSiblings(LiveRange* parent, |
| BlockEntryInstr* source_block, |
| BlockEntryInstr* target_block) { |
| - TRACE_ALLOC(OS::Print("Connect v%"Pd" on the edge B%"Pd" -> B%"Pd"\n", |
| + TRACE_ALLOC(OS::Print("Connect v%" Pd " on the edge B%" Pd " -> B%" Pd "\n", |
| parent->vreg(), |
| source_block->block_id(), |
| target_block->block_id())); |
| if (parent->next_sibling() == NULL) { |
| // Nothing to connect. The whole range was allocated to the same location. |
| - TRACE_ALLOC(OS::Print("range v%"Pd" has no siblings\n", parent->vreg())); |
| + TRACE_ALLOC(OS::Print("range v%" Pd " has no siblings\n", parent->vreg())); |
| return; |
| } |
| @@ -2401,8 +2401,8 @@ |
| range = range->next_sibling(); |
| } |
| - TRACE_ALLOC(OS::Print("connecting v%"Pd" between [%"Pd", %"Pd") {%s} " |
| - "to [%"Pd", %"Pd") {%s}\n", |
| + TRACE_ALLOC(OS::Print("connecting v%" Pd " between [%" Pd ", %" Pd ") {%s} " |
| + "to [%" Pd ", %" Pd ") {%s}\n", |
| parent->vreg(), |
| source_cover->Start(), |
| source_cover->End(), |
| @@ -2438,10 +2438,10 @@ |
| while (range->next_sibling() != NULL) { |
| LiveRange* sibling = range->next_sibling(); |
| - TRACE_ALLOC(OS::Print("connecting [%"Pd", %"Pd") [", |
| + TRACE_ALLOC(OS::Print("connecting [%" Pd ", %" Pd ") [", |
| range->Start(), range->End())); |
| TRACE_ALLOC(range->assigned_location().Print()); |
| - TRACE_ALLOC(OS::Print("] to [%"Pd", %"Pd") [", |
| + TRACE_ALLOC(OS::Print("] to [%" Pd ", %" Pd ") [", |
| sibling->Start(), sibling->End())); |
| TRACE_ALLOC(sibling->assigned_location().Print()); |
| TRACE_ALLOC(OS::Print("]\n")); |