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

runtime/vm/stub_code_ia32.cc

 // Copyright (c) 2011, 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_IA32)
 
 #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 336 matching lines @@
   // Iterate and search for identical name.
   __ leal(EBX, FieldAddress(EAX, Array::data_offset()));
 
   // EBX is  pointing into content of functions_map_ array.
   __ Bind(&loop);
   __ movl(EDI, Address(EBX, FunctionsCache::kFunctionName * kWordSize));
 
   __ cmpl(EDI, raw_null);
   __ j(EQUAL, &not_found, Assembler::kNearJump);
 
-  ASSERT(ICData::kNameIndex == 0);
-  __ cmpl(EDI, FieldAddress(ECX, Array::data_offset()));
+  __ cmpl(EDI, FieldAddress(ECX, ICData::target_name_offset()));
   __ j(NOT_EQUAL, &next_iteration, Assembler::kNearJump);
 
   // Name found, check total argument count and named argument count.
   __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
   // EAX is total argument count as Smi.
   __ movl(EDI, Address(EBX, FunctionsCache::kArgCount * kWordSize));
   __ cmpl(EAX, EDI);  // Compare total argument counts.
   __ j(NOT_EQUAL, &next_iteration, Assembler::kNearJump);
   __ subl(EAX, FieldAddress(EDX, Array::data_offset() + kWordSize));
   // EAX is named argument count as Smi.
@@ skipping 1150 matching lines @@
   __ popl(EAX);  // Get result into EAX.
 
   // Remove the stub frame as we are about to return.
   __ LeaveFrame();
   __ ret();
 }
 
 
 
 // Generate inline cache check for 'num_args'.
-//  ECX: Inline cache data array.
+//  ECX: Inline cache data object.
 //  EDX: 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.
   __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
-  __ movl(EAX, Address(ESP, EAX, TIMES_2, 0));  // EAX is Smi.
+  __ movl(EAX, Address(ESP, EAX, TIMES_2, 0));  // EAX (argument_count) is Smi.
 
   Label get_class, ic_miss;
   __ call(&get_class);
   // EAX: receiver's class
   // ECX: IC data array.
 
 #if defined(DEBUG)
   { Label ok;
     // Check that the IC data array has NumberOfArgumentsChecked() == num_args.
-    __ movl(EBX, FieldAddress(ECX,
-        Array::data_offset() + ICData::kNumArgsCheckedIndex * kWordSize));
-    const Immediate value =
-        Immediate(reinterpret_cast<int32_t>(Smi::New(num_args)));
-    __ cmpl(EBX, value);
+    // 'num_args_tested' is stored as an untagged int.
+    __ movl(EBX, FieldAddress(ECX, ICData::num_args_tested_offset()));
+    __ cmpl(EBX, 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.
   // EAX: receiver's class.
-  // ECX: IC data array (preserved).
-  __ leal(EBX, FieldAddress(ECX,
-      Array::data_offset() + ICData::kChecksStartIndex * kWordSize));
-  // EBX: pointing to a class to check against (into IC data array).
+  // ECX: IC data object (preserved).
+  __ movl(EBX, FieldAddress(ECX, ICData::ic_data_offset()));
+  // EBX: ic_data_array with check entries: classes and target functions.
+  __ leal(EBX, FieldAddress(EBX, Array::data_offset()));
+  // EBX: 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);
     __ movl(EDI, Address(EBX, 0));  // Get class to check.
     __ cmpl(EAX, EDI);  // Match?
     __ j(EQUAL, &found, Assembler::kNearJump);
     __ addl(EBX, Immediate(kWordSize * 2));  // Next element (class + target).
     __ cmpl(EDI, raw_null);   // Done?
     __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
   } else if (num_args == 2) {
+    // EDI: class to check.
     Label no_match;
     __ Bind(&loop);
-    __ movl(EDI, Address(EBX, 0));  // Get class from IC data to check.
-    // Get receiver.
+    // Get class from IC data to check.
+    __ movl(EDI, Address(EBX, 0));
+    // Get receiver using argument descriptor in EDX.
     __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
-    __ movl(EAX, Address(ESP, EAX, TIMES_2, 0));  // EAX is Smi.
+    __ movl(EAX, Address(ESP, EAX, TIMES_2, 0));  // EAX (arg. count) is Smi.
     __ call(&get_class);
     __ cmpl(EAX, EDI);  // Match?
     __ j(NOT_EQUAL, &no_match, Assembler::kNearJump);
-    // Check second.
-    __ movl(EDI, Address(EBX, kWordSize));  // Get class from IC data to check.
+    // Check second class/argument.
+    // Get class from IC data to check.
+    __ movl(EDI, Address(EBX, kWordSize));
     // Get next argument.
     __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
-    __ movl(EAX, Address(ESP, EAX, TIMES_2, -kWordSize));  // EAX is Smi.
+    __ movl(EAX, Address(ESP, EAX, TIMES_2, -kWordSize));
+    // EAX (argument count) is Smi.
     __ call(&get_class);
     __ cmpl(EAX, EDI);  // Match?
     __ j(EQUAL, &found, Assembler::kNearJump);
     __ Bind(&no_match);
+    // Each test entry has (1 + num_args) array elements.
     __ addl(EBX, Immediate(kWordSize * (1 + num_args)));  // Next element.
     __ cmpl(EDI, raw_null);   // Done?
     __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
   }
 
   __ Bind(&ic_miss);
   // Get receiver, again.
   __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
   __ leal(EAX, Address(ESP, EAX, TIMES_2, 0));  // EAX is Smi.
   __ EnterFrame(0);
@@ skipping 106 matching lines @@
   __ popl(EDX);
   __ popl(ECX);
   __ LeaveFrame();
   // Now call the dynamic function.
   __ jmp(&StubCode::OneArgCheckInlineCacheLabel());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32