S390: Get rid of AllocationFlags::TAG_OBJECT

src/s390/code-stubs-s390.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_S390
 
 #include "src/code-stubs.h"
 #include "src/api-arguments.h"
 #include "src/base/bits.h"
 #include "src/bootstrapper.h"
@@ skipping 4608 matching lines @@
   __ CmpP(r2, r3);
   __ bne(&new_object);
 
   // Allocate the JSObject on the heap.
   Label allocate, done_allocate;
   __ LoadlB(r6, FieldMemOperand(r4, Map::kInstanceSizeOffset));
   __ Allocate(r6, r2, r7, r8, &allocate, SIZE_IN_WORDS);
   __ bind(&done_allocate);
 
   // Initialize the JSObject fields.
-  __ StoreP(r4, MemOperand(r2, JSObject::kMapOffset));
+  __ StoreP(r4, FieldMemOperand(r2, JSObject::kMapOffset));
   __ LoadRoot(r5, Heap::kEmptyFixedArrayRootIndex);
-  __ StoreP(r5, MemOperand(r2, JSObject::kPropertiesOffset));
-  __ StoreP(r5, MemOperand(r2, JSObject::kElementsOffset));
+  __ StoreP(r5, FieldMemOperand(r2, JSObject::kPropertiesOffset));
+  __ StoreP(r5, FieldMemOperand(r2, JSObject::kElementsOffset));
   STATIC_ASSERT(JSObject::kHeaderSize == 3 * kPointerSize);
-  __ AddP(r3, r2, Operand(JSObject::kHeaderSize));
+  __ AddP(r3, r2, Operand(JSObject::kHeaderSize - kHeapObjectTag));
 
   // ----------- S t a t e -------------
-  //  -- r2 : result (untagged)
+  //  -- r2 : result (tagged)
   //  -- r3 : result fields (untagged)
   //  -- r7 : result end (untagged)
   //  -- r4 : initial map
   //  -- cp : context
   //  -- lr : return address
   // -----------------------------------
 
   // Perform in-object slack tracking if requested.
   Label slack_tracking;
   STATIC_ASSERT(Map::kNoSlackTracking == 0);
   __ LoadRoot(r8, Heap::kUndefinedValueRootIndex);
   __ LoadlW(r5, FieldMemOperand(r4, Map::kBitField3Offset));
   __ DecodeField<Map::ConstructionCounter>(r9, r5);
   __ LoadAndTestP(r9, r9);
   __ bne(&slack_tracking);
   {
     // Initialize all in-object fields with undefined.
     __ InitializeFieldsWithFiller(r3, r7, r8);
 
-    // Add the object tag to make the JSObject real.
-    __ AddP(r2, r2, Operand(kHeapObjectTag));
     __ Ret();
   }
   __ bind(&slack_tracking);
   {
     // Decrease generous allocation count.
     STATIC_ASSERT(Map::ConstructionCounter::kNext == 32);
     __ Add32(r5, r5, Operand(-(1 << Map::ConstructionCounter::kShift)));
     __ StoreW(r5, FieldMemOperand(r4, Map::kBitField3Offset));
 
     // Initialize the in-object fields with undefined.
     __ LoadlB(r6, FieldMemOperand(r4, Map::kUnusedPropertyFieldsOffset));
     __ ShiftLeftP(r6, r6, Operand(kPointerSizeLog2));
     __ SubP(r6, r7, r6);
     __ InitializeFieldsWithFiller(r3, r6, r8);
 
     // Initialize the remaining (reserved) fields with one pointer filler map.
     __ LoadRoot(r8, Heap::kOnePointerFillerMapRootIndex);
     __ InitializeFieldsWithFiller(r3, r7, r8);
 
-    // Add the object tag to make the JSObject real.
-    __ AddP(r2, r2, Operand(kHeapObjectTag));
-
     // Check if we can finalize the instance size.
     __ CmpP(r9, Operand(Map::kSlackTrackingCounterEnd));
     __ Ret(ne);
 
     // Finalize the instance size.
     {
       FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
       __ Push(r2, r4);
       __ CallRuntime(Runtime::kFinalizeInstanceSize);
       __ Pop(r2);
     }
     __ Ret();
   }
 
   // Fall back to %AllocateInNewSpace.
   __ bind(&allocate);
   {
     FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
     STATIC_ASSERT(kSmiTag == 0);
     __ ShiftLeftP(r6, r6,
                   Operand(kPointerSizeLog2 + kSmiTagSize + kSmiShiftSize));
     __ Push(r4, r6);
     __ CallRuntime(Runtime::kAllocateInNewSpace);
     __ Pop(r4);
   }
-  __ SubP(r2, r2, Operand(kHeapObjectTag));
   __ LoadlB(r7, FieldMemOperand(r4, Map::kInstanceSizeOffset));
   __ ShiftLeftP(r7, r7, Operand(kPointerSizeLog2));
   __ AddP(r7, r2, r7);
+  __ SubP(r7, r7, Operand(kHeapObjectTag));
   __ b(&done_allocate);
 
   // Fall back to %NewObject.
   __ bind(&new_object);
   __ Push(r3, r5);
   __ TailCallRuntime(Runtime::kNewObject);
 }
 
 void FastNewRestParameterStub::Generate(MacroAssembler* masm) {
   // ----------- S t a t e -------------
@@ skipping 44 matching lines @@
   // Return an empty rest parameter array.
   __ bind(&no_rest_parameters);
   {
     // ----------- S t a t e -------------
     //  -- cp : context
     //  -- lr : return address
     // -----------------------------------
 
     // Allocate an empty rest parameter array.
     Label allocate, done_allocate;
-    __ Allocate(JSArray::kSize, r2, r3, r4, &allocate, TAG_OBJECT);
+    __ Allocate(JSArray::kSize, r2, r3, r4, &allocate, NO_ALLOCATION_FLAGS);
     __ bind(&done_allocate);
 
     // Setup the rest parameter array in r0.
     __ LoadNativeContextSlot(Context::JS_ARRAY_FAST_ELEMENTS_MAP_INDEX, r3);
     __ StoreP(r3, FieldMemOperand(r2, JSArray::kMapOffset), r0);
     __ LoadRoot(r3, Heap::kEmptyFixedArrayRootIndex);
     __ StoreP(r3, FieldMemOperand(r2, JSArray::kPropertiesOffset), r0);
     __ StoreP(r3, FieldMemOperand(r2, JSArray::kElementsOffset), r0);
     __ LoadImmP(r3, Operand::Zero());
     __ StoreP(r3, FieldMemOperand(r2, JSArray::kLengthOffset), r0);
@@ skipping 22 matching lines @@
     //  -- r2 : number of rest parameters (tagged)
     //  -- r4 : pointer just past first rest parameters
     //  -- r8 : size of rest parameters
     //  -- lr : return address
     // -----------------------------------
 
     // Allocate space for the rest parameter array plus the backing store.
     Label allocate, done_allocate;
     __ mov(r3, Operand(JSArray::kSize + FixedArray::kHeaderSize));
     __ AddP(r3, r3, r8);
-    __ Allocate(r3, r5, r6, r7, &allocate, TAG_OBJECT);
+    __ Allocate(r3, r5, r6, r7, &allocate, NO_ALLOCATION_FLAGS);
     __ bind(&done_allocate);
 
     // Setup the elements array in r5.
     __ LoadRoot(r3, Heap::kFixedArrayMapRootIndex);
     __ StoreP(r3, FieldMemOperand(r5, FixedArray::kMapOffset), r0);
     __ StoreP(r2, FieldMemOperand(r5, FixedArray::kLengthOffset), r0);
     __ AddP(r6, r5,
             Operand(FixedArray::kHeaderSize - kHeapObjectTag - kPointerSize));
     {
       Label loop;
@@ skipping 126 matching lines @@
 
   // 2. Backing store.
   __ SmiToPtrArrayOffset(r6, r7);
   __ AddP(r1, r1, r6);
   __ AddP(r1, r1, Operand(FixedArray::kHeaderSize));
 
   // 3. Arguments object.
   __ AddP(r1, r1, Operand(JSSloppyArgumentsObject::kSize));
 
   // Do the allocation of all three objects in one go.
-  __ Allocate(r1, r2, r1, r6, &runtime, TAG_OBJECT);
+  __ Allocate(r1, r2, r1, r6, &runtime, NO_ALLOCATION_FLAGS);
 
   // r2 = address of new object(s) (tagged)
   // r4 = argument count (smi-tagged)
   // Get the arguments boilerplate from the current native context into r3.
   const int kNormalOffset =
       Context::SlotOffset(Context::SLOPPY_ARGUMENTS_MAP_INDEX);
   const int kAliasedOffset =
       Context::SlotOffset(Context::FAST_ALIASED_ARGUMENTS_MAP_INDEX);
 
   __ LoadP(r6, NativeContextMemOperand());
@@ skipping 197 matching lines @@
   //  -- r2 : number of rest parameters (tagged)
   //  -- r4 : pointer just past first rest parameters
   //  -- r8 : size of rest parameters
   //  -- lr : return address
   // -----------------------------------
 
   // Allocate space for the strict arguments object plus the backing store.
   Label allocate, done_allocate;
   __ mov(r3, Operand(JSStrictArgumentsObject::kSize + FixedArray::kHeaderSize));
   __ AddP(r3, r3, r8);
-  __ Allocate(r3, r5, r6, r7, &allocate, TAG_OBJECT);
+  __ Allocate(r3, r5, r6, r7, &allocate, NO_ALLOCATION_FLAGS);
   __ bind(&done_allocate);
 
   // Setup the elements array in r5.
   __ LoadRoot(r3, Heap::kFixedArrayMapRootIndex);
   __ StoreP(r3, FieldMemOperand(r5, FixedArray::kMapOffset), r0);
   __ StoreP(r2, FieldMemOperand(r5, FixedArray::kLengthOffset), r0);
   __ AddP(r6, r5,
           Operand(FixedArray::kHeaderSize - kHeapObjectTag - kPointerSize));
   {
     Label loop, done_loop;
@@ skipping 536 matching lines @@
   CallApiFunctionAndReturn(masm, api_function_address, thunk_ref,
                            kStackUnwindSpace, NULL, return_value_operand, NULL);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390