Re-reland: Remove register index/code indirection

test/cctest/test-code-stubs-x64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Rrdistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Rrdistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Rrdistributions 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
@@ skipping 15 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdlib.h>
 
 #include "src/v8.h"
 
 #include "src/base/platform/platform.h"
 #include "src/code-stubs.h"
 #include "src/factory.h"
 #include "src/macro-assembler.h"
+#include "src/register-configuration.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/test-code-stubs.h"
 
 using namespace v8::internal;
 
 
 #define __ assm.
 
 ConvertDToIFunc MakeConvertDToIFuncTrampoline(Isolate* isolate,
                                               Register source_reg,
                                               Register destination_reg) {
   // Allocate an executable page of memory.
   size_t actual_size;
   byte* buffer = static_cast<byte*>(v8::base::OS::Allocate(
       Assembler::kMinimalBufferSize, &actual_size, true));
   CHECK(buffer);
   HandleScope handles(isolate);
   MacroAssembler assm(isolate, buffer, static_cast<int>(actual_size));
   int offset =
     source_reg.is(rsp) ? 0 : (HeapNumber::kValueOffset - kSmiTagSize);
   DoubleToIStub stub(isolate, source_reg, destination_reg, offset, true);
   byte* start = stub.GetCode()->instruction_start();
 
   __ pushq(rbx);
   __ pushq(rcx);
   __ pushq(rdx);
   __ pushq(rsi);
   __ pushq(rdi);
 
+
+  const RegisterConfiguration* config = RegisterConfiguration::ArchDefault();
   if (!source_reg.is(rsp)) {
     // The argument we pass to the stub is not a heap number, but instead
     // stack-allocated and offset-wise made to look like a heap number for
     // the stub.  We create that "heap number" after pushing all allocatable
     // registers.
     int double_argument_slot =
-        (Register::NumAllocatableRegisters() - 1) * kPointerSize + kDoubleSize;
+        (config->num_allocatable_general_registers() - 1) * kPointerSize +
+        kDoubleSize;
     __ leaq(source_reg, MemOperand(rsp, -double_argument_slot - offset));
   }
 
   // Save registers make sure they don't get clobbered.
   int reg_num = 0;
-  for (;reg_num < Register::NumAllocatableRegisters(); ++reg_num) {
-    Register reg = Register::FromAllocationIndex(reg_num);
+  for (; reg_num < config->num_allocatable_general_registers(); ++reg_num) {
+    Register reg =
+        Register::from_code(config->GetAllocatableGeneralCode(reg_num));
     if (!reg.is(rsp) && !reg.is(rbp) && !reg.is(destination_reg)) {
       __ pushq(reg);
     }
   }
 
   // Put the double argument into the designated double argument slot.
   __ subq(rsp, Immediate(kDoubleSize));
   __ movsd(MemOperand(rsp, 0), xmm0);
 
   // Call through to the actual stub
   __ Call(start, RelocInfo::EXTERNAL_REFERENCE);
 
   __ addq(rsp, Immediate(kDoubleSize));
 
   // Make sure no registers have been unexpectedly clobbered
   for (--reg_num; reg_num >= 0; --reg_num) {
-    Register reg = Register::FromAllocationIndex(reg_num);
+    Register reg =
+        Register::from_code(config->GetAllocatableGeneralCode(reg_num));
     if (!reg.is(rsp) && !reg.is(rbp) && !reg.is(destination_reg)) {
       __ cmpq(reg, MemOperand(rsp, 0));
       __ Assert(equal, kRegisterWasClobbered);
       __ addq(rsp, Immediate(kPointerSize));
     }
   }
 
   __ movq(rax, destination_reg);
 
   __ popq(rdi);
@@ skipping 36 matching lines @@
 
   for (size_t s = 0; s < sizeof(source_registers) / sizeof(Register); s++) {
     for (size_t d = 0; d < sizeof(dest_registers) / sizeof(Register); d++) {
       RunAllTruncationTests(
           MakeConvertDToIFuncTrampoline(isolate,
                                         source_registers[s],
                                         dest_registers[d]));
     }
   }
 }