First round of size reduction for JumpTargets. Reduce their size by...

src/jump-target.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 21 matching lines @@
 #include "register-allocator-inl.h"
 
 namespace v8 { namespace internal {
 
 // -------------------------------------------------------------------------
 // JumpTarget implementation.
 
 bool JumpTarget::compiling_deferred_code_ = false;
 
 
-JumpTarget::JumpTarget(CodeGenerator* cgen, Directionality direction)
-    : cgen_(cgen),
-      direction_(direction),
-      reaching_frames_(0),
-      merge_labels_(0),
-      entry_frame_(NULL) {
-  ASSERT(cgen != NULL);
-  masm_ = cgen->masm();
-}
-
-
-JumpTarget::JumpTarget()
-    : cgen_(NULL),
-      masm_(NULL),
-      direction_(FORWARD_ONLY),
-      reaching_frames_(0),
-      merge_labels_(0),
-      entry_frame_(NULL) {
-}
-
-
-void JumpTarget::Initialize(CodeGenerator* cgen, Directionality direction) {
-  ASSERT(cgen != NULL);
-  ASSERT(cgen_ == NULL);
-  cgen_ = cgen;
-  masm_ = cgen->masm();
-  direction_ = direction;
-}
-
-
 void JumpTarget::Unuse() {
   reaching_frames_.Clear();
   merge_labels_.Clear();
   entry_frame_ = NULL;
   entry_label_.Unuse();
 }
 
 
 void JumpTarget::ComputeEntryFrame(int mergable_elements) {
   // Given: a collection of frames reaching by forward CFG edges and
@@ skipping 62 matching lines @@
 
         element = element->Combine(&reaching_frames_[j]->elements_[i]);
       }
       elements[i] = element;
     }
   }
 
   // Build the new frame.  A freshly allocated frame has memory elements
   // for the parameters and some platform-dependent elements (e.g.,
   // return address).  Replace those first.
-  entry_frame_ = new VirtualFrame(cgen_);
+  entry_frame_ = new VirtualFrame(cgen());
   int index = 0;
   for (; index < entry_frame_->elements_.length(); index++) {
     FrameElement* target = elements[index];
     // If the element is determined, set it now.  Count registers.  Mark
     // elements as copied exactly when they have a copy.  Undetermined
     // elements are initially recorded as if in memory.
     if (target != NULL) {
       entry_frame_->elements_[index] = *target;
       InitializeEntryElement(index, target);
     }
@@ skipping 94 matching lines @@
   entry_frame_->stack_pointer_ = stack_pointer;
 }
 
 
 void JumpTarget::Jump() {
   DoJump();
 }
 
 
 void JumpTarget::Jump(Result* arg) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->has_valid_frame());
+  ASSERT(cgen()->has_valid_frame());
 
-  cgen_->frame()->Push(arg);
+  cgen()->frame()->Push(arg);
   DoJump();
 }
 
 
 void JumpTarget::Jump(Result* arg0, Result* arg1) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->has_valid_frame());
+  ASSERT(cgen()->has_valid_frame());
 
-  cgen_->frame()->Push(arg0);
-  cgen_->frame()->Push(arg1);
+  cgen()->frame()->Push(arg0);
+  cgen()->frame()->Push(arg1);
   DoJump();
 }
 
 
 void JumpTarget::Jump(Result* arg0, Result* arg1, Result* arg2) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->has_valid_frame());
+  ASSERT(cgen()->has_valid_frame());
 
-  cgen_->frame()->Push(arg0);
-  cgen_->frame()->Push(arg1);
-  cgen_->frame()->Push(arg2);
+  cgen()->frame()->Push(arg0);
+  cgen()->frame()->Push(arg1);
+  cgen()->frame()->Push(arg2);
   DoJump();
 }
 
 
 void JumpTarget::Branch(Condition cc, Hint hint) {
   DoBranch(cc, hint);
 }
 
 
 #ifdef DEBUG
 #define DECLARE_ARGCHECK_VARS(name)                                \
   Result::Type name##_type = name->type();                         \
   Register name##_reg = name->is_register() ? name->reg() : no_reg
 
 #define ASSERT_ARGCHECK(name)                                \
   ASSERT(name->type() == name##_type);                       \
   ASSERT(!name->is_register() || name->reg().is(name##_reg))
 
 #else
 #define DECLARE_ARGCHECK_VARS(name) do {} while (false)
 
 #define ASSERT_ARGCHECK(name) do {} while (false)
 #endif
 
 void JumpTarget::Branch(Condition cc, Result* arg, Hint hint) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->has_valid_frame());
+  ASSERT(cgen()->has_valid_frame());
 
   // We want to check that non-frame registers at the call site stay in
   // the same registers on the fall-through branch.
   DECLARE_ARGCHECK_VARS(arg);
 
-  cgen_->frame()->Push(arg);
+  cgen()->frame()->Push(arg);
   DoBranch(cc, hint);
-  *arg = cgen_->frame()->Pop();
+  *arg = cgen()->frame()->Pop();
 
   ASSERT_ARGCHECK(arg);
 }
 
 
 void JumpTarget::Branch(Condition cc, Result* arg0, Result* arg1, Hint hint) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->frame() != NULL);
+  ASSERT(cgen()->frame() != NULL);
 
   // We want to check that non-frame registers at the call site stay in
   // the same registers on the fall-through branch.
   DECLARE_ARGCHECK_VARS(arg0);
   DECLARE_ARGCHECK_VARS(arg1);
 
-  cgen_->frame()->Push(arg0);
-  cgen_->frame()->Push(arg1);
+  cgen()->frame()->Push(arg0);
+  cgen()->frame()->Push(arg1);
   DoBranch(cc, hint);
-  *arg1 = cgen_->frame()->Pop();
-  *arg0 = cgen_->frame()->Pop();
+  *arg1 = cgen()->frame()->Pop();
+  *arg0 = cgen()->frame()->Pop();
 
   ASSERT_ARGCHECK(arg0);
   ASSERT_ARGCHECK(arg1);
 }
 
 
 void JumpTarget::Branch(Condition cc,
                         Result* arg0,
                         Result* arg1,
                         Result* arg2,
                         Hint hint) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->frame() != NULL);
+  ASSERT(cgen()->frame() != NULL);
 
   // We want to check that non-frame registers at the call site stay in
   // the same registers on the fall-through branch.
   DECLARE_ARGCHECK_VARS(arg0);
   DECLARE_ARGCHECK_VARS(arg1);
   DECLARE_ARGCHECK_VARS(arg2);
 
-  cgen_->frame()->Push(arg0);
-  cgen_->frame()->Push(arg1);
-  cgen_->frame()->Push(arg2);
+  cgen()->frame()->Push(arg0);
+  cgen()->frame()->Push(arg1);
+  cgen()->frame()->Push(arg2);
   DoBranch(cc, hint);
-  *arg2 = cgen_->frame()->Pop();
-  *arg1 = cgen_->frame()->Pop();
-  *arg0 = cgen_->frame()->Pop();
+  *arg2 = cgen()->frame()->Pop();
+  *arg1 = cgen()->frame()->Pop();
+  *arg0 = cgen()->frame()->Pop();
 
   ASSERT_ARGCHECK(arg0);
   ASSERT_ARGCHECK(arg1);
   ASSERT_ARGCHECK(arg2);
 }
 
 
 void JumpTarget::Branch(Condition cc,
                         Result* arg0,
                         Result* arg1,
                         Result* arg2,
                         Result* arg3,
                         Hint hint) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->frame() != NULL);
+  ASSERT(cgen()->frame() != NULL);
 
   // We want to check that non-frame registers at the call site stay in
   // the same registers on the fall-through branch.
   DECLARE_ARGCHECK_VARS(arg0);
   DECLARE_ARGCHECK_VARS(arg1);
   DECLARE_ARGCHECK_VARS(arg2);
   DECLARE_ARGCHECK_VARS(arg3);
 
-  cgen_->frame()->Push(arg0);
-  cgen_->frame()->Push(arg1);
-  cgen_->frame()->Push(arg2);
-  cgen_->frame()->Push(arg3);
+  cgen()->frame()->Push(arg0);
+  cgen()->frame()->Push(arg1);
+  cgen()->frame()->Push(arg2);
+  cgen()->frame()->Push(arg3);
   DoBranch(cc, hint);
-  *arg3 = cgen_->frame()->Pop();
-  *arg2 = cgen_->frame()->Pop();
-  *arg1 = cgen_->frame()->Pop();
-  *arg0 = cgen_->frame()->Pop();
+  *arg3 = cgen()->frame()->Pop();
+  *arg2 = cgen()->frame()->Pop();
+  *arg1 = cgen()->frame()->Pop();
+  *arg0 = cgen()->frame()->Pop();
 
   ASSERT_ARGCHECK(arg0);
   ASSERT_ARGCHECK(arg1);
   ASSERT_ARGCHECK(arg2);
   ASSERT_ARGCHECK(arg3);
 }
 
 
 void BreakTarget::Branch(Condition cc, Result* arg, Hint hint) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->has_valid_frame());
+  ASSERT(cgen()->has_valid_frame());
 
-  int count = cgen_->frame()->height() - expected_height_;
+  int count = cgen()->frame()->height() - expected_height_;
   if (count > 0) {
     // We negate and branch here rather than using DoBranch's negate
     // and branch.  This gives us a hook to remove statement state
     // from the frame.
-    JumpTarget fall_through(cgen_);
+    JumpTarget fall_through;
     // Branch to fall through will not negate, because it is a
     // forward-only target.
     fall_through.Branch(NegateCondition(cc), NegateHint(hint));
     Jump(arg);  // May emit merge code here.
     fall_through.Bind();
   } else {
     DECLARE_ARGCHECK_VARS(arg);
-    cgen_->frame()->Push(arg);
+    cgen()->frame()->Push(arg);
     DoBranch(cc, hint);
-    *arg = cgen_->frame()->Pop();
+    *arg = cgen()->frame()->Pop();
     ASSERT_ARGCHECK(arg);
   }
 }
 
 #undef DECLARE_ARGCHECK_VARS
 #undef ASSERT_ARGCHECK
 
 
 void JumpTarget::Bind(int mergable_elements) {
   DoBind(mergable_elements);
 }
 
 
 void JumpTarget::Bind(Result* arg, int mergable_elements) {
-  ASSERT(cgen_ != NULL);
-
-  if (cgen_->has_valid_frame()) {
-    cgen_->frame()->Push(arg);
+  if (cgen()->has_valid_frame()) {
+    cgen()->frame()->Push(arg);
   }
   DoBind(mergable_elements);
-  *arg = cgen_->frame()->Pop();
+  *arg = cgen()->frame()->Pop();
 }
 
 
 void JumpTarget::Bind(Result* arg0, Result* arg1, int mergable_elements) {
-  ASSERT(cgen_ != NULL);
-
-  if (cgen_->has_valid_frame()) {
-    cgen_->frame()->Push(arg0);
-    cgen_->frame()->Push(arg1);
+  if (cgen()->has_valid_frame()) {
+    cgen()->frame()->Push(arg0);
+    cgen()->frame()->Push(arg1);
   }
   DoBind(mergable_elements);
-  *arg1 = cgen_->frame()->Pop();
-  *arg0 = cgen_->frame()->Pop();
+  *arg1 = cgen()->frame()->Pop();
+  *arg0 = cgen()->frame()->Pop();
 }
 
 
 void JumpTarget::Bind(Result* arg0,
                       Result* arg1,
                       Result* arg2,
                       int mergable_elements) {
-  ASSERT(cgen_ != NULL);
-
-  if (cgen_->has_valid_frame()) {
-    cgen_->frame()->Push(arg0);
-    cgen_->frame()->Push(arg1);
-    cgen_->frame()->Push(arg2);
+  if (cgen()->has_valid_frame()) {
+    cgen()->frame()->Push(arg0);
+    cgen()->frame()->Push(arg1);
+    cgen()->frame()->Push(arg2);
   }
   DoBind(mergable_elements);
-  *arg2 = cgen_->frame()->Pop();
-  *arg1 = cgen_->frame()->Pop();
-  *arg0 = cgen_->frame()->Pop();
+  *arg2 = cgen()->frame()->Pop();
+  *arg1 = cgen()->frame()->Pop();
+  *arg0 = cgen()->frame()->Pop();
 }
 
 
 void JumpTarget::Bind(Result* arg0,
                       Result* arg1,
                       Result* arg2,
                       Result* arg3,
                       int mergable_elements) {
-  ASSERT(cgen_ != NULL);
-
-  if (cgen_->has_valid_frame()) {
-    cgen_->frame()->Push(arg0);
-    cgen_->frame()->Push(arg1);
-    cgen_->frame()->Push(arg2);
-    cgen_->frame()->Push(arg3);
+  if (cgen()->has_valid_frame()) {
+    cgen()->frame()->Push(arg0);
+    cgen()->frame()->Push(arg1);
+    cgen()->frame()->Push(arg2);
+    cgen()->frame()->Push(arg3);
   }
   DoBind(mergable_elements);
-  *arg3 = cgen_->frame()->Pop();
-  *arg2 = cgen_->frame()->Pop();
-  *arg1 = cgen_->frame()->Pop();
-  *arg0 = cgen_->frame()->Pop();
+  *arg3 = cgen()->frame()->Pop();
+  *arg2 = cgen()->frame()->Pop();
+  *arg1 = cgen()->frame()->Pop();
+  *arg0 = cgen()->frame()->Pop();
 }
 
 
 void JumpTarget::AddReachingFrame(VirtualFrame* frame) {
   ASSERT(reaching_frames_.length() == merge_labels_.length());
   ASSERT(entry_frame_ == NULL);
   Label fresh;
   merge_labels_.Add(fresh);
   reaching_frames_.Add(frame);
 }
 
 
 // -------------------------------------------------------------------------
 // BreakTarget implementation.
 
-void BreakTarget::Initialize(CodeGenerator* cgen, Directionality direction) {
-  JumpTarget::Initialize(cgen, direction);
-  ASSERT(cgen_->has_valid_frame());
-  expected_height_ = cgen_->frame()->height();
+void BreakTarget::set_direction(Directionality direction) {
+  JumpTarget::set_direction(direction);
+  ASSERT(cgen()->has_valid_frame());
+  expected_height_ = cgen()->frame()->height();
 }
 
 
 void BreakTarget::CopyTo(BreakTarget* destination) {
   ASSERT(destination != NULL);
-  destination->cgen_ = cgen_;
-  destination->masm_ = masm_;
   destination->direction_ = direction_;
   destination->reaching_frames_.Clear();
   destination->merge_labels_.Clear();
   ASSERT(reaching_frames_.length() == merge_labels_.length());
   for (int i = 0; i < reaching_frames_.length(); i++) {
     destination->reaching_frames_.Add(reaching_frames_[i]);
     destination->merge_labels_.Add(merge_labels_[i]);
   }
   destination->entry_frame_ = entry_frame_;
   destination->entry_label_ = entry_label_;
   destination->expected_height_ = expected_height_;
 }
 
 
 void BreakTarget::Jump() {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->has_valid_frame());
+  ASSERT(cgen()->has_valid_frame());
 
   // Drop leftover statement state from the frame before merging.
-  cgen_->frame()->ForgetElements(cgen_->frame()->height() - expected_height_);
+  cgen()->frame()->ForgetElements(cgen()->frame()->height() - expected_height_);
   DoJump();
 }
 
 
 void BreakTarget::Jump(Result* arg) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->has_valid_frame());
+  ASSERT(cgen()->has_valid_frame());
 
   // Drop leftover statement state from the frame before merging.
-  cgen_->frame()->ForgetElements(cgen_->frame()->height() - expected_height_);
-  cgen_->frame()->Push(arg);
+  cgen()->frame()->ForgetElements(cgen()->frame()->height() - expected_height_);
+  cgen()->frame()->Push(arg);
   DoJump();
 }
 
 
 void BreakTarget::Branch(Condition cc, Hint hint) {
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->has_valid_frame());
+  ASSERT(cgen()->has_valid_frame());
 
-  int count = cgen_->frame()->height() - expected_height_;
+  int count = cgen()->frame()->height() - expected_height_;
   if (count > 0) {
     // We negate and branch here rather than using DoBranch's negate
     // and branch.  This gives us a hook to remove statement state
     // from the frame.
-    JumpTarget fall_through(cgen_);
+    JumpTarget fall_through;
     // Branch to fall through will not negate, because it is a
     // forward-only target.
     fall_through.Branch(NegateCondition(cc), NegateHint(hint));
     Jump();  // May emit merge code here.
     fall_through.Bind();
   } else {
     DoBranch(cc, hint);
   }
 }
 
 
 void BreakTarget::Bind(int mergable_elements) {
 #ifdef DEBUG
-  ASSERT(cgen_ != NULL);
   // All the forward-reaching frames should have been adjusted at the
   // jumps to this target.
   for (int i = 0; i < reaching_frames_.length(); i++) {
     ASSERT(reaching_frames_[i] == NULL ||
            reaching_frames_[i]->height() == expected_height_);
   }
 #endif
   // Drop leftover statement state from the frame before merging, even
   // on the fall through.  This is so we can bind the return target
   // with state on the frame.
-  if (cgen_->has_valid_frame()) {
-    cgen_->frame()->ForgetElements(cgen_->frame()->height() - expected_height_);
+  if (cgen()->has_valid_frame()) {
+    int count = cgen()->frame()->height() - expected_height_;
+    cgen()->frame()->ForgetElements(count);
   }
   DoBind(mergable_elements);
 }
 
 
 void BreakTarget::Bind(Result* arg, int mergable_elements) {
 #ifdef DEBUG
-  ASSERT(cgen_ != NULL);
   // All the forward-reaching frames should have been adjusted at the
   // jumps to this target.
   for (int i = 0; i < reaching_frames_.length(); i++) {
     ASSERT(reaching_frames_[i] == NULL ||
            reaching_frames_[i]->height() == expected_height_ + 1);
   }
 #endif
   // Drop leftover statement state from the frame before merging, even
   // on the fall through.  This is so we can bind the return target
   // with state on the frame.
-  if (cgen_->has_valid_frame()) {
-    cgen_->frame()->ForgetElements(cgen_->frame()->height() - expected_height_);
-    cgen_->frame()->Push(arg);
+  if (cgen()->has_valid_frame()) {
+    int count = cgen()->frame()->height() - expected_height_;
+    cgen()->frame()->ForgetElements(count);
+    cgen()->frame()->Push(arg);
   }
   DoBind(mergable_elements);
-  *arg = cgen_->frame()->Pop();
+  *arg = cgen()->frame()->Pop();
 }
 
 
 // -------------------------------------------------------------------------
 // ShadowTarget implementation.
 
 ShadowTarget::ShadowTarget(BreakTarget* shadowed) {
   ASSERT(shadowed != NULL);
   other_target_ = shadowed;
 
 #ifdef DEBUG
   is_shadowing_ = true;
 #endif
   // While shadowing this shadow target saves the state of the original.
   shadowed->CopyTo(this);
 
   // The original's state is reset.
   shadowed->Unuse();
-  ASSERT(cgen_ != NULL);
-  ASSERT(cgen_->has_valid_frame());
-  shadowed->set_expected_height(cgen_->frame()->height());
-
-  // Setting the code generator to null prevents the shadow target from
-  // being used until shadowing stops.
-  cgen_ = NULL;
-  masm_ = NULL;
+  ASSERT(cgen()->has_valid_frame());
+  shadowed->set_expected_height(cgen()->frame()->height());
 }
 
 
 void ShadowTarget::StopShadowing() {
   ASSERT(is_shadowing_);
 
-  // This target does not have a valid code generator yet.
-  cgen_ = other_target_->code_generator();
-  ASSERT(cgen_ != NULL);
-  masm_ = cgen_->masm();
-
   // The states of this target, which was shadowed, and the original
   // target, which was shadowing, are swapped.
   BreakTarget temp;
   other_target_->CopyTo(&temp);
   CopyTo(other_target_);
   temp.CopyTo(this);
   temp.Unuse();
 
 #ifdef DEBUG
   is_shadowing_ = false;
 #endif
 }
 
 
 } }  // namespace v8::internal