src/cpu/x86/vm/vmreg_x86.inline.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 37,47 ****
  inline VMReg FloatRegisterImpl::as_VMReg() {
    return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_gpr);
  }
  
  inline VMReg XMMRegisterImpl::as_VMReg() {
!   return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_fpr);
  }
  
  
  inline bool VMRegImpl::is_Register() {
    return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
--- 37,47 ----
  inline VMReg FloatRegisterImpl::as_VMReg() {
    return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_gpr);
  }
  
  inline VMReg XMMRegisterImpl::as_VMReg() {
!   return VMRegImpl::as_VMReg((encoding() << 3) + ConcreteRegisterImpl::max_fpr);
  }
  
  
  inline bool VMRegImpl::is_Register() {
    return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
*** 73,83 ****
  }
  
  inline XMMRegister VMRegImpl::as_XMMRegister() {
    assert( is_XMMRegister() && is_even(value()), "must be" );
    // Yuk
!   return ::as_XMMRegister((value() - ConcreteRegisterImpl::max_fpr) >> 1);
  }
  
  inline   bool VMRegImpl::is_concrete() {
    assert(is_reg(), "must be");
  #ifndef AMD64
--- 73,83 ----
  }
  
  inline XMMRegister VMRegImpl::as_XMMRegister() {
    assert( is_XMMRegister() && is_even(value()), "must be" );
    // Yuk
!   return ::as_XMMRegister((value() - ConcreteRegisterImpl::max_fpr) >> 3);
  }
  
  inline   bool VMRegImpl::is_concrete() {
    assert(is_reg(), "must be");
  #ifndef AMD64