Remove instruction summaries and provide a LIR-interface for the register all...

src/lithium-allocator-inl.h

+// Copyright 2010 the V8 project authors. All rights reserved.
+// 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
+//       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_ALLOCATOR_INL_H_
+#define V8_LITHIUM_ALLOCATOR_INL_H_
+
+#include "lithium-allocator.h"
+
+#if V8_TARGET_ARCH_IA32

[Kevin Millikin (Chromium), 2011/01/20 12:20:30]

Ultimately (not as part of this change), I'd like to have lithium.h include the
appropriate lithium-ia32.h.  There should be something one merely includes to
get the correct thing, without having to test at each point it wants to be
included.

Here I guess you actually want the lithium instructions, so fixing this site is
blocked by renaming ia32/lithium-ia32.h to ia32/lithium-instructions.h.  Then
you can have a platform independent "lithium-instructions.h" that just includes
the appropriate platform-specific one and here just write:

#include "lithium-instructions.h"

+#include "ia32/lithium-ia32.h"
+#elif V8_TARGET_ARCH_X64
+#include "x64/lithium-x64.h"
+#elif V8_TARGET_ARCH_ARM
+#include "arm/lithium-arm.h"
+#else
+#error "Unknown architecture."
+#endif
+
+namespace v8 {
+namespace internal {
+
+TempIterator::TempIterator(LInstruction* instr)
+    : instr_(instr), current_(0) {
+  Advance();
+}
+
+
+bool TempIterator::HasNext() { return current_ < instr_->TempCount(); }

[Kevin Millikin (Chromium), 2011/01/20 12:20:30]

I'm not sure it makes much difference, but I'd put the limit
(instr_->TempCount()) in a field of the iterator.

[fschneider, 2011/01/20 17:13:08]

Good point. Done.

+
+
+LOperand* TempIterator::Next() {
+  LOperand* elem = instr_->TempAt(current_++);
+  Advance();
+  return elem;
+}
+
+
+void TempIterator::Advance() {
+  while (HasNext() && instr_->TempAt(current_) == NULL) current_++;
+}
+
+
+InputIterator::InputIterator(LInstruction* instr)
+    : instr_(instr), current_(0) {
+  Advance();
+}
+
+
+bool InputIterator::HasNext() { return current_ < instr_->InputCount(); }
+
+
+LOperand* InputIterator::Next() {
+  LOperand* elem = HasNext() ? instr_->InputAt(current_++) : NULL;
+  Advance();
+  return elem;
+}
+
+
+void InputIterator::Advance() {
+  while (HasNext() && instr_->InputAt(current_)->IsConstantOperand()) {
+    current_++;
+  }
+}
+
+
+UseIterator::UseIterator(LInstruction* instr)
+    : input_iterator_(instr),
+      env_iterator_(instr->HasEnvironment() ? instr->environment() : NULL) { }

[Kevin Millikin (Chromium), 2011/01/20 12:20:30]

Using SetOncePointer for the environment is probably a mistake.  From
SetOnecePointer's declaration: "A pointer that can only be set once and doesn't
allow NULL values."  This one effectively does allow NULL values.

LInstruction::HasEnvironment is the bad smell.  We normally shouldn't have to
ask a SetOncePointer if it's been set.

[fschneider, 2011/01/20 17:13:08]

Done. Made it a normal pointer.

+
+
+bool UseIterator::HasNext() {
+  return input_iterator_.HasNext() || env_iterator_.HasNext();
+}
+
+
+LOperand* UseIterator::Next() {
+  return input_iterator_.HasNext()
+      ? input_iterator_.Next()
+      : env_iterator_.Next();
+}
+
+
+} }  // namespace v8::internal
+
+#endif  // V8_LITHIUM_ALLOCATOR_INL_H_