src/cpu/x86/vm/stubGenerator_x86_64.cpp

*** 470,480 ****
      __ mov(rbx, rax);
  
      // setup rax & rdx, remove return address & clear pending exception
      __ pop(rdx);
      __ movptr(rax, Address(r15_thread, Thread::pending_exception_offset()));
!     __ movptr(Address(r15_thread, Thread::pending_exception_offset()), (int)NULL_WORD);
  
  #ifdef ASSERT
      // make sure exception is set
      {
        Label L;
--- 470,480 ----
      __ mov(rbx, rax);
  
      // setup rax & rdx, remove return address & clear pending exception
      __ pop(rdx);
      __ movptr(rax, Address(r15_thread, Thread::pending_exception_offset()));
!     __ movptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
  
  #ifdef ASSERT
      // make sure exception is set
      {
        Label L;
*** 952,964 ****
      // make sure object is 'reasonable'
      __ testptr(rax, rax);
      __ jcc(Assembler::zero, exit); // if obj is NULL it is OK
      // Check if the oop is in the right area of memory
      __ movptr(c_rarg2, rax);
!     __ movptr(c_rarg3, (int64_t) Universe::verify_oop_mask());
      __ andptr(c_rarg2, c_rarg3);
!     __ movptr(c_rarg3, (int64_t) Universe::verify_oop_bits());
      __ cmpptr(c_rarg2, c_rarg3);
      __ jcc(Assembler::notZero, error);
  
      // set r12 to heapbase for load_klass()
      __ reinit_heapbase();
--- 952,964 ----
      // make sure object is 'reasonable'
      __ testptr(rax, rax);
      __ jcc(Assembler::zero, exit); // if obj is NULL it is OK
      // Check if the oop is in the right area of memory
      __ movptr(c_rarg2, rax);
!     __ movptr(c_rarg3, (intptr_t) Universe::verify_oop_mask());
      __ andptr(c_rarg2, c_rarg3);
!     __ movptr(c_rarg3, (intptr_t) Universe::verify_oop_bits());
      __ cmpptr(c_rarg2, c_rarg3);
      __ jcc(Assembler::notZero, error);
  
      // set r12 to heapbase for load_klass()
      __ reinit_heapbase();
*** 967,990 ****
      __ load_klass(rax, rax);  // get klass
      __ testptr(rax, rax);
      __ jcc(Assembler::zero, error); // if klass is NULL it is broken
      // Check if the klass is in the right area of memory
      __ mov(c_rarg2, rax);
!     __ movptr(c_rarg3, (int64_t) Universe::verify_klass_mask());
      __ andptr(c_rarg2, c_rarg3);
!     __ movptr(c_rarg3, (int64_t) Universe::verify_klass_bits());
      __ cmpptr(c_rarg2, c_rarg3);
      __ jcc(Assembler::notZero, error);
  
      // make sure klass' klass is 'reasonable'
      __ load_klass(rax, rax);
      __ testptr(rax, rax);
      __ jcc(Assembler::zero, error); // if klass' klass is NULL it is broken
      // Check if the klass' klass is in the right area of memory
!     __ movptr(c_rarg3, (int64_t) Universe::verify_klass_mask());
      __ andptr(rax, c_rarg3);
!     __ movptr(c_rarg3, (int64_t) Universe::verify_klass_bits());
      __ cmpptr(rax, c_rarg3);
      __ jcc(Assembler::notZero, error);
  
      // return if everything seems ok
      __ bind(exit);
--- 967,990 ----
      __ load_klass(rax, rax);  // get klass
      __ testptr(rax, rax);
      __ jcc(Assembler::zero, error); // if klass is NULL it is broken
      // Check if the klass is in the right area of memory
      __ mov(c_rarg2, rax);
!     __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_mask());
      __ andptr(c_rarg2, c_rarg3);
!     __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_bits());
      __ cmpptr(c_rarg2, c_rarg3);
      __ jcc(Assembler::notZero, error);
  
      // make sure klass' klass is 'reasonable'
      __ load_klass(rax, rax);
      __ testptr(rax, rax);
      __ jcc(Assembler::zero, error); // if klass' klass is NULL it is broken
      // Check if the klass' klass is in the right area of memory
!     __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_mask());
      __ andptr(rax, c_rarg3);
!     __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_bits());
      __ cmpptr(rax, c_rarg3);
      __ jcc(Assembler::notZero, error);
  
      // return if everything seems ok
      __ bind(exit);