Re-reland: Remove register index/code indirection

src/lithium.cc

 // 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.
 
 #include "src/lithium.h"
 
 #include "src/scopes.h"
 
 #if V8_TARGET_ARCH_IA32
 #include "src/ia32/lithium-ia32.h"  // NOLINT
@@ skipping 38 matching lines @@
       stream->Add("v%d", unalloc->virtual_register());
       if (unalloc->basic_policy() == LUnallocated::FIXED_SLOT) {
         stream->Add("(=%dS)", unalloc->fixed_slot_index());
         break;
       }
       switch (unalloc->extended_policy()) {
         case LUnallocated::NONE:
           break;
         case LUnallocated::FIXED_REGISTER: {
           int reg_index = unalloc->fixed_register_index();
-          if (reg_index < 0 ||
-              reg_index >= Register::kMaxNumAllocatableRegisters) {
+          if (reg_index < 0 || reg_index >= Register::kNumRegisters) {
             stream->Add("(=invalid_reg#%d)", reg_index);
           } else {
             const char* register_name =
-                Register::AllocationIndexToString(reg_index);
+                Register::from_code(reg_index).ToString();
             stream->Add("(=%s)", register_name);
           }
           break;
         }
         case LUnallocated::FIXED_DOUBLE_REGISTER: {
           int reg_index = unalloc->fixed_register_index();
-          if (reg_index < 0 ||
-              reg_index >= DoubleRegister::kMaxNumAllocatableRegisters) {
+          if (reg_index < 0 || reg_index >= DoubleRegister::kMaxNumRegisters) {
             stream->Add("(=invalid_double_reg#%d)", reg_index);
           } else {
             const char* double_register_name =
-                DoubleRegister::AllocationIndexToString(reg_index);
+                DoubleRegister::from_code(reg_index).ToString();
             stream->Add("(=%s)", double_register_name);
           }
           break;
         }
         case LUnallocated::MUST_HAVE_REGISTER:
           stream->Add("(R)");
           break;
         case LUnallocated::MUST_HAVE_DOUBLE_REGISTER:
           stream->Add("(D)");
           break;
@@ skipping 12 matching lines @@
       stream->Add("[constant:%d]", index());
       break;
     case STACK_SLOT:
       stream->Add("[stack:%d]", index());
       break;
     case DOUBLE_STACK_SLOT:
       stream->Add("[double_stack:%d]", index());
       break;
     case REGISTER: {
       int reg_index = index();
-      if (reg_index < 0 || reg_index >= Register::kMaxNumAllocatableRegisters) {
+      if (reg_index < 0 || reg_index >= Register::kNumRegisters) {
         stream->Add("(=invalid_reg#%d|R)", reg_index);
       } else {
-        stream->Add("[%s|R]", Register::AllocationIndexToString(reg_index));
+        stream->Add("[%s|R]", Register::from_code(reg_index).ToString());
       }
       break;
     }
     case DOUBLE_REGISTER: {
       int reg_index = index();
-      if (reg_index < 0 ||
-          reg_index >= DoubleRegister::kMaxNumAllocatableRegisters) {
+      if (reg_index < 0 || reg_index >= DoubleRegister::kMaxNumRegisters) {
         stream->Add("(=invalid_double_reg#%d|R)", reg_index);
       } else {
-        stream->Add("[%s|R]",
-                    DoubleRegister::AllocationIndexToString(reg_index));
+        stream->Add("[%s|R]", DoubleRegister::from_code(reg_index).ToString());
       }
       break;
     }
   }
 }
 
 
 template<LOperand::Kind kOperandKind, int kNumCachedOperands>
 LSubKindOperand<kOperandKind, kNumCachedOperands>*
 LSubKindOperand<kOperandKind, kNumCachedOperands>::cache = NULL;
@@ skipping 575 matching lines @@
 
 LPhase::~LPhase() {
   if (ShouldProduceTraceOutput()) {
     isolate()->GetHTracer()->TraceLithium(name(), chunk_);
   }
 }
 
 
 }  // namespace internal
 }  // namespace v8