Revert of Provide a tagged allocation top pointer.

src/x64/macro-assembler-x64.cc

 // Copyright 2012 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_X64
 
 #include "src/base/bits.h"
 #include "src/base/division-by-constant.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
@@ skipping 4798 matching lines @@
   }
 }
 
 
 void MacroAssembler::MakeSureDoubleAlignedHelper(Register result,
                                                  Register scratch,
                                                  Label* gc_required,
                                                  AllocationFlags flags) {
   if (kPointerSize == kDoubleSize) {
     if (FLAG_debug_code) {
-      testl(result, Immediate(kDoubleAlignmentMaskTagged));
+      testl(result, Immediate(kDoubleAlignmentMask));
       Check(zero, kAllocationIsNotDoubleAligned);
     }
   } else {
     // Align the next allocation. Storing the filler map without checking top
     // is safe in new-space because the limit of the heap is aligned there.
     DCHECK(kPointerSize * 2 == kDoubleSize);
     DCHECK(kPointerAlignment * 2 == kDoubleAlignment);
     // Make sure scratch is not clobbered by this function as it might be
     // used in UpdateAllocationTopHelper later.
     DCHECK(!scratch.is(kScratchRegister));
     Label aligned;
-    testl(result, Immediate(kDoubleAlignmentMaskTagged));
+    testl(result, Immediate(kDoubleAlignmentMask));
     j(zero, &aligned, Label::kNear);
     if (((flags & ALLOCATION_FOLDED) == 0) && ((flags & PRETENURE) != 0)) {
       ExternalReference allocation_limit =
           AllocationUtils::GetAllocationLimitReference(isolate(), flags);
       cmpp(result, ExternalOperand(allocation_limit));
       j(above_equal, gc_required);
     }
     LoadRoot(kScratchRegister, Heap::kOnePointerFillerMapRootIndex);
-    movp(Operand(result, -kHeapObjectTag), kScratchRegister);
+    movp(Operand(result, 0), kScratchRegister);
     addp(result, Immediate(kDoubleSize / 2));
     bind(&aligned);
   }
 }
 
 
 void MacroAssembler::UpdateAllocationTopHelper(Register result_end,
                                                Register scratch,
                                                AllocationFlags flags) {
   if (emit_debug_code()) {
     testp(result_end, Immediate(kObjectAlignmentMask));
-    Check(not_zero, kUnalignedAllocationInNewSpace);
+    Check(zero, kUnalignedAllocationInNewSpace);
   }
 
   ExternalReference allocation_top =
       AllocationUtils::GetAllocationTopReference(isolate(), flags);
 
   // Update new top.
   if (scratch.is_valid()) {
     // Scratch already contains address of allocation top.
     movp(Operand(scratch, 0), result_end);
   } else {
@@ skipping 47 matching lines @@
   Operand limit_operand = ExternalOperand(allocation_limit);
   cmpp(top_reg, limit_operand);
   j(above, gc_required);
 
   if ((flags & ALLOCATION_FOLDING_DOMINATOR) == 0) {
     // The top pointer is not updated for allocation folding dominators.
     UpdateAllocationTopHelper(top_reg, scratch, flags);
   }
 
   if (top_reg.is(result)) {
-    subp(result, Immediate(object_size));
+    subp(result, Immediate(object_size - kHeapObjectTag));
+  } else {
+    // Tag the result.
+    DCHECK(kHeapObjectTag == 1);
+    incp(result);
   }
 }
 
 
 void MacroAssembler::Allocate(int header_size,
                               ScaleFactor element_size,
                               Register element_count,
                               Register result,
                               Register result_end,
                               Register scratch,
@@ skipping 44 matching lines @@
   }
   addp(result_end, result);
   Operand limit_operand = ExternalOperand(allocation_limit);
   cmpp(result_end, limit_operand);
   j(above, gc_required);
 
   if ((flags & ALLOCATION_FOLDING_DOMINATOR) == 0) {
     // The top pointer is not updated for allocation folding dominators.
     UpdateAllocationTopHelper(result_end, scratch, flags);
   }
+
+  // Tag the result.
+  addp(result, Immediate(kHeapObjectTag));
 }
 
 void MacroAssembler::FastAllocate(int object_size, Register result,
                                   Register result_end, AllocationFlags flags) {
   DCHECK(!result.is(result_end));
   // Load address of new object into result.
   LoadAllocationTopHelper(result, no_reg, flags);
 
   if ((flags & DOUBLE_ALIGNMENT) != 0) {
     MakeSureDoubleAlignedHelper(result, no_reg, NULL, flags);
   }
 
   leap(result_end, Operand(result, object_size));
 
   UpdateAllocationTopHelper(result_end, no_reg, flags);
+
+  addp(result, Immediate(kHeapObjectTag));
 }
 
 void MacroAssembler::FastAllocate(Register object_size, Register result,
                                   Register result_end, AllocationFlags flags) {
   DCHECK(!result.is(result_end));
   // Load address of new object into result.
   LoadAllocationTopHelper(result, no_reg, flags);
 
   if ((flags & DOUBLE_ALIGNMENT) != 0) {
     MakeSureDoubleAlignedHelper(result, no_reg, NULL, flags);
   }
 
   leap(result_end, Operand(result, object_size, times_1, 0));
 
   UpdateAllocationTopHelper(result_end, no_reg, flags);
+
+  addp(result, Immediate(kHeapObjectTag));
 }
 
 void MacroAssembler::AllocateHeapNumber(Register result,
                                         Register scratch,
                                         Label* gc_required,
                                         MutableMode mode) {
   // Allocate heap number in new space.
   Allocate(HeapNumber::kSize, result, scratch, no_reg, gc_required,
            NO_ALLOCATION_FLAGS);
 
@@ skipping 685 matching lines @@
   movl(rax, dividend);
   shrl(rax, Immediate(31));
   addl(rdx, rax);
 }
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64