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 287 matching lines @@
   __ movl(EAX, FieldAddress(EAX, Code::instructions_offset()));
   __ addl(EAX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ LeaveFrame();
   __ jmp(EAX);
   __ int3();
 }
 
 
 // Lookup for [function-name, arg count] in 'functions_map_'.
 // Input parameters (to be treated as read only, unless calling to target!):
-//   ECX: ic-data array.
+//   ECX: ic-data.
 //   EDX: arguments descriptor array (num_args is first Smi element).
 //   Stack: return address, arguments.
 // If the lookup succeeds we jump to the target method from here, otherwise
 // we continue in code generated by the caller of 'MegamorphicLookup'.
 static void MegamorphicLookup(Assembler* assembler) {
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   Label class_in_eax, smi_receiver, null_receiver, not_found;
   // Total number of args is the first Smi in args descriptor array (EDX).
   __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
@@ skipping 28 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 42 matching lines @@
   __ movl(Address(ECX, 0), EAX);
   __ AddImmediate(ECX, Immediate(kWordSize));
   __ AddImmediate(EBX, Immediate(-kWordSize));
   __ Bind(&loop_condition);
   __ decl(EDX);
   __ j(POSITIVE, &loop, Assembler::kNearJump);
 }
 
 
 // Input parameters:
-//   ECX: ic-data array.
+//   ECX: ic-data.
 //   EDX: arguments descriptor array (num_args is first Smi element).
 // Note: The receiver object is the first argument to the function being
 //       called, the stub accesses the receiver from this location directly
 //       when trying to resolve the call.
 // Uses EDI.
 void StubCode::GenerateMegamorphicLookupStub(Assembler* assembler) {
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
 
   MegamorphicLookup(assembler);
   // Lookup in function_table_ failed, resolve, compile and enter function
   // into function_table_.
 
   // Create a stub frame as we are pushing some objects on the stack before
   // calling into the runtime.
   __ EnterFrame(0);
 
   // Preserve values across call to resolving.
   // Stack at this point:
   // TOS + 0: Saved EBP of previous frame. <== EBP
   // TOS + 1: Dart code return address
   // TOS + 2: Last argument of caller.
   // ....
   // Total number of args is the first Smi in args descriptor array (EDX).
   __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
   __ movl(EAX, Address(ESP, EAX, TIMES_2, kWordSize));  // Get receiver.
   __ pushl(EDX);  // Preserve arguments descriptor array.
   __ pushl(EAX);  // Preserve receiver.
-  __ pushl(ECX);  // Preserve ic-data array.
+  __ pushl(ECX);  // Preserve ic-data.
   // First resolve the function to get the function object.
 
   __ pushl(raw_null);  // Setup space on stack for return value.
   __ pushl(EAX);  // Push receiver.
   __ CallRuntimeFromStub(kResolveCompileInstanceFunctionRuntimeEntry);
   __ popl(EAX);  // Remove receiver pushed earlier.
   __ popl(ECX);  // Pop returned code object into ECX.
   // Pop preserved values
-  __ popl(EDX);  // Restore ic-data array.
+  __ popl(EDX);  // Restore ic-data.
   __ popl(EAX);  // Restore receiver.
   __ popl(EDI);  // Restore arguments descriptor array.
 
   __ cmpl(ECX, raw_null);
   Label check_implicit_closure;
   __ j(EQUAL, &check_implicit_closure, Assembler::kNearJump);
 
   // Remove the stub frame as we are about to jump to the dart function.
   __ LeaveFrame();
 
   __ movl(EDX, EDI);
   __ movl(ECX, FieldAddress(ECX, Code::instructions_offset()));
   __ addl(ECX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ jmp(ECX);
 
   __ Bind(&check_implicit_closure);
   // EAX: receiver.
-  // EDX: ic-data array.
+  // EDX: ic-data.
   // ECX: raw_null.
   // EDI: arguments descriptor array.
   // The target function was not found.
   // First check to see if this is a getter function and we are
   // trying to create a closure of an instance function.
   // Push values that need to be preserved across runtime call.
   __ pushl(EAX);  // Preserve receiver.
-  __ pushl(EDX);  // Preserve ic-data array.
+  __ pushl(EDX);  // Preserve ic-data.
   __ pushl(EDI);  // Preserve arguments descriptor array.
 
   __ pushl(raw_null);  // Setup space on stack for return value.
   __ pushl(EAX);  // Push receiver.
-  __ pushl(EDX);  // Ic-data array.
+  __ pushl(EDX);  // Ic-data.
   __ CallRuntimeFromStub(kResolveImplicitClosureFunctionRuntimeEntry);
   __ popl(EAX);
   __ popl(EAX);
   __ popl(ECX);  // Get return value into ECX, might be Closure object.
 
   // Pop preserved values.
   __ popl(EDI);  // Restore arguments descriptor array.
-  __ popl(EDX);  // Restore ic-data array.
+  __ popl(EDX);  // Restore ic-data.
   __ popl(EAX);  // Restore receiver.
 
   __ cmpl(ECX, raw_null);
   Label check_implicit_closure_through_getter;
   __ j(EQUAL, &check_implicit_closure_through_getter, Assembler::kNearJump);
 
   __ movl(EAX, ECX);  // Return value is the closure object.
   // Remove the stub frame as we are about return.
   __ LeaveFrame();
   __ ret();
 
   __ Bind(&check_implicit_closure_through_getter);
   // EAX: receiver.
-  // EDX: ic-data array.
+  // EDX: ic-data.
   // ECX: raw_null.
   // EDI: arguments descriptor array.
   // This is not the case of an instance so invoke the getter of the
   // same name and see if we get a closure back which we are then
   // supposed to invoke.
   // Push values that need to be preserved across runtime call.
   __ pushl(EAX);  // Preserve receiver.
-  __ pushl(EDX);  // Preserve ic-data array.
+  __ pushl(EDX);  // Preserve ic-data.
   __ pushl(EDI);  // Preserve arguments descriptor array.
 
   __ pushl(raw_null);  // Setup space on stack for return value.
   __ pushl(EAX);  // Push receiver.
-  __ pushl(EDX);  // Ic-data array.
+  __ pushl(EDX);  // Ic-data.
   __ CallRuntimeFromStub(kResolveImplicitClosureThroughGetterRuntimeEntry);
   __ popl(EDX);  // Pop argument.
   __ popl(EAX);  // Pop argument.
   __ popl(ECX);  // get return value into ECX, might be Closure object.
 
   // Pop preserved values.
   __ popl(EDI);  // Restore arguments descriptor array.
-  __ popl(EDX);  // Restore ic-data array.
+  __ popl(EDX);  // Restore ic-data.
   __ popl(EAX);  // Restore receiver.
 
   __ cmpl(ECX, raw_null);
   Label function_not_found;
   __ j(EQUAL, &function_not_found, Assembler::kNearJump);
 
   // ECX: Closure object.
   // EDI: Arguments descriptor array.
   __ pushl(raw_null);  // Setup space on stack for result from invoking Closure.
   __ pushl(ECX);  // Closure object.
@@ skipping 20 matching lines @@
   __ popl(EAX);  // Get result into EAX.
 
   // Remove the stub frame as we are about to return.
   __ LeaveFrame();
   __ ret();
 
   __ Bind(&function_not_found);
   // The target function was not found, so invoke method
   // "void noSuchMethod(function_name, args_array)".
   //   EAX: receiver.
-  //   EDX: ic-data array.
+  //   EDX: ic-data.
   //   ECX: raw_null.
   //   EDI: argument descriptor array.
 
   __ pushl(raw_null);  // Setup space on stack for result from noSuchMethod.
   __ pushl(EAX);  // Receiver.
-  __ pushl(EDX);  // IC-data array.
+  __ pushl(EDX);  // IC-data.
   __ pushl(EDI);  // Argument descriptor array.
   __ movl(EDI, FieldAddress(EDI, Array::data_offset()));
   __ SmiUntag(EDI);
   __ subl(EDI, Immediate(1));  // Arguments array length, minus the receiver.
   // See stack layout below explaining "wordSize * 6" offset.
   PushArgumentsArray(assembler, (kWordSize * 6));
 
   // Stack:
   // TOS + 0: Argument array.
   // TOS + 1: Argument descriptor array.
-  // TOS + 2: IC-data array.
+  // TOS + 2: IC-data.
   // TOS + 3: Receiver.
   // TOS + 4: Place for result from noSuchMethod.
   // TOS + 5: Saved EBP of previous frame. <== EBP
   // TOS + 6: Dart code return address
   // TOS + 7: Last argument of caller.
   // ....
 
   __ CallRuntimeFromStub(kInvokeNoSuchMethodFunctionRuntimeEntry);
   // Remove arguments.
   __ popl(EAX);
@@ skipping 860 matching lines @@
 }
 
 
 // Called for invoking noSuchMethod function from the entry code of a dart
 // function after an error in passed named arguments is detected.
 // Input parameters:
 //   EBP : points to previous frame pointer.
 //   EBP + 4 : points to return address.
 //   EBP + 8 : address of last argument (arg n-1).
 //   EBP + 8 + 4*(n-1) : address of first argument (arg 0).
-//   ECX : ic-data array.
+//   ECX : ic-data.
 //   EDX : arguments descriptor array.
 // Uses EAX, EBX, EDI as temporary registers.
 void StubCode::GenerateCallNoSuchMethodFunctionStub(Assembler* assembler) {
   // The target function was not found, so invoke method
   // "void noSuchMethod(function_name, Array arguments)".
   // TODO(regis): For now, we simply pass the actual arguments, both positional
   // and named, as the argument array. This is not correct if out-of-order
   // named arguments were passed.
   // The signature of the "noSuchMethod" method has to change from
   // noSuchMethod(String name, Array arguments) to something like
@@ skipping 11 matching lines @@
   __ pushl(EAX);  // Receiver.
   __ pushl(ECX);  // IC data array.
   __ pushl(EDX);  // Arguments descriptor array.
   __ subl(EDI, Immediate(1));  // Arguments array length, minus the receiver.
   // See stack layout below explaining "wordSize * 8" offset.
   PushArgumentsArray(assembler, (kWordSize * 8));
 
   // Stack:
   // TOS + 0: Argument array.
   // TOS + 1: Arguments descriptor array.
-  // TOS + 2: Ic-data array.
+  // TOS + 2: Ic-data.
   // TOS + 3: Receiver.
   // TOS + 4: Place for result from noSuchMethod.
   // TOS + 5: Saved EBP of previous frame. <== EBP
   // TOS + 6: Dart callee (or stub) code return address
   // TOS + 7: Saved EBP of dart caller frame.
   // TOS + 8: Dart caller code return address
   // TOS + 9: Last argument of caller.
   // ....
   __ CallRuntimeFromStub(kInvokeNoSuchMethodFunctionRuntimeEntry);
   // Remove arguments.
   __ popl(EAX);
   __ popl(EAX);
   __ popl(EAX);
   __ popl(EAX);
   __ 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