*** old/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Apr 24 15:53:04 2014
--- new/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Apr 24 15:53:04 2014

*** 940,950 ****
--- 940,950 ----
      StubCodeMark mark(this, "StubRoutines", "handler_for_unsafe_access");
      address start = __ pc();
  
      __ push(0);                       // hole for return address-to-be
      __ pusha();                       // push registers
-     Address next_pc(rsp, RegisterImpl::number_of_registers * BytesPerWord);
  
      // FIXME: this probably needs alignment logic
  
      __ subptr(rsp, frame::arg_reg_save_area_bytes);
      BLOCK_COMMENT("call handle_unsafe_access");

*** 3008,3020 ****
--- 3008,3020 ----
      return start;
    }
  
    // Utility routine for loading a 128-bit key word in little endian format
    // can optionally specify that the shuffle mask is already in an xmmregister
!   void load_key(XMMRegister xmmdst, Register key, int offset, XMMRegister xmm_shuf_mask=NULL) {
!   void load_key(XMMRegister xmmdst, Register key, int offset, XMMRegister xmm_shuf_mask = xnoreg) {
      __ movdqu(xmmdst, Address(key, offset));
!     if (xmm_shuf_mask != NULL) {
!     if (xmm_shuf_mask != xnoreg) {
        __ pshufb(xmmdst, xmm_shuf_mask);
      } else {
        __ pshufb(xmmdst, ExternalAddress(StubRoutines::x86::key_shuffle_mask_addr()));
      }
    }