DBC: Make unoptimized static calls call through ICData

runtime/vm/simulator_dbc.cc

 // Copyright (c) 2016, 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 <setjmp.h>  // NOLINT
 #include <stdlib.h>
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_DBC)
 
@@ skipping 1368 matching lines @@
     // Check if single stepping.
     if (thread->isolate()->single_step()) {
       Exit(thread, FP, SP + 1, pc);
       NativeArguments args(thread, 0, NULL, NULL);
       INVOKE_RUNTIME(DRT_SingleStepHandler, args);
     }
 
     // Invoke target function.
     {
       const uint16_t argc = rA;
+      RawObject* ic_data_obj = LOAD_CONSTANT(Bytecode::DecodeD(*pc));

[Vyacheslav Egorov (Google), 2016/07/18 13:52:46]

pc++ to skip NOP?

[zra, 2016/07/18 17:38:47]

No more NOP after other changes.

       RawObject** call_base = SP - argc;
       RawObject** call_top = SP;  // *SP contains function
+      if (ic_data_obj != null_value) {
+        RawICData* ic_data = RAW_CAST(ICData, ic_data_obj);
+        RawArray* cache = ic_data->ptr()->ic_data_->ptr();
+        *SP = cache->data()[ICData::TargetIndexFor(
+            ic_data->ptr()->state_bits_ & 0x3)];
+      }
       argdesc = static_cast<RawArray*>(LOAD_CONSTANT(rD));
       Invoke(thread, call_base, call_top, &pp, &pc, &FP, &SP);
     }
 
     DISPATCH();
   }
 
   {
+    BYTECODE(OptimizedStaticCall, A_D);
+    const uint16_t argc = rA;
+    RawObject** call_base = SP - argc;
+    RawObject** call_top = SP;  // *SP contains function
+    argdesc = static_cast<RawArray*>(LOAD_CONSTANT(rD));
+    Invoke(thread, call_base, call_top, &pp, &pc, &FP, &SP);
+    DISPATCH();
+  }
+
+  {
     BYTECODE(InstanceCall1, A_D);
 
     // Check if single stepping.
     if (thread->isolate()->single_step()) {
       Exit(thread, FP, SP + 1, pc);
       NativeArguments args(thread, 0, NULL, NULL);
       INVOKE_RUNTIME(DRT_SingleStepHandler, args);
     }
 
     {
@@ skipping 1385 matching lines @@
   pc_ = pc;
   special_[kExceptionSpecialIndex] = raw_exception;
   special_[kStacktraceSpecialIndex] = raw_stacktrace;
   buf->Longjmp();
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_DBC