Implement strict mode arguments caller/callee.

src/ia32/code-stubs-ia32.cc

Index: src/ia32/code-stubs-ia32.cc
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
index c539ff564626c4f7b4499487c96a8e6d37593521..9db3aa3f263913f589d0477b494b65318e28a02c 100644
--- a/src/ia32/code-stubs-ia32.cc
+++ b/src/ia32/code-stubs-ia32.cc
@@ -3591,12 +3591,21 @@ void ArgumentsAccessStub::GenerateReadElement(MacroAssembler* masm) {
 }
 
 
-void ArgumentsAccessStub::GenerateNewObject(MacroAssembler* masm) {
+void ArgumentsAccessStub::GenerateNewObject(MacroAssembler* masm,
+                                            int boilerplate_index,
+                                            int arguments_object_size) {
   // esp[0] : return address
   // esp[4] : number of parameters
   // esp[8] : receiver displacement
   // esp[16] : function
 
+  ASSERT(type_ != NEW_OBJECT ||
+         (boilerplate_index == Context::ARGUMENTS_BOILERPLATE_INDEX &&
+          arguments_object_size == Heap::kArgumentsObjectSize));
+  ASSERT(type_ != NEW_OBJECT_STRICT ||
+         (boilerplate_index == Context::ARGUMENTS_BOILERPLATE_STRICT_INDEX &&
+          arguments_object_size == Heap::kArgumentsObjectSizeStrict));
+
   // The displacement is used for skipping the return address and the
   // frame pointer on the stack. It is the offset of the last
   // parameter (if any) relative to the frame pointer.
@@ -3628,16 +3637,15 @@ void ArgumentsAccessStub::GenerateNewObject(MacroAssembler* masm) {
   __ j(zero, &add_arguments_object);
   __ lea(ecx, Operand(ecx, times_2, FixedArray::kHeaderSize));
   __ bind(&add_arguments_object);
-  __ add(Operand(ecx), Immediate(Heap::kArgumentsObjectSize));
+  __ add(Operand(ecx), Immediate(arguments_object_size));
 
   // Do the allocation of both objects in one go.
   __ AllocateInNewSpace(ecx, eax, edx, ebx, &runtime, TAG_OBJECT);
 
   // Get the arguments boilerplate from the current (global) context.
-  int offset = Context::SlotOffset(Context::ARGUMENTS_BOILERPLATE_INDEX);
   __ mov(edi, Operand(esi, Context::SlotOffset(Context::GLOBAL_INDEX)));
   __ mov(edi, FieldOperand(edi, GlobalObject::kGlobalContextOffset));
-  __ mov(edi, Operand(edi, offset));
+  __ mov(edi, Operand(edi, Context::SlotOffset(boilerplate_index)));
 
   // Copy the JS object part.
   for (int i = 0; i < JSObject::kHeaderSize; i += kPointerSize) {
@@ -3645,15 +3653,17 @@ void ArgumentsAccessStub::GenerateNewObject(MacroAssembler* masm) {
     __ mov(FieldOperand(eax, i), ebx);
   }
 
-  // Setup the callee in-object property.
-  STATIC_ASSERT(Heap::arguments_callee_index == 0);
-  __ mov(ebx, Operand(esp, 3 * kPointerSize));
-  __ mov(FieldOperand(eax, JSObject::kHeaderSize), ebx);
+  if (type_ == NEW_OBJECT) {
+    // Setup the callee in-object property.
+    STATIC_ASSERT(Heap::arguments_callee_index == 1);
+    __ mov(ebx, Operand(esp, 3 * kPointerSize));
+    __ mov(FieldOperand(eax, JSObject::kHeaderSize + kPointerSize), ebx);

[Lasse Reichstein, 2011/03/15 09:58:40]

use 
  FieldOperand(eax, JSObject::kHeaderSize + Heap::arguments_callee_index *
kPointerSize) 
instead of implicitly duplicating the constant in the expression.

[Martin Maly, 2011/03/16 01:21:24]

Done, although the new code is less pretty :( especially in arm version where
the only way to achieve <80 lines was to introduce additional local

+  }
 
   // Get the length (smi tagged) and set that as an in-object property too.
-  STATIC_ASSERT(Heap::arguments_length_index == 1);
+  STATIC_ASSERT(Heap::arguments_length_index == 0);
   __ mov(ecx, Operand(esp, 1 * kPointerSize));
-  __ mov(FieldOperand(eax, JSObject::kHeaderSize + kPointerSize), ecx);
+  __ mov(FieldOperand(eax, JSObject::kHeaderSize), ecx);

[Lasse Reichstein, 2011/03/15 09:58:40]

Ditto here. Just do 
FieldOperand(eax, JSObject::kHeaderSize + Heap::arguments_length_index *
kPointerSize)

[Martin Maly, 2011/03/16 01:21:24]

Done.

 
   // If there are no actual arguments, we're done.
   Label done;
@@ -3665,10 +3675,11 @@ void ArgumentsAccessStub::GenerateNewObject(MacroAssembler* masm) {
 
   // Setup the elements pointer in the allocated arguments object and
   // initialize the header in the elements fixed array.
-  __ lea(edi, Operand(eax, Heap::kArgumentsObjectSize));
+  __ lea(edi, Operand(eax, arguments_object_size));
   __ mov(FieldOperand(eax, JSObject::kElementsOffset), edi);
   __ mov(FieldOperand(edi, FixedArray::kMapOffset),
          Immediate(Factory::fixed_array_map()));
+
   __ mov(FieldOperand(edi, FixedArray::kLengthOffset), ecx);
   // Untag the length for the loop below.
   __ SmiUntag(ecx);