Use a reserved stack local variable to store the Code object so that it can be looked up easily whe…

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/assembler.h"
+#include "vm/assembler_macros.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.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->
@@ skipping 76 matching lines @@
 
 // Input parameters:
 //   ESP : points to return address.
 //   EAX : stop message (const char*).
 // Must preserve all registers, except EAX.
 void StubCode::GeneratePrintStopMessageStub(Assembler* assembler) {
   // Preserve caller-saved registers.
   __ pushl(ECX);
   __ pushl(EDX);
 
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
 
   // Reserve space for the native argument and align frame before entering
   // the C++ world.
   __ AddImmediate(ESP, Immediate(-sizeof(kWordSize)));
   if (OS::ActivationFrameAlignment() > 0) {
     __ andl(ESP, Immediate(~(OS::ActivationFrameAlignment() - 1)));
   }
 
   // Pass argument and call native function.
   __ movl(Address(ESP, 0), EAX);
@@ skipping 89 matching lines @@
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
 
   __ movl(EAX, FieldAddress(ECX, Function::code_offset()));
   __ cmpl(EAX, raw_null);
   Label function_compiled;
   __ j(NOT_EQUAL, &function_compiled, Assembler::kNearJump);
 
   // Create a stub frame as we are pushing some objects on the stack before
   // calling into the runtime.
-  __ EnterFrame(0);
+  AssemblerMacros::EnterStubFrame(assembler);
 
   __ pushl(EDX);  // Preserve arguments descriptor array.
   __ pushl(ECX);
   __ CallRuntime(kCompileFunctionRuntimeEntry);
   __ popl(ECX);  // Restore read-only function object argument in ECX.
   __ popl(EDX);  // Restore arguments descriptor array.
   // Restore EAX.
   __ movl(EAX, FieldAddress(ECX, Function::code_offset()));
 
   // Remove the stub frame as we are about to jump to the dart function.
   __ LeaveFrame();
 
   __ Bind(&function_compiled);
   // Patch caller.
-  __ EnterFrame(0);
+
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
 
   __ pushl(EDX);  // Preserve arguments descriptor array.
   __ pushl(ECX);  // Preserve function object.
   __ CallRuntime(kPatchStaticCallRuntimeEntry);
   __ popl(ECX);  // Restore function object argument in ECX.
   __ popl(EDX);  // Restore arguments descriptor array.
   // Remove the stub frame as we are about to jump to the dart function.
   __ LeaveFrame();
+
   __ movl(EAX, FieldAddress(ECX, Function::code_offset()));
-
   __ movl(ECX, FieldAddress(EAX, Code::instructions_offset()));
   __ addl(ECX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ jmp(ECX);
 }
 
 
 // Called from a static call only when an invalid code has been entered
 // (invalid because its function was optimized or deoptimized).
 // ECX: function object.
 // EDX: arguments descriptor array (num_args is first Smi element).
 void StubCode::GenerateFixCallersTargetStub(Assembler* assembler) {
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   __ pushl(EDX);  // Preserve arguments descriptor array.
   __ pushl(ECX);  // Preserve target function.
   __ pushl(ECX);  // Target function.
   __ CallRuntime(kFixCallersTargetRuntimeEntry);
   __ popl(EAX);  // discard argument.
   __ popl(EAX);  // Restore function.
   __ popl(EDX);  // Restore arguments descriptor array.
   __ movl(EAX, FieldAddress(EAX, Function::code_offset()));
   __ movl(EAX, FieldAddress(EAX, Code::instructions_offset()));
   __ addl(EAX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
@@ skipping 126 matching lines @@
 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);
+  AssemblerMacros::EnterStubFrame(assembler);
 
   // 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.
+  // TOS + 0: PC marker => RawInstruction object.
+  // TOS + 1: Saved EBP of previous frame. <== EBP
+  // TOS + 2: Dart code return address
+  // TOS + 3: 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.
+  __ movl(EAX, Address(EBP, EAX, TIMES_2, kWordSize));  // Get receiver.
   __ pushl(EDX);  // Preserve arguments descriptor array.
   __ pushl(EAX);  // Preserve receiver.
   __ 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.
   __ CallRuntime(kResolveCompileInstanceFunctionRuntimeEntry);
   __ popl(EAX);  // Remove receiver pushed earlier.
   __ popl(ECX);  // Pop returned code object into ECX.
@@ skipping 80 matching lines @@
   __ 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.
   __ pushl(EDI);  // Arguments descriptor.
   __ movl(EDI, FieldAddress(EDI, Array::data_offset()));
   __ SmiUntag(EDI);
   __ subl(EDI, Immediate(1));  // Arguments array length, minus the receiver.
-  PushArgumentsArray(assembler, (kWordSize * 5));
-  // Stack layout explaining "(kWordSize * 5)" offset.
+  PushArgumentsArray(assembler, (kWordSize * 6));
+  // Stack layout explaining "(kWordSize * 6)" offset.
   // TOS + 0: Argument array.
   // TOS + 1: Arguments descriptor array.
   // TOS + 2: Closure object.
   // TOS + 3: Place for result from closure function.
-  // TOS + 4: Saved EBP of previous frame. <== EBP
-  // TOS + 5: Dart code return address
-  // TOS + 6: Last argument of caller.
+  // TOS + 4: PC marker => RawInstruction object.
+  // TOS + 5: Saved EBP of previous frame. <== EBP
+  // TOS + 6: Dart code return address
+  // TOS + 7: Last argument of caller.
   // ....
 
   __ CallRuntime(kInvokeImplicitClosureFunctionRuntimeEntry);
   // Remove arguments.
   __ popl(EAX);
   __ popl(EAX);
   __ popl(EAX);
   __ 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.
   //   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.
   __ 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));
+  // See stack layout below explaining "wordSize * 7" offset.
+  PushArgumentsArray(assembler, (kWordSize * 7));
 
   // Stack:
   // TOS + 0: Argument array.
   // TOS + 1: Argument descriptor array.
   // TOS + 2: IC-data.
-  // TOS + 3: Receiver.
+  // 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.
+  // TOS + 5: PC marker => RawInstruction object.
+  // TOS + 6: Saved EBP of previous frame. <== EBP
+  // TOS + 7: Dart code return address
+  // TOS + 8: Last argument of caller.
   // ....
 
   __ CallRuntime(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();
 }
 
 
 void StubCode::GenerateDeoptimizeStub(Assembler* assembler) {
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   // EAX: deoptimization reason id.
   // Stack at this point:
-  // TOS + 0: Saved EBP of function frame that will be deoptimized. <== EBP
-  // TOS + 1: Deoptimization point (return address), will be patched.
-  // TOS + 2: top-of-stack at deoptimization point (all arguments on stack).
+  // TOS + 0: PC marker => RawInstruction object.
+  // TOS + 1: Saved EBP of function frame that will be deoptimized. <== EBP
+  // TOS + 2: Deoptimization point (return address), will be patched.
+  // TOS + 3: top-of-stack at deoptimization point (all arguments on stack).
   __ pushl(EAX);
   __ CallRuntime(kDeoptimizeRuntimeEntry);
   __ popl(EAX);
   __ LeaveFrame();
   __ ret();
 }
 
 
 // Called for inline allocation of arrays.
 // Input parameters:
@@ skipping 119 matching lines @@
 
     // Done allocating and initializing the array.
     // EAX: new object.
     // EDX: Array length as Smi (preserved for the caller.)
     __ ret();
   }
 
   // Unable to allocate the array using the fast inline code, just call
   // into the runtime.
   __ Bind(&slow_case);
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   __ pushl(raw_null);  // Setup space on stack for return value.
   __ pushl(EDX);  // Array length as Smi.
   __ pushl(ECX);  // Element type.
   __ CallRuntime(kAllocateArrayRuntimeEntry);
   __ popl(EAX);  // Pop element type argument.
   __ popl(EDX);  // Pop array length argument.
   __ popl(EAX);  // Pop return value from return slot.
   __ LeaveFrame();
   __ ret();
 }
@@ skipping 37 matching lines @@
   __ movl(CTX, FieldAddress(EDI, Closure::context_offset()));
 
   // Load closure function code in EAX.
   __ movl(EAX, FieldAddress(ECX, Function::code_offset()));
   __ cmpl(EAX, raw_null);
   Label function_compiled;
   __ j(NOT_EQUAL, &function_compiled, Assembler::kNearJump);
 
   // Create a stub frame as we are pushing some objects on the stack before
   // calling into the runtime.
-  __ EnterFrame(0);
+  AssemblerMacros::EnterStubFrame(assembler);
 
   __ pushl(EDX);  // Preserve arguments descriptor array.
   __ pushl(ECX);
   __ CallRuntime(kCompileFunctionRuntimeEntry);
   __ popl(ECX);  // Restore read-only function object argument in ECX.
   __ popl(EDX);  // Restore arguments descriptor array.
   // Restore EAX.
   __ movl(EAX, FieldAddress(ECX, Function::code_offset()));
 
   // Remove the stub frame as we are about to jump to the closure function.
@@ skipping 10 matching lines @@
 
   __ Bind(&not_closure);
   // Call runtime to report that a closure call was attempted on a non-closure
   // object, passing the non-closure object and its arguments array.
   // EDI: non-closure object.
   // EDX: arguments descriptor array (num_args is first Smi element, closure
   //      object is not included in num_args).
 
   // Create a stub frame as we are pushing some objects on the stack before
   // calling into the runtime.
-  __ EnterFrame(0);
+  AssemblerMacros::EnterStubFrame(assembler);
 
   __ pushl(raw_null);  // Setup space on stack for result from error reporting.
   __ pushl(EDI);  // Non-closure object.
     // Total number of args is the first Smi in args descriptor array (EDX).
   __ movl(EDI, FieldAddress(EDX, Array::data_offset()));  // Load num_args.
   __ SmiUntag(EDI);
-  // See stack layout below explaining "wordSize * 4" offset.
-  PushArgumentsArray(assembler, (kWordSize * 4));
+  // See stack layout below explaining "wordSize * 5" offset.
+  PushArgumentsArray(assembler, (kWordSize * 5));
 
   // Stack:
   // TOS + 0: Argument array.
   // TOS + 1: Non-closure object.
   // TOS + 2: Place for result from reporting the error.
-  // TOS + 3: Saved EBP of previous frame. <== EBP
-  // TOS + 4: Dart code return address
-  // TOS + 5: Last argument of caller.
+  // TOS + 3: PC marker => RawInstruction object.
+  // TOS + 4: Saved EBP of previous frame. <== EBP
+  // TOS + 5: Dart code return address
+  // TOS + 6: Last argument of caller.
   // ....
   __ CallRuntime(kReportObjectNotClosureRuntimeEntry);
   __ Stop("runtime call throws an exception");
 }
 
 
 // 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.
@@ skipping 217 matching lines @@
       __ cmpl(EDX, Immediate(0));
       __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
     }
 
     // Done allocating and initializing the context.
     // EAX: new object.
     __ ret();
 
     __ Bind(&slow_case);
   }
-  // Create a stub frame.
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   __ pushl(raw_null);  // Setup space on stack for return value.
   __ SmiTag(EDX);
   __ pushl(EDX);
   __ CallRuntime(kAllocateContextRuntimeEntry);  // Allocate context.
   __ popl(EAX);  // Pop number of context variables argument.
   __ popl(EAX);  // Pop the new context object.
   // EAX: new object
   // Restore the frame pointer.
   __ LeaveFrame();
   __ ret();
@@ skipping 169 matching lines @@
     // EAX: new object.
     __ addl(EAX, Immediate(kHeapObjectTag));
     __ ret();
 
     __ Bind(&slow_case);
   }
   if (is_cls_parameterized) {
     __ movl(EAX, Address(ESP, kObjectTypeArgumentsOffset));
     __ movl(EDX, Address(ESP, kInstantiatorTypeArgumentsOffset));
   }
-  // Create a stub frame.
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   __ pushl(raw_null);  // Setup space on stack for return value.
   __ PushObject(cls);  // Push class of object to be allocated.
   if (is_cls_parameterized) {
     __ pushl(EAX);  // Push type arguments of object to be allocated.
     __ pushl(EDX);  // Push type arguments of instantiator.
   } else {
     __ pushl(raw_null);  // Push null type arguments.
     __ pushl(Immediate(Smi::RawValue(StubCode::kNoInstantiator)));
   }
   __ CallRuntime(kAllocateObjectRuntimeEntry);  // Allocate object.
@@ skipping 135 matching lines @@
     __ ret();
 
     __ Bind(&slow_case);
   }
   if (has_type_arguments) {
     __ movl(ECX, Address(ESP, kTypeArgumentsOffset));
   }
   if (is_implicit_instance_closure) {
     __ movl(EAX, Address(ESP, kReceiverOffset));
   }
-  // Create a stub frame.
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   __ pushl(raw_null);  // Setup space on stack for return value.
   __ PushObject(func);
   if (is_implicit_static_closure) {
     __ CallRuntime(kAllocateImplicitStaticClosureRuntimeEntry);
   } else {
     if (is_implicit_instance_closure) {
       __ pushl(EAX);  // Receiver.
     }
     if (has_type_arguments) {
       __ pushl(ECX);  // Push type arguments of closure to be allocated.
@@ skipping 15 matching lines @@
   // EAX: new object
   // Restore the frame pointer.
   __ LeaveFrame();
   __ ret();
 }
 
 
 // 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 - 4 : PC marker => RawInstruction object.
 //   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.
 //   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
   // noSuchMethod(InvocationMirror call).
   // Also, the class NoSuchMethodException has to be modified accordingly.
   // Total number of args is the first Smi in args descriptor array (EDX).
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   __ movl(EDI, FieldAddress(EDX, Array::data_offset()));
   __ SmiUntag(EDI);
   __ movl(EAX, Address(EBP, EDI, TIMES_4, kWordSize));  // Get receiver.
 
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
+
   __ pushl(raw_null);  // Setup space on stack for result from noSuchMethod.
   __ 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));
+  // See stack layout below explaining "wordSize * 10" offset.
+  PushArgumentsArray(assembler, (kWordSize * 10));
 
   // Stack:
   // TOS + 0: Argument array.
   // TOS + 1: Arguments descriptor 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.
+  // TOS + 5: PC marker => RawInstruction object.
+  // TOS + 6: Saved EBP of previous frame. <== EBP
+  // TOS + 7: Dart callee (or stub) code return address
+  // TOS + 8: PC marker => RawInstruction object of dart caller frame.
+  // TOS + 9: Saved EBP of dart caller frame.
+  // TOS + 10: Dart caller code return address
+  // TOS + 11: Last argument of caller.
   // ....
   __ CallRuntime(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 object.
 //  EDX: Arguments descriptor 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) {
+  const Immediate raw_null =
+      Immediate(reinterpret_cast<intptr_t>(Object::null()));
+
   __ movl(EBX, FieldAddress(ECX, ICData::function_offset()));
   __ incl(FieldAddress(EBX, Function::usage_counter_offset()));
   if (CodeGenerator::CanOptimize()) {
     __ cmpl(FieldAddress(EBX, Function::usage_counter_offset()),
         Immediate(FLAG_optimization_counter_threshold));
     Label not_yet_hot;
     __ j(LESS_EQUAL, &not_yet_hot, Assembler::kNearJump);
-    __ EnterFrame(0);
+    // Create a stub frame as we are pushing some objects on the stack before
+    // calling into the runtime.
+    AssemblerMacros::EnterStubFrame(assembler);
     __ pushl(ECX);  // Preserve inline cache data object.
     __ pushl(EDX);  // Preserve arguments array.
     __ pushl(EBX);  // Argument for runtime: function object.
     __ CallRuntime(kOptimizeInvokedFunctionRuntimeEntry);
     __ popl(EBX);  // Remove argument.
     __ popl(EDX);  // Restore arguments array.
     __ popl(ECX);  // Restore inline cache data object.
     __ LeaveFrame();
     __ Bind(&not_yet_hot);
   }
@@ skipping 21 matching lines @@
   }
 #endif  // DEBUG
 
   // Loop that checks if there is an IC data match.
   // EAX: receiver's class.
   // 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) {
@@ skipping 23 matching lines @@
     __ addl(EBX, Immediate(kWordSize * (1 + num_args)));  // Next element.
     __ cmpl(EDI, raw_null);   // Done?
     __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
   }
 
   __ Bind(&ic_miss);
   // Compute address of arguments (first read number of arguments from argument
   // descriptor array and then compute address on the stack).
   __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
   __ leal(EAX, Address(ESP, EAX, TIMES_2, 0));  // EAX is Smi.
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   __ pushl(EDX);  // Preserve arguments array.
   __ pushl(ECX);  // Preserve IC data array
   __ pushl(raw_null);  // Setup space on stack for result (target code object).
   // Push call arguments.
   for (intptr_t i = 0; i < num_args; i++) {
     __ movl(EDX, Address(EAX, -kWordSize * i));
     __ pushl(EDX);
   }
   if (num_args == 1) {
     __ CallRuntime(kInlineCacheMissHandlerOneArgRuntimeEntry);
@@ skipping 60 matching lines @@
 
 
 void StubCode::GenerateTwoArgsCheckInlineCacheStub(Assembler* assembler) {
   return GenerateNArgsCheckInlineCacheStub(assembler, 2);
 }
 
 //  ECX: Function object.
 //  EDX: Arguments array.
 //  TOS(0): return address (Dart code).
 void StubCode::GenerateBreakpointStaticStub(Assembler* assembler) {
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   __ pushl(EDX);
   __ pushl(ECX);
   __ CallRuntime(kBreakpointStaticHandlerRuntimeEntry);
   __ popl(ECX);
   __ popl(EDX);
   __ LeaveFrame();
 
   // Now call the static function. The breakpoint handler function
   // ensures that the call target is compiled.
   __ movl(EAX, FieldAddress(ECX, Function::code_offset()));
   __ movl(ECX, FieldAddress(EAX, Code::instructions_offset()));
   __ addl(ECX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ jmp(ECX);
 }
 
 
 //  TOS(0): return address (Dart code).
 void StubCode::GenerateBreakpointReturnStub(Assembler* assembler) {
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   __ pushl(EAX);
   __ CallRuntime(kBreakpointReturnHandlerRuntimeEntry);
   __ popl(EAX);
   __ LeaveFrame();
 
   // Instead of returning to the patched Dart function, emulate the
   // smashed return code pattern and return to the function's caller.
   __ popl(ECX);  // Discard return address to patched dart code.
   // Execute function epilog code that was smashed in the Dart code.
   __ LeaveFrame();
   __ ret();
 }
 
 
 //  ECX: Inline cache data array.
 //  EDX: Arguments array.
 //  TOS(0): return address (Dart code).
 void StubCode::GenerateBreakpointDynamicStub(Assembler* assembler) {
-  __ EnterFrame(0);
+  // Create a stub frame as we are pushing some objects on the stack before
+  // calling into the runtime.
+  AssemblerMacros::EnterStubFrame(assembler);
   __ pushl(ECX);
   __ pushl(EDX);
   __ CallRuntime(kBreakpointDynamicHandlerRuntimeEntry);
   __ popl(EDX);
   __ popl(ECX);
   __ LeaveFrame();
 
   // Find out which dispatch stub to call.
   Label ic_cache_one_arg;
   __ movl(EBX, FieldAddress(ECX, ICData::num_args_tested_offset()));
@@ skipping 109 matching lines @@
 // TOS + 2: instance.
 // TOS + 3: cache array.
 // Result in ECX: null -> not found, otherwise result (true or false).
 void StubCode::GenerateSubtype3TestCacheStub(Assembler* assembler) {
   GenerateSubtypeNTestCacheStub(assembler, 3);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32