diff options
Diffstat (limited to 'deps/v8/src/compiler/frame.h')
| -rw-r--r-- | deps/v8/src/compiler/frame.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/deps/v8/src/compiler/frame.h b/deps/v8/src/compiler/frame.h index 94789276bb..87083c7e33 100644 --- a/deps/v8/src/compiler/frame.h +++ b/deps/v8/src/compiler/frame.h @@ -110,7 +110,7 @@ class Frame : public ZoneObject { } void AlignSavedCalleeRegisterSlots(int alignment = kDoubleSize) { - int alignment_slots = alignment / kPointerSize; + int alignment_slots = alignment / kSystemPointerSize; int delta = alignment_slots - (frame_slot_count_ & (alignment_slots - 1)); if (delta != alignment_slots) { frame_slot_count_ += delta; @@ -126,10 +126,10 @@ class Frame : public ZoneObject { DCHECK_EQ(frame_slot_count_, fixed_slot_count_ + spill_slot_count_ + return_slot_count_); int frame_slot_count_before = frame_slot_count_; - if (alignment > kPointerSize) { + if (alignment > kSystemPointerSize) { // Slots are pointer sized, so alignment greater than a pointer size // requires allocating additional slots. - width += alignment - kPointerSize; + width += alignment - kSystemPointerSize; } AllocateAlignedFrameSlots(width); spill_slot_count_ += frame_slot_count_ - frame_slot_count_before; @@ -156,12 +156,13 @@ class Frame : public ZoneObject { private: void AllocateAlignedFrameSlots(int width) { DCHECK_LT(0, width); - int new_frame_slots = (width + kPointerSize - 1) / kPointerSize; + int new_frame_slots = (width + kSystemPointerSize - 1) / kSystemPointerSize; // Align to 8 bytes if width is a multiple of 8 bytes, and to 16 bytes if // multiple of 16. - int align_to = (width & 15) == 0 ? 16 : (width & 7) == 0 ? 8 : kPointerSize; - frame_slot_count_ = - RoundUp(frame_slot_count_ + new_frame_slots, align_to / kPointerSize); + int align_to = + (width & 15) == 0 ? 16 : (width & 7) == 0 ? 8 : kSystemPointerSize; + frame_slot_count_ = RoundUp(frame_slot_count_ + new_frame_slots, + align_to / kSystemPointerSize); DCHECK_LT(0, frame_slot_count_); } @@ -236,7 +237,9 @@ class FrameAccessState : public ZoneObject { StandardFrameConstants::kFixedSlotCountAboveFp; return frame_slot_count + sp_delta(); } - int GetSPToFPOffset() const { return GetSPToFPSlotCount() * kPointerSize; } + int GetSPToFPOffset() const { + return GetSPToFPSlotCount() * kSystemPointerSize; + } // Get the frame offset for a given spill slot. The location depends on the // calling convention and the specific frame layout, and may thus be |