Index: src/lithium-inl.h |
diff --git a/src/lithium-allocator-inl.h b/src/lithium-inl.h |
similarity index 52% |
copy from src/lithium-allocator-inl.h |
copy to src/lithium-inl.h |
index 4fb5b116f325bc008270aebe5b2e4f3bb9981e73..27b9292b1d7b51c8882b04cf82452517a22dcf0d 100644 |
--- a/src/lithium-allocator-inl.h |
+++ b/src/lithium-inl.h |
@@ -1,26 +1,24 @@ |
-// Copyright 2011 the V8 project authors. All rights reserved. |
+// Copyright 2012 the V8 project authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef V8_LITHIUM_ALLOCATOR_INL_H_ |
-#define V8_LITHIUM_ALLOCATOR_INL_H_ |
+#ifndef V8_LITHIUM_INL_H_ |
+#define V8_LITHIUM_INL_H_ |
-#include "src/lithium-allocator.h" |
+#include "src/lithium.h" |
#if V8_TARGET_ARCH_IA32 |
-#include "src/ia32/lithium-ia32.h" // NOLINT |
+#include "src/ia32/lithium-ia32.h" // NOLINT |
#elif V8_TARGET_ARCH_X64 |
-#include "src/x64/lithium-x64.h" // NOLINT |
+#include "src/x64/lithium-x64.h" // NOLINT |
#elif V8_TARGET_ARCH_ARM64 |
-#include "src/arm64/lithium-arm64.h" // NOLINT |
+#include "src/arm64/lithium-arm64.h" // NOLINT |
#elif V8_TARGET_ARCH_ARM |
-#include "src/arm/lithium-arm.h" // NOLINT |
+#include "src/arm/lithium-arm.h" // NOLINT |
#elif V8_TARGET_ARCH_MIPS |
-#include "src/mips/lithium-mips.h" // NOLINT |
-#elif V8_TARGET_ARCH_MIPS64 |
-#include "src/mips64/lithium-mips64.h" // NOLINT |
+#include "src/mips/lithium-mips.h" // NOLINT |
#elif V8_TARGET_ARCH_X87 |
-#include "src/x87/lithium-x87.h" // NOLINT |
+#include "src/x87/lithium-x87.h" // NOLINT |
#else |
#error "Unknown architecture." |
#endif |
@@ -28,23 +26,8 @@ |
namespace v8 { |
namespace internal { |
-bool LAllocator::IsGapAt(int index) { return chunk_->IsGapAt(index); } |
- |
- |
-LInstruction* LAllocator::InstructionAt(int index) { |
- return chunk_->instructions()->at(index); |
-} |
- |
- |
-LGap* LAllocator::GapAt(int index) { |
- return chunk_->GetGapAt(index); |
-} |
- |
- |
TempIterator::TempIterator(LInstruction* instr) |
- : instr_(instr), |
- limit_(instr->TempCount()), |
- current_(0) { |
+ : instr_(instr), limit_(instr->TempCount()), current_(0) { |
SkipUninteresting(); |
} |
@@ -70,9 +53,7 @@ void TempIterator::Advance() { |
InputIterator::InputIterator(LInstruction* instr) |
- : instr_(instr), |
- limit_(instr->InputCount()), |
- current_(0) { |
+ : instr_(instr), limit_(instr->InputCount()), current_(0) { |
SkipUninteresting(); |
} |
@@ -103,7 +84,7 @@ void InputIterator::SkipUninteresting() { |
UseIterator::UseIterator(LInstruction* instr) |
- : input_iterator_(instr), env_iterator_(instr->environment()) { } |
+ : input_iterator_(instr), env_iterator_(instr->environment()) {} |
bool UseIterator::Done() { |
@@ -113,32 +94,17 @@ bool UseIterator::Done() { |
LOperand* UseIterator::Current() { |
ASSERT(!Done()); |
- LOperand* result = input_iterator_.Done() |
- ? env_iterator_.Current() |
- : input_iterator_.Current(); |
+ LOperand* result = input_iterator_.Done() ? env_iterator_.Current() |
+ : input_iterator_.Current(); |
ASSERT(result != NULL); |
return result; |
} |
void UseIterator::Advance() { |
- input_iterator_.Done() |
- ? env_iterator_.Advance() |
- : input_iterator_.Advance(); |
+ input_iterator_.Done() ? env_iterator_.Advance() : input_iterator_.Advance(); |
} |
- |
- |
-void LAllocator::SetLiveRangeAssignedRegister(LiveRange* range, int reg) { |
- if (range->Kind() == DOUBLE_REGISTERS) { |
- assigned_double_registers_->Add(reg); |
- } else { |
- ASSERT(range->Kind() == GENERAL_REGISTERS); |
- assigned_registers_->Add(reg); |
- } |
- range->set_assigned_register(reg, chunk()->zone()); |
} |
+} // namespace v8::internal |
- |
-} } // namespace v8::internal |
- |
-#endif // V8_LITHIUM_ALLOCATOR_INL_H_ |
+#endif // V8_LITHIUM_INL_H_ |