Move more nodes to the optimizing code generator.

runtime/vm/code_generator_ia32.cc

 // Copyright (c) 2011, 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/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 15 matching lines @@
 DEFINE_FLAG(bool, trace_functions, false, "Trace entry of each function.");
 DEFINE_FLAG(int, optimization_invocation_threshold, 1000,
     "number of invocations before a function is optimized, -1 means never.");
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, report_invocation_count);
 DECLARE_FLAG(bool, trace_compiler);
 
 #define __ assembler_->
 
 
-class CodeGeneratorState : public StackResource {
- public:
-  explicit CodeGeneratorState(CodeGenerator* codegen)
-      : StackResource(Isolate::Current()),
-        codegen_(codegen),
-        parent_(codegen->state()) {
-    if (parent_ != NULL) {
-      root_node_ = parent_->root_node_;
-      loop_level_ = parent_->loop_level_;
-      context_level_ = parent_->context_level_;
-      current_try_index_ = parent_->current_try_index_;
-    } else {
-      root_node_ = NULL;
-      loop_level_ = 0;
-      context_level_ = 0;
-      current_try_index_ = CatchClauseNode::kInvalidTryIndex;
-    }
-    codegen_->set_state(this);
+CodeGeneratorState::CodeGeneratorState(CodeGenerator* codegen)
+    : StackResource(Isolate::Current()),
+      codegen_(codegen),
+      parent_(codegen->state()) {
+  if (parent_ != NULL) {
+    root_node_ = parent_->root_node_;
+    loop_level_ = parent_->loop_level_;
+    context_level_ = parent_->context_level_;
+    current_try_index_ = parent_->current_try_index_;
+  } else {
+    root_node_ = NULL;
+    loop_level_ = 0;
+    context_level_ = 0;
+    current_try_index_ = CatchClauseNode::kInvalidTryIndex;
   }
-  virtual ~CodeGeneratorState() {
-    codegen_->set_state(parent_);
-  }
+  codegen_->set_state(this);
+}
 
-  CodeGeneratorState* parent() const { return parent_; }
 
-  AstNode* root_node() const { return root_node_; }
-  void set_root_node(AstNode* value) { root_node_ = value; }
-  bool IsRootNode(AstNode* node) const {
-    return root_node_ == node;
-  }
-
-  int loop_level() const { return loop_level_; }
-  void set_loop_level(int loop_level) {
-    loop_level_ = loop_level;
-  }
-
-  int context_level() const { return context_level_; }
-  void set_context_level(int context_level) {
-    context_level_ = context_level;
-  }
-
-  int try_index() const { return current_try_index_; }
-  void set_try_index(int value) {
-    current_try_index_ = value;
-  }
-
- private:
-  CodeGenerator* codegen_;
-  CodeGeneratorState* parent_;
-  AstNode* root_node_;
-
-  // The loop level reflects the lexical nesting of loop statements, regardless
-  // of the presence of captured variables.
-  int loop_level_;
-
-  // The runtime context level is only incremented when a new context is
-  // allocated and chained to the list of contexts. This occurs when the scopes
-  // at the current loop level contain captured variables.
-  int context_level_;
-
-  // We identify each try block in this function with an unique 'try index'
-  // value.
-  // The 'try index' is used to match the try blocks with the corresponding
-  // catch block (if one exists). The PC descriptors generated for
-  // statements in the try block use this index so that it can be matched
-  // to the appropriate catch block.
-  // The 'try index' value is generated by incrementing the try_index_
-  // variable in the CodeGenerator object.
-  // We store the 'try index' of the block of code that we are
-  // currently generating code for in the current_try_index_ variable.
-  int current_try_index_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(CodeGeneratorState);
-};
+CodeGeneratorState::~CodeGeneratorState() {
+  codegen_->set_state(parent_);
+}
 
 
 class CodeGenerator::DescriptorList : public ZoneAllocated {
  public:
   struct PcDesc {
     intptr_t pc_offset;        // PC offset value of the descriptor.
     PcDescriptors::Kind kind;  // Descriptor kind (kDeopt, kOther).
     intptr_t node_id;          // AST node id.
     intptr_t token_index;      // Token position in source of PC.
     intptr_t try_index;        // Try block index of PC.
@@ skipping 640 matching lines @@
   // Consider emitting pushes instead of moves.
   for (int index = first_local_index; index > first_free_frame_index; index--) {
     if (index == first_local_index) {
       __ movl(EAX, raw_null);
     }
     __ movl(Address(EBP, index * kWordSize), EAX);
   }
 }
 
 
+void CodeGenerator::GenerateReturnEpilog() {
+  // Unchain the context(s) up to context level 0.
+  int context_level = state()->context_level();
+  ASSERT(context_level >= 0);
+  while (context_level-- > 0) {
+    __ movl(CTX, FieldAddress(CTX, Context::parent_offset()));
+  }
+#ifdef DEBUG
+  // Check that the entry stack size matches the exit stack size.
+  __ movl(EDX, EBP);
+  __ subl(EDX, ESP);
+  ASSERT(locals_space_size() >= 0);
+  __ cmpl(EDX, Immediate(locals_space_size()));
+  Label wrong_stack;
+  __ j(NOT_EQUAL, &wrong_stack, Assembler::kNearJump);
+#endif  // DEBUG.
+
+  if (FLAG_trace_functions) {
+    __ pushl(EAX);  // Preserve result.
+    const Function& function =
+        Function::ZoneHandle(parsed_function_.function().raw());
+    __ LoadObject(EBX, function);
+    __ pushl(EBX);
+    GenerateCallRuntime(AstNode::kNoId,
+                        0,
+                        kTraceFunctionExitRuntimeEntry);
+    __ popl(EAX);  // Remove argument.
+    __ popl(EAX);  // Restore result.
+  }
+  __ LeaveFrame();
+  __ ret();
+
+#ifdef DEBUG
+  __ Bind(&wrong_stack);
+  __ Stop("Exit stack size does not match the entry stack size.");
+#endif  // DEBUG.
+}
+
+
 void CodeGenerator::VisitReturnNode(ReturnNode* node) {
   ASSERT(!IsResultNeeded(node));
   ASSERT(node->value() != NULL);
 
   if (!node->value()->IsLiteralNode()) {
     node->value()->Visit(this);
     // The result of the return value is now on top of the stack.
   }
 
   // Generate inlined code for all finally blocks as we are about to transfer
@@ skipping 21 matching lines @@
     // Implicit getters do not need a type check at return.
     if ((kind != RawFunction::kImplicitGetter) &&
         (kind != RawFunction::kConstImplicitGetter)) {
       GenerateAssertAssignable(
           node->id(),
           node->value()->token_index(),
           Type::ZoneHandle(parsed_function().function().result_type()),
           String::ZoneHandle(String::NewSymbol("function result")));
     }
   }
-  // Unchain the context(s) up to context level 0.
-  int context_level = state()->context_level();
-  ASSERT(context_level >= 0);
-  while (context_level-- > 0) {
-    __ movl(CTX, FieldAddress(CTX, Context::parent_offset()));
-  }
-#ifdef DEBUG
-  // Check that the entry stack size matches the exit stack size.
-  __ movl(EDX, EBP);
-  __ subl(EDX, ESP);
-  ASSERT(locals_space_size() >= 0);
-  __ cmpl(EDX, Immediate(locals_space_size()));
-  Label wrong_stack;
-  __ j(NOT_EQUAL, &wrong_stack, Assembler::kNearJump);
-#endif  // DEBUG.
-
-  if (FLAG_trace_functions) {
-    __ pushl(EAX);  // Preserve result.
-    const Function& function =
-        Function::ZoneHandle(parsed_function_.function().raw());
-    __ LoadObject(EBX, function);
-    __ pushl(EBX);
-    GenerateCallRuntime(AstNode::kNoId,
-                        0,
-                        kTraceFunctionExitRuntimeEntry);
-    __ popl(EAX);  // Remove argument.
-    __ popl(EAX);  // Restore result.
-  }
-  __ LeaveFrame();
-  __ ret();
-
-#ifdef DEBUG
-  __ Bind(&wrong_stack);
-  __ Stop("Exit stack size does not match the entry stack size.");
-#endif  // DEBUG.
+  GenerateReturnEpilog();
 }
 
 
 void CodeGenerator::VisitLiteralNode(LiteralNode* node) {
   if (!IsResultNeeded(node)) return;
   const Object& literal = node->literal();
   if (literal.IsSmi()) {
     __ pushl(Immediate(reinterpret_cast<int32_t>(literal.raw())));
   } else {
     __ PushObject(literal);
@@ skipping 1908 matching lines @@
                         message_buffer, kMessageBufferSize,
                         format, args);
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, message_buffer);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32