Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(181)

Unified Diff: src/x64/macro-assembler-x64.cc

Issue 2031493002: Revert of Provide a tagged allocation top pointer. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/x64/code-stubs-x64.cc ('k') | test/cctest/heap/heap-utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/macro-assembler-x64.cc
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index aef03bd1e5bf38157b7636ae0694b2a217c8b310..9653fa00916f8d54824fa7e5416d37992486c93f 100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -4816,7 +4816,7 @@
AllocationFlags flags) {
if (kPointerSize == kDoubleSize) {
if (FLAG_debug_code) {
- testl(result, Immediate(kDoubleAlignmentMaskTagged));
+ testl(result, Immediate(kDoubleAlignmentMask));
Check(zero, kAllocationIsNotDoubleAligned);
}
} else {
@@ -4828,7 +4828,7 @@
// 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 =
@@ -4837,7 +4837,7 @@
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);
}
@@ -4849,7 +4849,7 @@
AllocationFlags flags) {
if (emit_debug_code()) {
testp(result_end, Immediate(kObjectAlignmentMask));
- Check(not_zero, kUnalignedAllocationInNewSpace);
+ Check(zero, kUnalignedAllocationInNewSpace);
}
ExternalReference allocation_top =
@@ -4917,7 +4917,11 @@
}
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);
}
}
@@ -4982,6 +4986,9 @@
// 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,
@@ -4997,6 +5004,8 @@
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,
@@ -5012,6 +5021,8 @@
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,
« no previous file with comments | « src/x64/code-stubs-x64.cc ('k') | test/cctest/heap/heap-utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698