Index: src/lithium-inl.h |
diff --git a/src/lithium-allocator-inl.h b/src/lithium-inl.h |
similarity index 50% |
copy from src/lithium-allocator-inl.h |
copy to src/lithium-inl.h |
index 4fb5b116f325bc008270aebe5b2e4f3bb9981e73..b8c26c3d24949d4f8af8b891d21950cc1b4a9391 100644 |
--- a/src/lithium-allocator-inl.h |
+++ b/src/lithium-inl.h |
@@ -1,26 +1,49 @@ |
// Copyright 2011 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_ |
- |
-#include "src/lithium-allocator.h" |
+// Redistribution and use in source and binary forms, with or without |
+// modification, are permitted provided that the following conditions are |
+// met: |
+// |
+// * Redistributions of source code must retain the above copyright |
Michael Starzinger
2014/07/30 13:03:04
Let's switch to the short copyright header.
|
+// notice, this list of conditions and the following disclaimer. |
+// * Redistributions in binary form must reproduce the above |
+// copyright notice, this list of conditions and the following |
+// disclaimer in the documentation and/or other materials provided |
+// with the distribution. |
+// * Neither the name of Google Inc. nor the names of its |
+// contributors may be used to endorse or promote products derived |
+// from this software without specific prior written permission. |
+// |
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
+ |
+#ifndef V8_LITHIUM_INL_H_ |
+#define V8_LITHIUM_INL_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_A64 |
Michael Starzinger
2014/07/30 13:03:04
The #ifdef for A64 should be dropped, must have sn
|
+#include "src/a64/lithium-a64.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,19 +51,6 @@ |
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()), |
@@ -128,17 +138,6 @@ void UseIterator::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 |
-#endif // V8_LITHIUM_ALLOCATOR_INL_H_ |
+#endif // V8_LITHIUM_INL_H_ |