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

Unified Diff: src/ia32/macro-assembler-ia32.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/ia32/code-stubs-ia32.cc ('k') | src/mips/code-stubs-mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ia32/macro-assembler-ia32.cc
diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
index a85c0954753961292933b96322ac876e4df2cb53..83e3722ae065bc9dae76d68a98d4cfb7f8881179 100644
--- a/src/ia32/macro-assembler-ia32.cc
+++ b/src/ia32/macro-assembler-ia32.cc
@@ -1504,7 +1504,7 @@
AllocationFlags flags) {
if (emit_debug_code()) {
test(result_end, Immediate(kObjectAlignmentMask));
- Check(not_zero, kUnalignedAllocationInNewSpace);
+ Check(zero, kUnalignedAllocationInNewSpace);
}
ExternalReference allocation_top =
@@ -1555,7 +1555,7 @@
if ((flags & DOUBLE_ALIGNMENT) != 0) {
DCHECK(kPointerAlignment * 2 == kDoubleAlignment);
Label aligned;
- test(result, Immediate(kDoubleAlignmentMaskTagged));
+ test(result, Immediate(kDoubleAlignmentMask));
j(zero, &aligned, Label::kNear);
if ((flags & PRETENURE) != 0) {
cmp(result, Operand::StaticVariable(allocation_limit));
@@ -1583,7 +1583,11 @@
}
if (top_reg.is(result)) {
- sub(result, Immediate(object_size));
+ sub(result, Immediate(object_size - kHeapObjectTag));
+ } else {
+ // Tag the result.
+ DCHECK(kHeapObjectTag == 1);
+ inc(result);
}
}
@@ -1626,13 +1630,13 @@
if ((flags & DOUBLE_ALIGNMENT) != 0) {
DCHECK(kPointerAlignment * 2 == kDoubleAlignment);
Label aligned;
- test(result, Immediate(kDoubleAlignmentMaskTagged));
+ test(result, Immediate(kDoubleAlignmentMask));
j(zero, &aligned, Label::kNear);
if ((flags & PRETENURE) != 0) {
cmp(result, Operand::StaticVariable(allocation_limit));
j(above_equal, gc_required);
}
- mov(Operand(result, -kHeapObjectTag),
+ mov(Operand(result, 0),
Immediate(isolate()->factory()->one_pointer_filler_map()));
add(result, Immediate(kDoubleSize / 2));
bind(&aligned);
@@ -1656,6 +1660,10 @@
add(result_end, result);
cmp(result_end, Operand::StaticVariable(allocation_limit));
j(above, gc_required);
+
+ // Tag result.
+ DCHECK(kHeapObjectTag == 1);
+ inc(result);
UpdateAllocationTopHelper(result_end, scratch, flags);
}
@@ -1695,13 +1703,13 @@
if ((flags & DOUBLE_ALIGNMENT) != 0) {
DCHECK(kPointerAlignment * 2 == kDoubleAlignment);
Label aligned;
- test(result, Immediate(kDoubleAlignmentMaskTagged));
+ test(result, Immediate(kDoubleAlignmentMask));
j(zero, &aligned, Label::kNear);
if ((flags & PRETENURE) != 0) {
cmp(result, Operand::StaticVariable(allocation_limit));
j(above_equal, gc_required);
}
- mov(Operand(result, -kHeapObjectTag),
+ mov(Operand(result, 0),
Immediate(isolate()->factory()->one_pointer_filler_map()));
add(result, Immediate(kDoubleSize / 2));
bind(&aligned);
@@ -1714,6 +1722,10 @@
add(result_end, result);
cmp(result_end, Operand::StaticVariable(allocation_limit));
j(above, gc_required);
+
+ // Tag result.
+ DCHECK(kHeapObjectTag == 1);
+ inc(result);
if ((flags & ALLOCATION_FOLDING_DOMINATOR) == 0) {
// The top pointer is not updated for allocation folding dominators.
@@ -1730,9 +1742,9 @@
if ((flags & DOUBLE_ALIGNMENT) != 0) {
DCHECK(kPointerAlignment * 2 == kDoubleAlignment);
Label aligned;
- test(result, Immediate(kDoubleAlignmentMaskTagged));
+ test(result, Immediate(kDoubleAlignmentMask));
j(zero, &aligned, Label::kNear);
- mov(Operand(result, -kHeapObjectTag),
+ mov(Operand(result, 0),
Immediate(isolate()->factory()->one_pointer_filler_map()));
add(result, Immediate(kDoubleSize / 2));
bind(&aligned);
@@ -1740,6 +1752,9 @@
lea(result_end, Operand(result, object_size));
UpdateAllocationTopHelper(result_end, no_reg, flags);
+
+ DCHECK(kHeapObjectTag == 1);
+ inc(result);
}
void MacroAssembler::FastAllocate(Register object_size, Register result,
@@ -1751,9 +1766,9 @@
if ((flags & DOUBLE_ALIGNMENT) != 0) {
DCHECK(kPointerAlignment * 2 == kDoubleAlignment);
Label aligned;
- test(result, Immediate(kDoubleAlignmentMaskTagged));
+ test(result, Immediate(kDoubleAlignmentMask));
j(zero, &aligned, Label::kNear);
- mov(Operand(result, -kHeapObjectTag),
+ mov(Operand(result, 0),
Immediate(isolate()->factory()->one_pointer_filler_map()));
add(result, Immediate(kDoubleSize / 2));
bind(&aligned);
@@ -1761,6 +1776,9 @@
lea(result_end, Operand(result, object_size, times_1, 0));
UpdateAllocationTopHelper(result_end, no_reg, flags);
+
+ DCHECK(kHeapObjectTag == 1);
+ inc(result);
}
« no previous file with comments | « src/ia32/code-stubs-ia32.cc ('k') | src/mips/code-stubs-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698