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

runtime/vm/flow_graph_compiler_x64.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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
 #include "vm/ast_printer.h"
 #include "vm/code_descriptors.h"
 #include "vm/code_generator.h"
 #include "vm/disassembler.h"
 #include "vm/il_printer.h"
 #include "vm/locations.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, print_scopes, false, "Print scopes of local variables.");
 DEFINE_FLAG(bool, trace_functions, false, "Trace entry of each function.");
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, print_ast);
-DECLARE_FLAG(bool, code_comments);
 
 
-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) {
       __ pushq(registers_[i]);
     }
   }
   __ movq(RAX, 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()->
 
 
 
 // Fall through if bool_register contains null.
 void FlowGraphCompiler::GenerateBoolToJump(Register bool_register,
                                            Label* is_true,
                                            Label* is_false) {
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
@@ skipping 582 matching lines @@
 
   // 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);
     __ popq(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);
-      ASSERT(instr->locs() != NULL);
-      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));
-      }
-    }
-  }
-}
-
-
-void FlowGraphCompiler::EmitComment(Instruction* instr) {
-  char buffer[80];
-  BufferFormatter f(buffer, sizeof(buffer));
-  instr->PrintTo(&f);
-  __ Comment("@%d: %s", instr->cid(), buffer);
-}
-
-
 // Copied from CodeGenerator::CopyParameters (CodeGenerator will be deprecated).
 void FlowGraphCompiler::CopyParameters() {
   const Function& function = parsed_function().function();
   LocalScope* scope = parsed_function().node_sequence()->scope();
   const int num_fixed_params = function.num_fixed_parameters();
   const int num_opt_params = function.num_optional_parameters();
   ASSERT(parsed_function().first_parameter_index() ==
          ParsedFunction::kFirstLocalSlotIndex);
   // Copy positional arguments.
   // Check that no fewer than num_fixed_params positional arguments are passed
@@ skipping 319 matching lines @@
   __ CallRuntime(entry);
   AddCurrentDescriptor(PcDescriptors::kOther, cid, token_index, try_index);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64