Changed the API in DartEntry for invoking dart code from C++ to make it more compatible with the re…

vm/stub_code_ia32.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_IA32)
 
 #include "vm/assembler.h"
 #include "vm/assembler_macros.h"
 #include "vm/compiler.h"
@@ skipping 696 matching lines @@
   __ LeaveFrame();
   __ ret();
 }
 
 
 // Called when invoking dart code from C++ (VM code).
 // Input parameters:
 //   ESP : points to return address.
 //   ESP + 4 : entrypoint of the dart function to call.
 //   ESP + 8 : arguments descriptor array.
-//   ESP + 12 : pointer to the argument array.
+//   ESP + 12 : arguments array.
 //   ESP + 16 : new context containing the current isolate pointer.
 // Uses EAX, EDX, ECX, EDI as temporary registers.
 void StubCode::GenerateInvokeDartCodeStub(Assembler* assembler) {
   const int kEntryPointOffset = 2 * kWordSize;
   const int kArgumentsDescOffset = 3 * kWordSize;
   const int kArgumentsOffset = 4 * kWordSize;
   const int kNewContextOffset = 5 * kWordSize;
 
   // Save frame pointer coming in.
   __ EnterFrame(0);
@@ skipping 39 matching lines @@
   // Load number of arguments into EBX.
   __ movl(EBX, FieldAddress(EDX, ArgumentsDescriptor::count_offset()));
   __ SmiUntag(EBX);
 
   // Set up arguments for the dart call.
   Label push_arguments;
   Label done_push_arguments;
   __ testl(EBX, EBX);  // check if there are arguments.
   __ j(ZERO, &done_push_arguments, Assembler::kNearJump);
   __ movl(EAX, Immediate(0));
-  __ movl(EDI, Address(EBP, kArgumentsOffset));  // start of arguments.
+
+  // Compute address of 'arguments array' data area into EDI.
+  __ movl(EDI, Address(EBP, kArgumentsOffset));
+  __ movl(EDI, Address(EDI, VMHandles::kOffsetOfRawPtrInHandle));
+  __ leal(EDI, FieldAddress(EDI, Array::data_offset()));
+
   __ Bind(&push_arguments);
   __ movl(ECX, Address(EDI, EAX, TIMES_4, 0));
-  __ movl(ECX, Address(ECX, VMHandles::kOffsetOfRawPtrInHandle));
   __ pushl(ECX);
   __ incl(EAX);
   __ cmpl(EAX, EBX);
   __ j(LESS, &push_arguments, Assembler::kNearJump);
   __ Bind(&done_push_arguments);
 
   // Call the dart code entrypoint.
   __ call(Address(EBP, kEntryPointOffset));
 
   // Reread the Context pointer.
@@ skipping 1320 matching lines @@
   __ Bind(&done);
   __ popl(temp);
   __ popl(right);
   __ popl(left);
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32