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 294 matching lines @@
   __ movq(RAX, FieldAddress(RAX, Code::instructions_offset()));
   __ addq(RAX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ LeaveFrame();
   __ jmp(RAX);
   __ int3();
 }
 
 
 // Lookup for [function-name, arg count] in 'functions_map_'.
 // Input parameters (to be treated as read only, unless calling to target!):
-//   RBX: ic-data array.
+//   RBX: ic-data.
 //   R10: 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_rax, smi_receiver, null_receiver, not_found;
   // Total number of args is the first Smi in args descriptor array (R10).
   __ movq(RAX, FieldAddress(R10, Array::data_offset()));
@@ skipping 28 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 41 matching lines @@
   __ movq(Address(RBX, 0), RAX);
   __ AddImmediate(RBX, Immediate(kWordSize));
   __ AddImmediate(R12, Immediate(-kWordSize));
   __ Bind(&loop_condition);
   __ decq(R10);
   __ j(POSITIVE, &loop, Assembler::kNearJump);
 }
 
 
 // Input parameters:
-//   RBX: ic-data array.
+//   RBX: ic-data.
 //   R10: 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.
 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 RBP of previous frame. <== RBP
   // TOS + 1: Dart code return address
   // TOS + 2: Last argument of caller.
   // ....
   // Total number of args is the first Smi in args descriptor array (R10).
   __ movq(RAX, FieldAddress(R10, Array::data_offset()));
   __ movq(RAX, Address(RSP, RAX, TIMES_4, kWordSize));  // Get receiver.
   __ pushq(R10);  // Preserve arguments descriptor array.
   __ pushq(RAX);  // Preserve receiver.
-  __ pushq(RBX);  // Preserve ic-data array.
+  __ pushq(RBX);  // Preserve ic-data.
   // First resolve the function to get the function object.
 
   __ pushq(raw_null);  // Setup space on stack for return value.
   __ pushq(RAX);  // Push receiver.
   __ CallRuntimeFromStub(kResolveCompileInstanceFunctionRuntimeEntry);
   __ popq(RAX);  // Remove receiver pushed earlier.
   __ popq(RBX);  // Pop returned code object into RBX.
   // Pop preserved values
-  __ popq(R10);  // Restore ic-data array.
+  __ popq(R10);  // Restore ic-data.
   __ popq(RAX);  // Restore receiver.
   __ popq(R13);  // Restore arguments descriptor array.
 
   __ cmpq(RBX, 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();
 
   __ movq(R10, R13);
   __ movq(RBX, FieldAddress(RBX, Code::instructions_offset()));
   __ addq(RBX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ jmp(RBX);
 
   __ Bind(&check_implicit_closure);
   // RAX: receiver.
-  // R10: ic-data array.
+  // R10: ic-data.
   // RBX: raw_null.
   // R13: 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.
   __ pushq(RAX);  // Preserve receiver.
-  __ pushq(R10);  // Preserve ic-data array.
+  __ pushq(R10);  // Preserve ic-data.
   __ pushq(R13);  // Preserve arguments descriptor array.
 
   __ pushq(raw_null);  // Setup space on stack for return value.
   __ pushq(RAX);  // Push receiver.
   __ pushq(R10);  // Ic-data array.
   __ CallRuntimeFromStub(kResolveImplicitClosureFunctionRuntimeEntry);
   __ popq(RAX);
   __ popq(RAX);
   __ popq(RBX);  // Get return value into RBX, might be Closure object.
 
   // Pop preserved values.
   __ popq(R13);  // Restore arguments descriptor array.
-  __ popq(R10);  // Restore ic-data array.
+  __ popq(R10);  // Restore ic-data.
   __ popq(RAX);  // Restore receiver.
 
   __ cmpq(RBX, raw_null);
   Label check_implicit_closure_through_getter;
   __ j(EQUAL, &check_implicit_closure_through_getter, Assembler::kNearJump);
 
   __ movq(RAX, RBX);  // Return value is the closure object.
   // Remove the stub frame as we are about return.
   __ LeaveFrame();
   __ ret();
 
   __ Bind(&check_implicit_closure_through_getter);
   // RAX: receiver.
-  // R10: ic-data array.
+  // R10: ic-data.
   // RBX: raw_null.
   // R13: 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.
   __ pushq(RAX);  // Preserve receiver.
-  __ pushq(R10);  // Preserve ic-data array.
+  __ pushq(R10);  // Preserve ic-data.
   __ pushq(R13);  // Preserve arguments descriptor array.
 
   __ pushq(raw_null);  // Setup space on stack for return value.
   __ pushq(RAX);  // Push receiver.
   __ pushq(R10);  // Ic-data array.
   __ CallRuntimeFromStub(kResolveImplicitClosureThroughGetterRuntimeEntry);
   __ popq(R10);  // Pop argument.
   __ popq(RAX);  // Pop argument.
   __ popq(RBX);  // get return value into RBX, might be Closure object.
 
   // Pop preserved values.
   __ popq(R13);  // Restore arguments descriptor array.
-  __ popq(R10);  // Restore ic-data array.
+  __ popq(R10);  // Restore ic-data.
   __ popq(RAX);  // Restore receiver.
 
   __ cmpq(RBX, raw_null);
   Label function_not_found;
   __ j(EQUAL, &function_not_found);
 
   // RBX: Closure object.
   // R13: Arguments descriptor array.
   __ pushq(raw_null);  // Setup space on stack for result from invoking Closure.
   __ pushq(RBX);  // Closure object.
@@ skipping 20 matching lines @@
   __ popq(RAX);  // Get result into RAX.
 
   // 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)".
   //   RAX: receiver.
-  //   R10: ic-data array.
+  //   R10: ic-data.
   //   RBX: raw_null.
   //   R13: argument descriptor array.
 
   __ pushq(raw_null);  // Setup space on stack for result from noSuchMethod.
   __ pushq(RAX);  // Receiver.
   __ pushq(R10);  // IC-data array.
   __ pushq(R13);  // Argument descriptor array.
   __ movq(R13, FieldAddress(R13, Array::data_offset()));
   __ SmiUntag(R13);
   __ subq(R13, Immediate(1));  // Arguments array length, minus the receiver.
@@ skipping 874 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:
 //   RBP : points to previous frame pointer.
 //   RBP + 8 : points to return address.
 //   RBP + 16 : address of last argument (arg n-1).
 //   RBP + 16 + 8*(n-1) : address of first argument (arg 0).
-//   RBX : ic-data array.
+//   RBX : ic-data.
 //   R10 : arguments descriptor array.
 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
   // noSuchMethod(InvocationMirror call).
@@ skipping 35 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