src/cpu/x86/vm/register_x86.cpp

*** 24,44 ****
  
  #include "precompiled.hpp"
  #include "register_x86.hpp"
  
  #ifndef AMD64
! const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers;
  #else
! const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers << 1;
  #endif // AMD64
  
  
  const int ConcreteRegisterImpl::max_fpr = ConcreteRegisterImpl::max_gpr +
!                                                                  2 * FloatRegisterImpl::number_of_registers;
  const int ConcreteRegisterImpl::max_xmm = ConcreteRegisterImpl::max_fpr +
!                                                                  8 * XMMRegisterImpl::number_of_registers;
! const char* RegisterImpl::name() const {
    const char* names[number_of_registers] = {
  #ifndef AMD64
      "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi"
  #else
      "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi",
--- 24,44 ----
  
  #include "precompiled.hpp"
  #include "register_x86.hpp"
  
  #ifndef AMD64
! const int ConcreteRegisterImpl::max_gpr = Register::number_of_registers;
  #else
! const int ConcreteRegisterImpl::max_gpr = Register::number_of_registers << 1;
  #endif // AMD64
  
  
  const int ConcreteRegisterImpl::max_fpr = ConcreteRegisterImpl::max_gpr +
!                                                                  2 * FloatRegister::number_of_registers;
  const int ConcreteRegisterImpl::max_xmm = ConcreteRegisterImpl::max_fpr +
!                                                                  8 * XMMRegister::number_of_registers;
! const char* Register::name() const {
    const char* names[number_of_registers] = {
  #ifndef AMD64
      "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi"
  #else
      "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi",
*** 46,65 ****
  #endif // AMD64
    };
    return is_valid() ? names[encoding()] : "noreg";
  }
  
! const char* FloatRegisterImpl::name() const {
    const char* names[number_of_registers] = {
      "st0", "st1", "st2", "st3", "st4", "st5", "st6", "st7"
    };
    return is_valid() ? names[encoding()] : "noreg";
  }
  
! const char* XMMRegisterImpl::name() const {
    const char* names[number_of_registers] = {
!     "xmm0","xmm1","xmm2","xmm3","xmm4","xmm5","xmm6","xmm7"
  #ifdef AMD64
      ,"xmm8",  "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15"
  #endif // AMD64
    };
    return is_valid() ? names[encoding()] : "xnoreg";
--- 46,72 ----
  #endif // AMD64
    };
    return is_valid() ? names[encoding()] : "noreg";
  }
  
! const char* FloatRegister::name() const {
    const char* names[number_of_registers] = {
      "st0", "st1", "st2", "st3", "st4", "st5", "st6", "st7"
    };
    return is_valid() ? names[encoding()] : "noreg";
  }
  
! const char* MMXRegister::name() const {
    const char* names[number_of_registers] = {
!     "mmx0", "mmx1", "mmx2", "mmx3", "mmx4", "mmx5", "mmx6", "mmx7"
!   };
!   return is_valid() ? names[encoding()] : "xnoreg";
! }
! 
! const char* XMMRegister::name() const {
!   const char* names[number_of_registers] = {
!     "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7"
  #ifdef AMD64
      ,"xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15"
  #endif // AMD64
    };
    return is_valid() ? names[encoding()] : "xnoreg";