Move ReturnInstr to new scheme (x64 and ia32) and implement more code in new ia32 compiler.

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 "vm/ast_printer.h"
@@ skipping 306 matching lines @@
   // at entry point.
   pc_descriptors_list_->AddDescriptor(PcDescriptors::kPatchCode,
                                       assembler_->CodeSize(),
                                       AstNode::kNoId,
                                       0,
                                       -1);
   __ jmp(&StubCode::FixCallersTargetLabel());
 }
 
 
+void FlowGraphCompiler::EmitInstanceCall(intptr_t cid,
+                                         intptr_t token_index,
+                                         intptr_t try_index,
+                                         const String& function_name,
+                                         intptr_t argument_count,
+                                         const Array& argument_names,
+                                         intptr_t checked_argument_count) {
+  ICData& ic_data = ICData::ZoneHandle(ICData::New(parsed_function_.function(),

[Vyacheslav Egorov (Google), 2012/05/31 12:11:01]

This function seems to duplicate considerable amount of code from
CodeGenerator::GenerateInstanceCall. 

Consider sharing.

[srdjan, 2012/05/31 16:24:39]

Know how to do it, but requires a major change in the structure of
FlowGraphCompiler, next CL.

+                                                   function_name,
+                                                   cid,
+                                                   checked_argument_count));
+  const Array& arguments_descriptor =
+      CodeGenerator::ArgumentsDescriptor(argument_count, argument_names);
+  __ LoadObject(ECX, ic_data);
+  __ LoadObject(EDX, arguments_descriptor);
+
+  uword label_address = 0;
+  switch (checked_argument_count) {
+    case 1:
+      label_address = StubCode::OneArgCheckInlineCacheEntryPoint();
+      break;
+    case 2:
+      label_address = StubCode::TwoArgsCheckInlineCacheEntryPoint();
+      break;
+    default:
+      UNIMPLEMENTED();
+  }
+  ExternalLabel target_label("InlineCache", label_address);
+  __ call(&target_label);
+  AddCurrentDescriptor(PcDescriptors::kIcCall, cid, token_index, try_index);
+  __ Drop(argument_count);
+}
+
+
+void FlowGraphCompiler::EmitStaticCall(intptr_t token_index,
+                                       intptr_t try_index,
+                                       const Function& function,
+                                       intptr_t argument_count,
+                                       const Array& argument_names) {
+  const Array& arguments_descriptor =

[Vyacheslav Egorov (Google), 2012/05/31 12:11:01]

This function duplicates code from CodeGenerator::VisitStaticCallNode 

Consider sharing.

[srdjan, 2012/05/31 16:24:39]

Done.

+      CodeGenerator::ArgumentsDescriptor(argument_count, argument_names);
+  __ LoadObject(ECX, function);
+  __ LoadObject(EDX, arguments_descriptor);
+
+  GenerateCall(token_index,
+               try_index,
+               &StubCode::CallStaticFunctionLabel(),
+               PcDescriptors::kFuncCall);
+  __ Drop(argument_count);
+}
+
+
+void FlowGraphCompiler::GenerateCall(intptr_t token_index,
+                                     intptr_t try_index,
+                                     const ExternalLabel* label,
+                                     PcDescriptors::Kind kind) {
+  __ call(label);
+  AddCurrentDescriptor(kind, AstNode::kNoId, token_index, try_index);
+}
+
+
 void FlowGraphCompiler::GenerateDeferredCode() {
   for (intptr_t i = 0; i < deopt_stubs_.length(); i++) {
     deopt_stubs_[i]->GenerateCode(this);
   }
 }
 
 
 void FlowGraphCompiler::EmitComment(Instruction* instr) {
   char buffer[80];
   BufferFormatter f(buffer, sizeof(buffer));
@@ skipping 94 matching lines @@
 
 void FlowGraphCompiler::FinalizeComments(const Code& code) {
   code.set_comments(assembler_->GetCodeComments());
 }
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32