Use a uniform way to emit code for all instructions.

runtime/vm/flow_graph_compiler.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/cha.h"
 #include "vm/dart_entry.h"
@@ skipping 194 matching lines @@
   block_info->set_fallthrough_label(fallthrough_label);
 }
 
 
 void FlowGraphCompiler::VisitBlocks() {
   CompactBlocks();
 
   for (intptr_t i = 0; i < block_order().length(); ++i) {
     // Compile the block entry.
     BlockEntryInstr* entry = block_order()[i];
-    assembler()->Comment("B%"Pd"", entry->block_id());
     set_current_block(entry);
 
     if (WasCompacted(entry)) {
+      assembler()->Comment("B%"Pd"", entry->block_id());
       continue;
     }
 
-    entry->EmitNativeCode(this);
-    // Compile all successors until an exit, branch, or a block entry.
+    EmitInstruction(entry);
+    // Compile all successors in the block.
     for (ForwardInstructionIterator it(entry); !it.Done(); it.Advance()) {
-      Instruction* instr = it.Current();
-      if (FLAG_code_comments) EmitComment(instr);
-      if (instr->IsParallelMove()) {
-        parallel_move_resolver_.EmitNativeCode(instr->AsParallelMove());
-      } else {
-        ASSERT(instr->locs() != NULL);
-        EmitInstructionPrologue(instr);
-        ASSERT(pending_deoptimization_env_ == NULL);
-        pending_deoptimization_env_ = instr->env();
-        instr->EmitNativeCode(this);
-        pending_deoptimization_env_ = NULL;
-        EmitInstructionEpilogue(instr);
-      }
+      EmitInstruction(it.Current());
     }
   }
   set_current_block(NULL);
 }
 
 
 void FlowGraphCompiler::Bailout(const char* reason) {
   const char* kFormat = "FlowGraphCompiler Bailout: %s %s.";
   const char* function_name = parsed_function().function().ToCString();
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
@@ skipping 413 matching lines @@
 
 
 void FlowGraphCompiler::EmitComment(Instruction* instr) {
   char buffer[256];
   BufferFormatter f(buffer, sizeof(buffer));
   instr->PrintTo(&f);
   assembler()->Comment("%s", buffer);
 }
 
 
+void FlowGraphCompiler::EmitInstruction(Instruction* instr) {
+  if (FLAG_code_comments) {
+    if (instr->IsBlockEntry()) {
+      assembler()->Comment("B%"Pd"", instr->AsBlockEntry()->block_id());
+    } else {
+      EmitComment(instr);
+    }
+  }
+
+  EmitInstructionPrologue(instr);
+  ASSERT(pending_deoptimization_env_ == NULL);
+  pending_deoptimization_env_ = instr->env();
+  instr->EmitNativeCode(this);
+  pending_deoptimization_env_ = NULL;
+  EmitInstructionEpilogue(instr);
+}
+
+
 // Allocate a register that is not explicitly blocked.
 static Register AllocateFreeRegister(bool* blocked_registers) {
   for (intptr_t regno = 0; regno < kNumberOfCpuRegisters; regno++) {
     if (!blocked_registers[regno]) {
       blocked_registers[regno] = true;
       return static_cast<Register>(regno);
     }
   }
   UNREACHABLE();
   return kNoRegister;
@@ skipping 400 matching lines @@
 
   for (int i = 0; i < len; i++) {
     sorted->Add(CidTarget(ic_data.GetReceiverClassIdAt(i),
                           &Function::ZoneHandle(ic_data.GetTargetAt(i)),
                           ic_data.GetCountAt(i)));
   }
   sorted->Sort(HighestCountFirst);
 }
 
 }  // namespace dart