*** old/src/cpu/x86/vm/register_x86.hpp	Sat Jun  2 20:03:59 2012
--- new/src/cpu/x86/vm/register_x86.hpp	Sat Jun  2 20:03:59 2012

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2000, 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.

*** 156,166 ****
--- 156,166 ----
  
    // derived registers, offsets, and addresses
    XMMRegister successor() const                          { return as_XMMRegister(encoding() + 1); }
  
    // accessors
!   int   encoding() const                          { assert(is_valid(), "invalid register"); return (intptr_t)this; }
!   int   encoding() const                          { assert(is_valid(), err_msg("invalid register (%d)", (int)(intptr_t)this )); return (intptr_t)this; }
    bool  is_valid() const                          { return 0 <= (intptr_t)this && (intptr_t)this < number_of_registers; }
    const char* name() const;
  };
  
  

*** 214,224 ****
--- 214,224 ----
      number_of_registers =      RegisterImpl::number_of_registers +
  #ifdef AMD64
                                 RegisterImpl::number_of_registers +  // "H" half of a 64bit register
  #endif // AMD64
                             2 * FloatRegisterImpl::number_of_registers +
!                            2 * XMMRegisterImpl::number_of_registers +
!                            8 * XMMRegisterImpl::number_of_registers +
                             1 // eflags
    };
  
    static const int max_gpr;
    static const int max_fpr;