From 3f0f86b0caed75241fa71c95a5d73bc0164348c5 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Tue, 18 Mar 2014 13:16:26 +0100 Subject: Update to new stable branch 1750 This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai Reviewed-by: Zeno Albisser --- chromium/v8/src/lithium-allocator.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'chromium/v8/src/lithium-allocator.h') diff --git a/chromium/v8/src/lithium-allocator.h b/chromium/v8/src/lithium-allocator.h index e5edd3cf039..9908ea823d3 100644 --- a/chromium/v8/src/lithium-allocator.h +++ b/chromium/v8/src/lithium-allocator.h @@ -146,6 +146,7 @@ class LifetimePosition { enum RegisterKind { + UNALLOCATED_REGISTERS, GENERAL_REGISTERS, DOUBLE_REGISTERS }; @@ -290,9 +291,7 @@ class LiveRange: public ZoneObject { LOperand* CreateAssignedOperand(Zone* zone); int assigned_register() const { return assigned_register_; } int spill_start_index() const { return spill_start_index_; } - void set_assigned_register(int reg, - RegisterKind register_kind, - Zone* zone); + void set_assigned_register(int reg, Zone* zone); void MakeSpilled(Zone* zone); // Returns use position in this live range that follows both start @@ -323,7 +322,7 @@ class LiveRange: public ZoneObject { // live range to the result live range. void SplitAt(LifetimePosition position, LiveRange* result, Zone* zone); - bool IsDouble() const { return is_double_; } + RegisterKind Kind() const { return kind_; } bool HasRegisterAssigned() const { return assigned_register_ != kInvalidAssignment; } @@ -392,7 +391,7 @@ class LiveRange: public ZoneObject { int id_; bool spilled_; - bool is_double_; + RegisterKind kind_; int assigned_register_; UseInterval* last_interval_; UseInterval* first_interval_; @@ -406,6 +405,8 @@ class LiveRange: public ZoneObject { LOperand* current_hint_operand_; LOperand* spill_operand_; int spill_start_index_; + + friend class LAllocator; // Assigns to kind_. }; @@ -568,9 +569,7 @@ class LAllocator BASE_EMBEDDED { HBasicBlock* block, HBasicBlock* pred); - inline void SetLiveRangeAssignedRegister(LiveRange* range, - int reg, - RegisterKind register_kind); + inline void SetLiveRangeAssignedRegister(LiveRange* range, int reg); // Return parallel move that should be used to connect ranges split at the // given position. -- cgit v1.2.1