Implement Smi binops ia32 (new compiler).

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
@@ skipping 1374 matching lines @@
     ASSERT(target != new_entry_point);  // Why patch otherwise.
     CodePatcher::PatchStaticCallAt(frame->pc(), new_entry_point);
     if (FLAG_trace_patching) {
       OS::Print("FixCallersTarget: patching from 0x%x to '%s' 0x%x\n",
           frame->pc(),
           target_function.ToFullyQualifiedCString(),
           new_entry_point);
     }
   }
 }
 

[Vyacheslav Egorov (Google), 2012/06/08 16:43:25]

one more empty line

[srdjan, 2012/06/08 16:50:33]

Done.

+static const char* DeoptReasonToText(intptr_t deopt_id) {
+  switch (deopt_id) {
+    case kDeoptUnknown: return "kDeoptUnknown";

[Vyacheslav Egorov (Google), 2012/06/08 16:43:25]

if deopt reasons were declared via macro-list like

#define DEOPT_REASONS(V) \
  V(kDeoptUnknown)       \
  ...
  V(kDeoptUnaryOp)

then we could keep enum and this switch in sync automatically. 

[srdjan, 2012/06/08 16:50:33]

Will do it in a next CL.

+    case kDeoptIncrLocal: return "kDeoptIncrLocal";
+    case kDeoptIncrInstance: return "kDeoptIncrInstance";
+    case kDeoptIncrInstanceOneClass: return "kDeoptIncrInstanceOneClass";
+    case kDeoptInstanceGetterSameTarget:
+      return "kDeoptInstanceGetterSameTarget";
+    case kDeoptInstanceGetter: return "kDeoptInstanceGetter";
+    case kDeoptStoreIndexed: return "kDeoptStoreIndexed";
+    case kDeoptCheckedInstanceCallSmiOnly:
+      return "kDeoptCheckedInstanceCallSmiOnly";
+    case kDeoptCheckedInstanceCallSmiFail:
+      return "kDeoptCheckedInstanceCallSmiFail";
+    case kDeoptCheckedInstanceCallCheckFail:
+      return "kDeoptCheckedInstanceCallCheckFail";
+    case kDeoptIntegerToDouble: return "kDeoptIntegerToDouble";
+    case kDeoptDoubleToDouble: return "kDeoptDoubleToDouble";
+    case kDeoptSmiBinaryOp: return "kDeoptSmiBinaryOp";
+    case kDeoptMintBinaryOp: return "kDeoptMintBinaryOp";
+    case kDeoptDoubleBinaryOp: return "kDeoptDoubleBinaryOp";
+    case kDeoptInstanceSetterSameTarget:
+      return "kDeoptInstanceSetterSameTarget";
+    case kDeoptInstanceSetter: return "kDeoptInstanceSetter";
+    case kDeoptSmiEquality: return "kDeoptSmiEquality";
+    case kDeoptSmiCompareSmis: return "kDeoptSmiCompareSmis";
+    case kDeoptSmiCompareAny: return "kDeoptSmiCompareAny";
+    case kDeoptEqualityNoFeedback: return "kDeoptEqualityNoFeedback";
+    case kDeoptEqualityClassCheck: return "kDeoptEqualityClassCheck";
+    case kDeoptDoubleComparison: return "kDeoptDoubleComparison";
+    case kDeoptLoadIndexedFixedArray: return "kDeoptLoadIndexedFixedArray";
+    case kDeoptLoadIndexedGrowableArray:
+      return "kDeoptLoadIndexedGrowableArray";
+    case kDeoptNoTypeFeedback: return "kDeoptNoTypeFeedback";
+    case kDeoptSAR: return "kDeoptSAR";
+    case kDeoptUnaryOp: return "kDeoptUnaryOp";
+    default:
+      UNREACHABLE();
+      return "";
+  }
+}
+
 
 // The top Dart frame belongs to the optimized method that needs to be
 // deoptimized. The pc of the Dart frame points to the deoptimization point.
 // Find the node id of the deoptimization point and find the continuation
 // pc in the unoptimized code.
 // Since both unoptimized and optimized code have the same layout, we need only
 // to patch the pc of the Dart frame and to disable/enable appropriate code.
 DEFINE_RUNTIME_ENTRY(Deoptimize, 1) {
   ASSERT(arguments.Count() == kDeoptimizeRuntimeEntry.argument_count());
   const Smi& deoptimization_reason_id = Smi::CheckedHandle(arguments.At(0));
@@ skipping 17 matching lines @@
       deopt_node_id = descriptors.NodeId(i);
       deopt_token_index = descriptors.TokenIndex(i);
       break;
     }
   }
   ASSERT(deopt_node_id != AstNode::kNoId);
   uword continue_at_pc =
       unoptimized_code.GetDeoptPcAtNodeId(deopt_node_id);
   ASSERT(continue_at_pc != 0);
   if (FLAG_trace_deopt) {
-    OS::Print("Deoptimizing (reason %d) at pc 0x%x id %d '%s' "
+    OS::Print("Deoptimizing (reason %d '%s') at pc 0x%x id %d '%s' "
         "-> continue at 0x%x \n",
         deoptimization_reason_id.Value(),
+        DeoptReasonToText(deoptimization_reason_id.Value()),
         caller_frame->pc(),
         deopt_node_id,
         function.ToFullyQualifiedCString(),
         continue_at_pc);
     const Class& cls = Class::Handle(function.owner());
     const Script& script = Script::Handle(cls.script());
     intptr_t line, column;
     script.GetTokenLocation(deopt_token_index, &line, &column);
     OS::Print("  Line: %d Column: %d ", line, column);
     OS::Print(">>  %s\n", String::Handle(script.GetLine(line)).ToCString());
@@ skipping 109 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart