Adapt to new calling convention on ARM.

src/builtins-ia32.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 36 matching lines @@
   __ mov(Operand::StaticVariable(ExternalReference::builtin_passed_function()),
          edi);
   __ JumpToBuiltin(ExternalReference(id));
 }
 
 
 DEFINE_bool(inline_new, true, "use fast inline allocation");
 
 
 void Builtins::Generate_JSConstructCall(MacroAssembler* masm) {
+  // ----------- S t a t e -------------
+  //  -- eax: number of arguments
+  //  -- edi: constructor function
+  // -----------------------------------
+
   // Enter an internal frame.
-  __ EnterFrame(StackFrame::INTERNAL);
+  __ EnterInternalFrame();
 
   // Store a smi-tagged arguments count on the stack.
   __ shl(eax, kSmiTagSize);
   __ push(eax);
 
   // Push the function to invoke on the stack.
   __ push(edi);
 
   // Try to allocate the object without transitioning into C code. If any of the
   // preconditions is not met, the code bails out to the runtime call.
@@ skipping 220 matching lines @@
   __ j(greater_equal, &exit, not_taken);
 
   // Throw away the result of the constructor invocation and use the
   // on-stack receiver as the result.
   __ bind(&use_receiver);
   __ mov(eax, Operand(esp, 0));
 
   // Restore the arguments count and exit the internal frame.
   __ bind(&exit);
   __ mov(ebx, Operand(esp, kPointerSize));  // get arguments count
-  __ ExitFrame(StackFrame::INTERNAL);
+  __ ExitInternalFrame();
 
   // Remove caller arguments from the stack and return.
   ASSERT(kSmiTagSize == 1 && kSmiTag == 0);
   __ pop(ecx);
   __ lea(esp, Operand(esp, ebx, times_2, 1 * kPointerSize));  // 1 ~ receiver
   __ push(ecx);
   __ ret(0);
 
   // Compute the offset from the beginning of the JSConstructCall
   // builtin code object to the return address after the call.
   ASSERT(return_site.is_bound());
   construct_call_pc_offset_ = return_site.pos() + Code::kHeaderSize;
 }
 
 
 static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
                                              bool is_construct) {
   // Clear the context before we push it when entering the JS frame.
   __ xor_(esi, Operand(esi));  // clear esi
 
   // Enter an internal frame.
-  __ EnterFrame(StackFrame::INTERNAL);
+  __ EnterInternalFrame();
 
   // Load the previous frame pointer (ebx) to access C arguments
   __ mov(ebx, Operand(ebp, 0));
 
   // Get the function from the frame and setup the context.
   __ mov(ecx, Operand(ebx, EntryFrameConstants::kFunctionArgOffset));
   __ mov(esi, FieldOperand(ecx, JSFunction::kContextOffset));
 
   // Push the function and the receiver onto the stack.
   __ push(ecx);
@@ skipping 23 matching lines @@
     __ call(Handle<Code>(Builtins::builtin(Builtins::JSConstructCall)),
             code_target);
   } else {
     ParameterCount actual(eax);
     __ InvokeFunction(edi, actual, CALL_FUNCTION);
   }
 
   // Exit the JS frame. Notice that this also removes the empty
   // context and the function left on the stack by the code
   // invocation.
-  __ ExitFrame(StackFrame::INTERNAL);
+  __ ExitInternalFrame();
   __ ret(1 * kPointerSize);  // remove receiver
 }
 
 
 void Builtins::Generate_JSEntryTrampoline(MacroAssembler* masm) {
   Generate_JSEntryTrampolineHelper(masm, false);
 }
 
 
 void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
   Generate_JSEntryTrampolineHelper(masm, true);
 }
 
 
 void Builtins::Generate_FunctionApply(MacroAssembler* masm) {
-  __ EnterFrame(StackFrame::INTERNAL);
+  __ EnterInternalFrame();
 
   __ push(Operand(ebp, 4 * kPointerSize));  // push this
   __ push(Operand(ebp, 2 * kPointerSize));  // push arguments
   __ InvokeBuiltin(Builtins::APPLY_PREPARE, CALL_FUNCTION);
 
   // Eagerly check for stack-overflow before pushing all the arguments
   // to the stack.
   Label okay;
   __ lea(ecx, Operand(esp, -3 * kPointerSize));  // receiver, limit, index
   __ mov(edx, Operand(eax));
@@ skipping 83 matching lines @@
   __ bind(&entry);
   __ cmp(eax, Operand(ebp, kLimitOffset));
   __ j(not_equal, &loop);
 
   // Invoke the function.
   ParameterCount actual(eax);
   __ shr(eax, kSmiTagSize);
   __ mov(edi, Operand(ebp, 4 * kPointerSize));
   __ InvokeFunction(edi, actual, CALL_FUNCTION);
 
-  __ ExitFrame(StackFrame::INTERNAL);
+  __ ExitInternalFrame();
   __ ret(3 * kPointerSize);  // remove this, receiver, and arguments
 }
 
 
 static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) {
   __ push(ebp);
   __ mov(ebp, Operand(esp));
 
   // Store the arguments adaptor context sentinel.
   __ push(Immediate(ArgumentsAdaptorFrame::SENTINEL));
@@ skipping 83 matching lines @@
     __ bind(&fill);
     __ inc(ecx);
     __ push(Immediate(Factory::undefined_value()));
     __ cmp(ecx, Operand(ebx));
     __ j(less, &fill);
 
     // Restore function pointer.
     __ mov(edi, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
   }
 
-  // Mark the adaptor frame as special by overwriting the context slot
-  // in the stack with a sentinel.
+  // Call the entry point.
   Label return_site;
   __ bind(&invoke);
   __ call(Operand(edx));
   __ bind(&return_site);
 
   ExitArgumentsAdaptorFrame(masm);
   __ ret(0);
 
   // Compute the offset from the beginning of the ArgumentsAdaptorTrampoline
   // builtin code object to the return address after the call.
@@ skipping 53 matching lines @@
     __ j(equal, &use_global_receiver);
 
     __ mov(ecx, FieldOperand(ebx, HeapObject::kMapOffset));
     __ movzx_b(ecx, FieldOperand(ecx, Map::kInstanceTypeOffset));
     __ cmp(ecx, FIRST_JS_OBJECT_TYPE);
     __ j(less, &call_to_object);
     __ cmp(ecx, LAST_JS_OBJECT_TYPE);
     __ j(less_equal, &done);
 
     __ bind(&call_to_object);
-    __ EnterFrame(StackFrame::INTERNAL);  // preserves eax, ebx, edi
+    __ EnterInternalFrame();  // preserves eax, ebx, edi
 
     // Store the arguments count on the stack (smi tagged).
     ASSERT(kSmiTag == 0);
     __ shl(eax, kSmiTagSize);
     __ push(eax);
 
     __ push(edi);  // save edi across the call
     __ push(ebx);
     __ InvokeBuiltin(Builtins::TO_OBJECT, CALL_FUNCTION);
     __ mov(Operand(ebx), eax);
     __ pop(edi);  // restore edi after the call
 
     // Get the arguments count and untag it.
     __ pop(eax);
     __ shr(eax, kSmiTagSize);
 
-    __ ExitFrame(StackFrame::INTERNAL);
+    __ ExitInternalFrame();
     __ jmp(&patch_receiver);
 
     // Use the global object from the called function as the receiver.
     __ bind(&use_global_receiver);
     const int kGlobalIndex =
         Context::kHeaderSize + Context::GLOBAL_INDEX * kPointerSize;
     __ mov(ebx, FieldOperand(esi, kGlobalIndex));
 
     __ bind(&patch_receiver);
     __ mov(Operand(esp, eax, times_4, 0), ebx);
@@ skipping 48 matching lines @@
                                           bool convert_call_to_jmp) {
   // Save the content of all general purpose registers in memory. This copy in
   // memory is later pushed onto the JS expression stack for the fake JS frame
   // generated and also to the C frame generated on top of that. In the JS
   // frame ONLY the registers containing pointers will be pushed on the
   // expression stack. This causes the GC to update these pointers so that
   // they will have the correct value when returning from the debugger.
   __ SaveRegistersToMemory(kJSCallerSaved);
 
   // Enter an internal frame.
-  __ EnterFrame(StackFrame::INTERNAL);
+  __ EnterInternalFrame();
 
   // Store the registers containing object pointers on the expression stack to
   // make sure that these are correctly updated during GC.
   __ PushRegistersFromMemory(pointer_regs);
 
 #ifdef DEBUG
   __ RecordComment("// Calling from debug break to runtime - come in - over");
 #endif
   __ Set(eax, Immediate(0));  // no arguments
   __ mov(Operand(ebx), Immediate(ExternalReference::debug_break()));
 
   CEntryDebugBreakStub ceb;
   __ CallStub(&ceb);
 
   // Restore the register values containing object pointers from the expression
   // stack in the reverse order as they where pushed.
   __ PopRegistersToMemory(pointer_regs);
 
   // Get rid of the internal frame.
-  __ ExitFrame(StackFrame::INTERNAL);
+  __ ExitInternalFrame();
 
   // If this call did not replace a call but patched other code then there will
   // be an unwanted return address left on the stack. Here we get rid of that.
   if (convert_call_to_jmp) {
     __ pop(eax);
   }
 
   // Finally restore all registers.
   __ RestoreRegistersFromMemory(kJSCallerSaved);
 
@@ skipping 91 matching lines @@
   // Register state for stub CallFunction (from CallFunctionStub in ic-ia32.cc).
   // ----------- S t a t e -------------
   //  No registers used on entry.
   // -----------------------------------
   Generate_DebugBreakCallHelper(masm, 0, false);
 }
 
 #undef __
 
 } }  // namespace v8::internal