First part of new ICData infrastructure: use a wrapper object instead of an array.

runtime/vm/stub_code_x64.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"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
-#include "vm/ic_data.h"
 #include "vm/object_store.h"
 #include "vm/pages.h"
 #include "vm/resolver.h"
 #include "vm/scavenger.h"
 #include "vm/stub_code.h"
 
 
 #define __ assembler->
 
 namespace dart {
@@ skipping 343 matching lines @@
   // Iterate and search for identical name.
   __ leaq(R12, FieldAddress(RAX, Array::data_offset()));
 
   // R12 is  pointing into content of functions_map_ array.
   __ Bind(&loop);
   __ movq(R13, Address(R12, FunctionsCache::kFunctionName * kWordSize));
 
   __ cmpq(R13, raw_null);
   __ j(EQUAL, &not_found, Assembler::kNearJump);
 
-  ASSERT(ICData::kNameIndex == 0);
-  __ cmpq(R13, FieldAddress(RBX, Array::data_offset()));
+  __ cmpq(R13, FieldAddress(RBX, ICData::target_name_offset()));
   __ j(NOT_EQUAL, &next_iteration, Assembler::kNearJump);
 
   // Name found, check total argument count and named argument count.
   __ movq(RAX, FieldAddress(R10, Array::data_offset()));
   // RAX is total argument count as Smi.
   __ movq(R13, Address(R12, FunctionsCache::kArgCount * kWordSize));
   __ cmpq(RAX, R13);  // Compare total argument counts.
   __ j(NOT_EQUAL, &next_iteration, Assembler::kNearJump);
   __ subq(RAX, FieldAddress(R10, Array::data_offset() + kWordSize));
   // RAX is named argument count as Smi.
@@ skipping 1144 matching lines @@
   __ popq(RAX);  // Get result into RAX.
 
   // Remove the stub frame as we are about to return.
   __ LeaveFrame();
   __ ret();
 }
 
 
 
 // Generate inline cache check for 'num_args'.
-//  RBX: Inline cache data array.
+//  RBX: Inline cache data object.
 //  R10: Arguments array.
 //  TOS(0): return address
 // Control flow:
 // - If receiver is null -> jump to IC miss.
 // - If receiver is Smi -> load Smi class.
 // - If receiver is not-Smi -> load receiver's class.
 // - Check if 'num_args' (including receiver) match any IC data group.
 // - Match found -> jump to target.
 // - Match not found -> jump to IC miss.
 void StubCode::GenerateNArgsCheckInlineCacheStub(Assembler* assembler,
                                                  intptr_t num_args) {
   ASSERT(num_args > 0);
   // Get receiver.
   __ movq(RAX, FieldAddress(R10, Array::data_offset()));
-  __ movq(RAX, Address(RSP, RAX, TIMES_4, 0));  // RAX is Smi.
+  __ movq(RAX, Address(RSP, RAX, TIMES_4, 0));  // RAX (argument count) is Smi.
 
   Label get_class, ic_miss;
   __ call(&get_class);
   // RAX: receiver's class
   // RBX: IC data array.
 
 #if defined(DEBUG)
   { Label ok;
     // Check that the IC data array has NumberOfArgumentsChecked() == num_args.
-    __ movq(RCX, FieldAddress(RBX,
-        Array::data_offset() + ICData::kNumArgsCheckedIndex * kWordSize));
-    const Immediate value =
-        Immediate(reinterpret_cast<int64_t>(Smi::New(num_args)));
-    __ cmpq(RCX, value);
+    // 'num_args_tested' is stored as an untagged int.
+    __ movq(RCX, FieldAddress(RBX, ICData::num_args_tested_offset()));
+    __ cmpq(RCX, Immediate(num_args));
     __ j(EQUAL, &ok, Assembler::kNearJump);
     __ Stop("Incorrect stub for IC data");
     __ Bind(&ok);
   }
 #endif  // DEBUG
 
   // Loop that checks if there is an IC data match.
   // RAX: receiver's class.
-  // RBX: IC data array (preserved).
-  __ leaq(R12, FieldAddress(RBX,
-      Array::data_offset() + ICData::kChecksStartIndex * kWordSize));
-  // R12: pointing to a class to check against (into IC data array).
+  // RBX: IC data object (preserved).
+  __ movq(R12, FieldAddress(RBX, ICData::ic_data_offset()));
+  // R12: ic_data_array with check entries: classes and target functions.
+  __ leaq(R12, FieldAddress(R12, Array::data_offset()));
+  // R12: points directly to the first ic data array element.
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   Label loop, found;
   if (num_args == 1) {
     __ Bind(&loop);
     __ movq(R13, Address(R12, 0));  // Get class to check.
     __ cmpq(RAX, R13);  // Match?
     __ j(EQUAL, &found, Assembler::kNearJump);
     __ addq(R12, Immediate(kWordSize * 2));  // Next element (class + target).
     __ cmpq(R13, raw_null);   // Done?
@@ skipping 138 matching lines @@
   __ popq(R10);
   __ popq(RBX);
   __ LeaveFrame();
   // Now call the dynamic function.
   __ jmp(&StubCode::OneArgCheckInlineCacheLabel());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64