Index: src/x64/macro-assembler-x64.cc |
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc |
index 5a263abbdb83d8961a251e2ed8a7d131f633a0b7..9f1e13bc9b8ffe161f95f9542235039334f008cd 100644 |
--- a/src/x64/macro-assembler-x64.cc |
+++ b/src/x64/macro-assembler-x64.cc |
@@ -3714,8 +3714,8 @@ void MacroAssembler::LoadFromNumberDictionary(Label* miss, |
void MacroAssembler::LoadAllocationTopHelper(Register result, |
Register scratch, |
AllocationFlags flags) { |
- ExternalReference new_space_allocation_top = |
- ExternalReference::new_space_allocation_top_address(isolate()); |
+ ExternalReference allocation_top = |
+ AllocationUtils::GetAllocationTopReference(isolate(), flags); |
// Just return if allocation top is already known. |
if ((flags & RESULT_CONTAINS_TOP) != 0) { |
@@ -3723,7 +3723,7 @@ void MacroAssembler::LoadAllocationTopHelper(Register result, |
ASSERT(!scratch.is_valid()); |
#ifdef DEBUG |
// Assert that result actually contains top on entry. |
- Operand top_operand = ExternalOperand(new_space_allocation_top); |
+ Operand top_operand = ExternalOperand(allocation_top); |
cmpq(result, top_operand); |
Check(equal, "Unexpected allocation top"); |
#endif |
@@ -3733,40 +3733,41 @@ void MacroAssembler::LoadAllocationTopHelper(Register result, |
// Move address of new object to result. Use scratch register if available, |
// and keep address in scratch until call to UpdateAllocationTopHelper. |
if (scratch.is_valid()) { |
- LoadAddress(scratch, new_space_allocation_top); |
+ LoadAddress(scratch, allocation_top); |
movq(result, Operand(scratch, 0)); |
} else { |
- Load(result, new_space_allocation_top); |
+ Load(result, allocation_top); |
} |
} |
void MacroAssembler::UpdateAllocationTopHelper(Register result_end, |
- Register scratch) { |
+ Register scratch, |
+ AllocationFlags flags) { |
if (emit_debug_code()) { |
testq(result_end, Immediate(kObjectAlignmentMask)); |
Check(zero, "Unaligned allocation in new space"); |
} |
- ExternalReference new_space_allocation_top = |
- ExternalReference::new_space_allocation_top_address(isolate()); |
+ ExternalReference allocation_top = |
+ AllocationUtils::GetAllocationTopReference(isolate(), flags); |
// Update new top. |
if (scratch.is_valid()) { |
// Scratch already contains address of allocation top. |
movq(Operand(scratch, 0), result_end); |
} else { |
- Store(new_space_allocation_top, result_end); |
+ Store(allocation_top, result_end); |
} |
} |
-void MacroAssembler::AllocateInNewSpace(int object_size, |
- Register result, |
- Register result_end, |
- Register scratch, |
- Label* gc_required, |
- AllocationFlags flags) { |
+void MacroAssembler::Allocate(int object_size, |
+ Register result, |
+ Register result_end, |
+ Register scratch, |
+ Label* gc_required, |
+ AllocationFlags flags) { |
ASSERT((flags & (RESULT_CONTAINS_TOP | SIZE_IN_WORDS)) == 0); |
if (!FLAG_inline_new) { |
if (emit_debug_code()) { |
@@ -3795,8 +3796,8 @@ void MacroAssembler::AllocateInNewSpace(int object_size, |
} |
// Calculate new top and bail out if new space is exhausted. |
- ExternalReference new_space_allocation_limit = |
- ExternalReference::new_space_allocation_limit_address(isolate()); |
+ ExternalReference allocation_limit = |
+ AllocationUtils::GetAllocationLimitReference(isolate(), flags); |
Register top_reg = result_end.is_valid() ? result_end : result; |
@@ -3805,12 +3806,12 @@ void MacroAssembler::AllocateInNewSpace(int object_size, |
} |
addq(top_reg, Immediate(object_size)); |
j(carry, gc_required); |
- Operand limit_operand = ExternalOperand(new_space_allocation_limit); |
+ Operand limit_operand = ExternalOperand(allocation_limit); |
cmpq(top_reg, limit_operand); |
j(above, gc_required); |
// Update allocation top. |
- UpdateAllocationTopHelper(top_reg, scratch); |
+ UpdateAllocationTopHelper(top_reg, scratch, flags); |
bool tag_result = (flags & TAG_OBJECT) != 0; |
if (top_reg.is(result)) { |
@@ -3836,6 +3837,7 @@ void MacroAssembler::AllocateInNewSpace(int header_size, |
Label* gc_required, |
AllocationFlags flags) { |
ASSERT((flags & SIZE_IN_WORDS) == 0); |
+ ASSERT((flags & PRETENURE_OLD_POINTER_SPACE) == 0); |
if (!FLAG_inline_new) { |
if (emit_debug_code()) { |
// Trash the registers to simulate an allocation failure. |
@@ -3875,7 +3877,7 @@ void MacroAssembler::AllocateInNewSpace(int header_size, |
j(above, gc_required); |
// Update allocation top. |
- UpdateAllocationTopHelper(result_end, scratch); |
+ UpdateAllocationTopHelper(result_end, scratch, flags); |
// Tag the result if requested. |
if ((flags & TAG_OBJECT) != 0) { |
@@ -3892,6 +3894,7 @@ void MacroAssembler::AllocateInNewSpace(Register object_size, |
Label* gc_required, |
AllocationFlags flags) { |
ASSERT((flags & (RESULT_CONTAINS_TOP | SIZE_IN_WORDS)) == 0); |
+ ASSERT((flags & PRETENURE_OLD_POINTER_SPACE) == 0); |
if (!FLAG_inline_new) { |
if (emit_debug_code()) { |
// Trash the registers to simulate an allocation failure. |
@@ -3923,7 +3926,7 @@ void MacroAssembler::AllocateInNewSpace(Register object_size, |
j(above, gc_required); |
// Update allocation top. |
- UpdateAllocationTopHelper(result_end, scratch); |
+ UpdateAllocationTopHelper(result_end, scratch, flags); |
// Align the next allocation. Storing the filler map without checking top is |
// always safe because the limit of the heap is always aligned. |
@@ -3958,12 +3961,7 @@ void MacroAssembler::AllocateHeapNumber(Register result, |
Register scratch, |
Label* gc_required) { |
// Allocate heap number in new space. |
- AllocateInNewSpace(HeapNumber::kSize, |
- result, |
- scratch, |
- no_reg, |
- gc_required, |
- TAG_OBJECT); |
+ Allocate(HeapNumber::kSize, result, scratch, no_reg, gc_required, TAG_OBJECT); |
// Set the map. |
LoadRoot(kScratchRegister, Heap::kHeapNumberMapRootIndex); |
@@ -4053,12 +4051,8 @@ void MacroAssembler::AllocateTwoByteConsString(Register result, |
Register scratch2, |
Label* gc_required) { |
// Allocate heap number in new space. |
- AllocateInNewSpace(ConsString::kSize, |
- result, |
- scratch1, |
- scratch2, |
- gc_required, |
- TAG_OBJECT); |
+ Allocate(ConsString::kSize, result, scratch1, scratch2, gc_required, |
+ TAG_OBJECT); |
// Set the map. The other fields are left uninitialized. |
LoadRoot(kScratchRegister, Heap::kConsStringMapRootIndex); |
@@ -4071,12 +4065,8 @@ void MacroAssembler::AllocateAsciiConsString(Register result, |
Register scratch2, |
Label* gc_required) { |
// Allocate heap number in new space. |
- AllocateInNewSpace(ConsString::kSize, |
- result, |
- scratch1, |
- scratch2, |
- gc_required, |
- TAG_OBJECT); |
+ Allocate(ConsString::kSize, result, scratch1, scratch2, gc_required, |
+ TAG_OBJECT); |
// Set the map. The other fields are left uninitialized. |
LoadRoot(kScratchRegister, Heap::kConsAsciiStringMapRootIndex); |
@@ -4089,12 +4079,8 @@ void MacroAssembler::AllocateTwoByteSlicedString(Register result, |
Register scratch2, |
Label* gc_required) { |
// Allocate heap number in new space. |
- AllocateInNewSpace(SlicedString::kSize, |
- result, |
- scratch1, |
- scratch2, |
- gc_required, |
- TAG_OBJECT); |
+ Allocate(SlicedString::kSize, result, scratch1, scratch2, gc_required, |
+ TAG_OBJECT); |
// Set the map. The other fields are left uninitialized. |
LoadRoot(kScratchRegister, Heap::kSlicedStringMapRootIndex); |
@@ -4107,12 +4093,8 @@ void MacroAssembler::AllocateAsciiSlicedString(Register result, |
Register scratch2, |
Label* gc_required) { |
// Allocate heap number in new space. |
- AllocateInNewSpace(SlicedString::kSize, |
- result, |
- scratch1, |
- scratch2, |
- gc_required, |
- TAG_OBJECT); |
+ Allocate(SlicedString::kSize, result, scratch1, scratch2, gc_required, |
+ TAG_OBJECT); |
// Set the map. The other fields are left uninitialized. |
LoadRoot(kScratchRegister, Heap::kSlicedAsciiStringMapRootIndex); |