Some cleanups, started implementing checked instance calls, better equality operation.

runtime/vm/intermediate_language_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/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 165 matching lines @@
                                 kConditionTypeErrorRuntimeEntry);
   // We should never return here.
   __ int3();
 
   __ Bind(&done);
   ASSERT(obj == result);
 }
 
 
 LocationSummary* EqualityCompareComp::MakeLocationSummary() const {
-  LocationSummary* locs = new LocationSummary(2, 0);
-  locs->set_in(0, Location::RequiresRegister());
-  locs->set_in(1, Location::RequiresRegister());
-  locs->set_out(Location::RegisterLocation(EAX));
-  return locs;
+  const intptr_t kNumInputs = 2;
+  if (operands_class_id() == kSmi) {
+    const intptr_t kNumTemps = 1;
+    LocationSummary* locs = new LocationSummary(kNumInputs, kNumTemps);
+    locs->set_in(0, Location::RequiresRegister());
+    locs->set_in(1, Location::RequiresRegister());
+    locs->set_temp(0, Location::RequiresRegister());
+    locs->set_out(Location::RequiresRegister());
+    return locs;
+  } else {
+    const intptr_t kNumTemps = 0;
+    LocationSummary* locs = new LocationSummary(kNumInputs, kNumTemps);
+    locs->set_in(0, Location::RequiresRegister());
+    locs->set_in(1, Location::RequiresRegister());
+    locs->set_out(Location::RegisterLocation(EAX));
+    return locs;
+  }
 }
 
 
 void EqualityCompareComp::EmitNativeCode(FlowGraphCompiler* compiler) {
-  Register left = locs()->in(0).reg();
-  Register right = locs()->in(1).reg();
-  Register result = locs()->out().reg();
-  ASSERT(locs()->out().reg() == EAX);
-
   const Bool& bool_true = Bool::ZoneHandle(Bool::True());
   const Bool& bool_false = Bool::ZoneHandle(Bool::False());
-  const Immediate raw_null =
-      Immediate(reinterpret_cast<intptr_t>(Object::null()));
-  Label done, load_true, non_null_compare;
-  __ cmpl(left, raw_null);
-  __ j(NOT_EQUAL, &non_null_compare, Assembler::kNearJump);
-  // Comparison with NULL is "===".
-  __ cmpl(left, right);
-  __ j(EQUAL, &load_true, Assembler::kNearJump);
-  __ LoadObject(result, bool_false);
-  __ jmp(&done, Assembler::kNearJump);
-  __ Bind(&load_true);
-  __ LoadObject(result, bool_true);
-  __ jmp(&done);
+  if (operands_class_id() == kObject) {
+    Register left = locs()->in(0).reg();

[Vyacheslav Egorov (Google), 2012/06/13 09:02:27]

I think when instruction code is large enough it makes sense to split its
generation into different functions for readability.

[srdjan, 2012/06/13 18:34:24]

Done.

+    Register right = locs()->in(1).reg();
+    Register result = locs()->out().reg();
+    const Immediate raw_null =
+        Immediate(reinterpret_cast<intptr_t>(Object::null()));
+    // Inline null comparison.
+    __ cmpl(left, raw_null);
+    Label not_null, done, is_true;
+    __ j(NOT_EQUAL, &not_null, Assembler::kNearJump);
+    __ cmpl(left, right);
+    __ j(EQUAL, &is_true, Assembler::kNearJump);
+    __ LoadObject(result, bool_false);
+    __ jmp(&done, Assembler::kNearJump);
+    __ Bind(&is_true);
+    __ LoadObject(result, bool_true);
+    __ jmp(&done, Assembler::kNearJump);
 
-  __ Bind(&non_null_compare);
-  __ pushl(left);
-  __ pushl(right);
-  const String& operator_name = String::ZoneHandle(String::NewSymbol("=="));
-  const int kNumberOfArguments = 2;
-  const Array& kNoArgumentNames = Array::Handle();
-  const int kNumArgumentsChecked = 1;
+    __ Bind(&not_null);
+    __ pushl(left);
+    __ pushl(right);
+    compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
+                                   cid(),
+                                   token_index(),
+                                   try_index());
+    const String& operator_name = String::ZoneHandle(String::NewSymbol("=="));
+    const int kNumberOfArguments = 2;
+    const Array& kNoArgumentNames = Array::Handle();
+    const int kNumArgumentsChecked = 2;
 
-  compiler->GenerateInstanceCall(cid(),
-                                 token_index(),
-                                 try_index(),
-                                 operator_name,
-                                 kNumberOfArguments,
-                                 kNoArgumentNames,
-                                 kNumArgumentsChecked);
-  __ Bind(&done);
+    compiler->GenerateInstanceCall(cid(),
+                                   token_index(),
+                                   try_index(),
+                                   operator_name,
+                                   kNumberOfArguments,
+                                   kNoArgumentNames,
+                                   kNumArgumentsChecked);
+    ASSERT(locs()->out().reg() == EAX);
+    __ Bind(&done);
+    return;
+  }
+  if (operands_class_id() == kSmi) {
+    // TODO(srdjan): Should we always include NULL test (common case)?
+    Register left = locs()->in(0).reg();
+    Register right = locs()->in(1).reg();
+    Register result = locs()->out().reg();
+    Register temp = locs()->temp(0).reg();
+    Label* deopt = compiler->AddDeoptStub(cid(),
+                                          token_index(),
+                                          try_index(),
+                                          kDeoptSmiCompareSmis,
+                                          left,
+                                          right);
+    __ movl(temp, left);
+    __ orl(temp, right);
+    __ testl(temp, Immediate(kSmiTagMask));
+    __ j(NOT_ZERO, deopt);
+    __ cmpl(left, right);
+    Label load_true, done;
+    __ j(EQUAL, &load_true, Assembler::kNearJump);
+    __ LoadObject(result, bool_false);
+    __ jmp(&done, Assembler::kNearJump);
+    __ Bind(&load_true);
+    __ LoadObject(result, bool_true);
+    __ Bind(&done);
+    return;
+  }
 }
 
 
 LocationSummary* RelationalOpComp::MakeLocationSummary() const {
   if ((operands_class_id() == kSmi) || (operands_class_id() == kDouble)) {
     const intptr_t kNumInputs = 2;
     const intptr_t kNumTemps = 1;
     LocationSummary* summary = new LocationSummary(kNumInputs, kNumTemps);
     summary->set_in(0, Location::RequiresRegister());
     summary->set_in(1, Location::RequiresRegister());
@@ skipping 1107 matching lines @@
     __ movl(result, EAX);
     __ popl(temp);
     __ movsd(XMM0, FieldAddress(temp, Double::value_offset()));
     __ DoubleNegate(XMM0);
     __ movsd(FieldAddress(result, Double::value_offset()), XMM0);
   } else {
     UNREACHABLE();
   }
 }
 
-
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64