Use unspilled virtual frames when compiling compare operations....

src/jump-target-ia32.cc

 // Copyright 2008 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 150 matching lines @@
 
   cgen_->frame()->Push(arg);
   Branch(cc, hint);
   *arg = cgen_->frame()->Pop();
 
   ASSERT(arg->type() == arg_type);
   ASSERT(!arg->is_register() || arg->reg().is(arg_reg));
 }
 
 
+void JumpTarget::Branch(Condition cc, Result* arg_1, Result* arg_2, Hint hint) {
+  ASSERT(cgen_ != NULL);
+  ASSERT(cgen_->frame() != NULL);
+
+#ifdef DEBUG
+  // We want register results at the call site to stay in the same registers
+  // on the fall-through branch.
+  Result::Type arg_1_type = arg_1->type();

[Kevin Millikin (Chromium), 2008/12/29 09:05:38]

These assertions don't scale so well.  We should try to come up with a macro for
the binding site and a function for the test.  That can be a separate change.

+  Register arg_1_reg = arg_1->is_register() ? arg_1->reg() : no_reg;
+  Result::Type arg_2_type = arg_2->type();
+  Register arg_2_reg = arg_2->is_register() ? arg_2->reg() : no_reg;
+#endif
+
+  cgen_->frame()->Push(arg_1);
+  cgen_->frame()->Push(arg_2);
+  Branch(cc, hint);
+  *arg_2 = cgen_->frame()->Pop();
+  *arg_1 = cgen_->frame()->Pop();
+
+  ASSERT(arg_1->type() == arg_1_type);
+  ASSERT(!arg_1->is_register() || arg_1->reg().is(arg_1_reg));
+  ASSERT(arg_2->type() == arg_2_type);
+  ASSERT(!arg_2->is_register() || arg_2->reg().is(arg_2_reg));
+}
+
+
 void JumpTarget::Call() {
   // Precondition: there is a current frame, and there is no expected frame
   // at the label.
   ASSERT(cgen_ != NULL);
   ASSERT(masm_ != NULL);
   ASSERT(!cgen_->IsActualFunctionReturn(this));
 
   VirtualFrame* current_frame = cgen_->frame();
   ASSERT(current_frame != NULL);
   ASSERT(expected_frame_ == NULL);
@@ skipping 73 matching lines @@
     cgen_->frame()->Push(arg);
   }
   Bind();
   *arg = cgen_->frame()->Pop();
 
   ASSERT(!had_entry_frame || arg->type() == arg_type);
   ASSERT(!had_entry_frame || !arg->is_register() || arg->reg().is(arg_reg));
 }
 
 
+void JumpTarget::Bind(Result* arg_1, Result* arg_2) {
+  ASSERT(cgen_ != NULL);
+
+#ifdef DEBUG
+  // We want register results at the call site to stay in the same
+  // registers.
+  bool had_entry_frame = false;
+  Result::Type arg_1_type;
+  Register arg_1_reg;
+  Result::Type arg_2_type;
+  Register arg_2_reg;
+#endif
+
+  if (cgen_->frame() != NULL) {
+#ifdef DEBUG
+    had_entry_frame = true;
+    arg_1_type = arg_1->type();
+    arg_1_reg = arg_1->is_register() ? arg_1->reg() : no_reg;
+    arg_2_type = arg_2->type();
+    arg_2_reg = arg_2->is_register() ? arg_2->reg() : no_reg;
+#endif
+    cgen_->frame()->Push(arg_1);
+    cgen_->frame()->Push(arg_2);
+  }
+  Bind();
+  *arg_2 = cgen_->frame()->Pop();
+  *arg_1 = cgen_->frame()->Pop();
+
+  ASSERT(!had_entry_frame || arg_1->type() == arg_1_type);
+  ASSERT(!had_entry_frame ||
+         !arg_1->is_register() ||
+         arg_1->reg().is(arg_1_reg));
+  ASSERT(!had_entry_frame || arg_2->type() == arg_2_type);
+  ASSERT(!had_entry_frame ||
+         !arg_2->is_register() ||
+         arg_2->reg().is(arg_2_reg));
+}
+
+
 // -------------------------------------------------------------------------
 // ShadowTarget implementation.
 
 ShadowTarget::ShadowTarget(JumpTarget* original) {
   ASSERT(original != NULL);
   original_target_ = original;
   original_pos_ = original->label()->pos_;
   original_expected_frame_ = original->expected_frame();
 
   // We do not call Unuse() on the orginal jump target, because we do not
@@ skipping 19 matching lines @@
 
 #ifdef DEBUG
   is_shadowing_ = false;
 #endif
 }
 
 #undef __
 
 
 } }  // namespace v8::internal