Implemented missing instructions in ia32, more sharing, removed bailouts, enable optimiziations on …

runtime/vm/flow_graph_compiler_ia32.cc

 // Copyright (c) 2012, 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_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
 #include "vm/ast_printer.h"
 #include "vm/compiler_stats.h"
 #include "vm/il_printer.h"
 #include "vm/locations.h"
 #include "vm/object_store.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
-DECLARE_FLAG(bool, code_comments);
 DECLARE_FLAG(bool, compiler_stats);
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, print_ast);
 DECLARE_FLAG(bool, print_scopes);
 DECLARE_FLAG(bool, trace_functions);
 
 
-void DeoptimizationStub::GenerateCode(FlowGraphCompilerShared* compiler) {
+void DeoptimizationStub::GenerateCode(FlowGraphCompiler* compiler) {
   Assembler* assem = compiler->assembler();
 #define __ assem->
   __ Comment("Deopt stub for id %d", deopt_id_);
   __ Bind(entry_label());
   for (intptr_t i = 0; i < registers_.length(); i++) {
     if (registers_[i] != kNoRegister) {
       __ pushl(registers_[i]);
     }
   }
   __ movl(EAX, Immediate(Smi::RawValue(reason_)));
   __ call(&StubCode::DeoptimizeLabel());
   compiler->AddCurrentDescriptor(PcDescriptors::kOther,
                                  deopt_id_,
                                  deopt_token_index_,
                                  try_index_);
 #undef __
 }
 
 
-FlowGraphCompiler::FlowGraphCompiler(
-    Assembler* assembler,
-    const ParsedFunction& parsed_function,
-    const GrowableArray<BlockEntryInstr*>& block_order,
-    bool is_optimizing)
-    : FlowGraphCompilerShared(assembler,
-                              parsed_function,
-                              block_order,
-                              is_optimizing) {}
-
 
 #define __ assembler()->
 
 void FlowGraphCompiler::GenerateInlinedGetter(intptr_t offset) {
   // TOS: return address.
   // +1 : receiver.
   // Sequence node has one return node, its input is load field node.
   __ movl(EAX, Address(ESP, 1 * kWordSize));
   __ movl(EAX, FieldAddress(EAX, offset));
   __ ret();
@@ skipping 882 matching lines @@
   // type check runtime call is the checked value.
   __ Drop(8);
   __ popl(EAX);
 
   __ Bind(&is_assignable);
   __ popl(EDX);  // Remove pushed instantiator type arguments..
   __ popl(ECX);  // Remove pushed instantiator.
 }
 
 
-void FlowGraphCompiler::EmitComment(Instruction* instr) {
-  char buffer[80];
-  BufferFormatter f(buffer, sizeof(buffer));
-  instr->PrintTo(&f);
-  __ Comment("@%d: %s", instr->cid(), buffer);
-}
-
-
-void FlowGraphCompiler::BailoutOnInstruction(Instruction* instr) {
-  char buffer[80];
-  BufferFormatter f(buffer, sizeof(buffer));
-  instr->PrintTo(&f);
-  Bailout(buffer);
-}
-
-
 void FlowGraphCompiler::EmitInstructionPrologue(Instruction* instr) {
   LocationSummary* locs = instr->locs();
   ASSERT(locs != NULL);
 
   locs->AllocateRegisters();
 
   // Load instruction inputs into allocated registers.
   for (intptr_t i = locs->input_count() - 1; i >= 0; i--) {
     Location loc = locs->in(i);
     ASSERT(loc.kind() == Location::kRegister);
     __ popl(loc.reg());
   }
 }
 
 
-void FlowGraphCompiler::VisitBlocks() {
-  for (intptr_t i = 0; i < block_order().length(); ++i) {
-    __ Comment("B%d", i);
-    // Compile the block entry.
-    set_current_block(block_order()[i]);
-    current_block()->PrepareEntry(this);
-    Instruction* instr = current_block()->StraightLineSuccessor();
-    // Compile all successors until an exit, branch, or a block entry.
-    while ((instr != NULL) && !instr->IsBlockEntry()) {
-      if (FLAG_code_comments) EmitComment(instr);
-      if (instr->locs() == NULL) {
-        BailoutOnInstruction(instr);
-      } else {
-        EmitInstructionPrologue(instr);
-        instr->EmitNativeCode(this);
-        instr = instr->StraightLineSuccessor();
-      }
-    }
-    BlockEntryInstr* successor =
-        (instr == NULL) ? NULL : instr->AsBlockEntry();
-    if (successor != NULL) {
-      // Block ended with a "goto".  We can fall through if it is the
-      // next block in the list.  Otherwise, we need a jump.
-      if ((i == block_order().length() - 1) ||
-          (block_order()[i + 1] != successor)) {
-        __ jmp(GetBlockLabel(successor));
-      }
-    }
-  }
-}
-
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32