Re-reland: Remove register index/code indirection

src/compiler/instruction.h

 // Copyright 2014 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_COMPILER_INSTRUCTION_H_
 #define V8_COMPILER_INSTRUCTION_H_
 
 #include <deque>
 #include <iosfwd>
 #include <map>
 #include <set>
 
 #include "src/compiler/common-operator.h"
 #include "src/compiler/frame.h"
 #include "src/compiler/instruction-codes.h"
 #include "src/compiler/opcodes.h"
-#include "src/compiler/register-configuration.h"
 #include "src/compiler/source-position.h"
+#include "src/macro-assembler.h"
+#include "src/register-configuration.h"
 #include "src/zone-allocator.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 class Schedule;
 
 class InstructionOperand {
  public:
@@ skipping 337 matching lines @@
   AllocatedOperand(AllocatedKind kind, MachineType machine_type, int index)
       : InstructionOperand(ALLOCATED) {
     DCHECK_IMPLIES(kind == REGISTER || kind == DOUBLE_REGISTER, index >= 0);
     DCHECK(IsSupportedMachineType(machine_type));
     value_ |= AllocatedKindField::encode(kind);
     value_ |= MachineTypeField::encode(machine_type);
     value_ |= static_cast<int64_t>(index) << IndexField::kShift;
   }
 
   int index() const {
+    DCHECK(STACK_SLOT == allocated_kind() ||
+           DOUBLE_STACK_SLOT == allocated_kind());
     return static_cast<int64_t>(value_) >> IndexField::kShift;
   }
 
+  Register GetRegister() const {
+    DCHECK(REGISTER == allocated_kind() || DOUBLE_REGISTER == allocated_kind());
+    return Register::from_code(static_cast<int64_t>(value_) >>
+                               IndexField::kShift);
+  }
+
+  DoubleRegister GetDoubleRegister() const {
+    DCHECK(REGISTER == allocated_kind() || DOUBLE_REGISTER == allocated_kind());
+    return DoubleRegister::from_code(static_cast<int64_t>(value_) >>
+                                     IndexField::kShift);
+  }
+
   AllocatedKind allocated_kind() const {
     return AllocatedKindField::decode(value_);
   }
 
   MachineType machine_type() const { return MachineTypeField::decode(value_); }
 
   static AllocatedOperand* New(Zone* zone, AllocatedKind kind,
                                MachineType machine_type, int index) {
     return InstructionOperand::New(zone,
                                    AllocatedOperand(kind, machine_type, index));
@@ skipping 824 matching lines @@
 
 
 std::ostream& operator<<(std::ostream& os,
                          const PrintableInstructionSequence& code);
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_INSTRUCTION_H_