src/cpu/sparc/vm/macroAssembler_sparc.cpp

*** 290,300 ****
  
  void MacroAssembler::verify_thread() {
    if (VerifyThread) {
      // NOTE: this chops off the heads of the 64-bit O registers.
      // make sure G2_thread contains the right value
!     save_frame_and_mov(0, Lmethod, Lmethod);   // to avoid clobbering O0 (and propagate Lmethod for -Xprof)
      mov(G1, L1);                // avoid clobbering G1
      // G2 saved below
      mov(G3, L3);                // avoid clobbering G3
      mov(G4, L4);                // avoid clobbering G4
      mov(G5_method, L5);         // avoid clobbering G5_method
--- 290,300 ----
  
  void MacroAssembler::verify_thread() {
    if (VerifyThread) {
      // NOTE: this chops off the heads of the 64-bit O registers.
      // make sure G2_thread contains the right value
!     save_frame_and_mov(0, Lmethod, Lmethod);   // to avoid clobbering O0 (and propagate Lmethod)
      mov(G1, L1);                // avoid clobbering G1
      // G2 saved below
      mov(G3, L3);                // avoid clobbering G3
      mov(G4, L4);                // avoid clobbering G4
      mov(G5_method, L5);         // avoid clobbering G5_method
*** 396,406 ****
    Address pc_addr(G2_thread, JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset());
    Address flags  (G2_thread, JavaThread::frame_anchor_offset() + JavaFrameAnchor::flags_offset());
  
  #ifdef ASSERT
    // check that it WAS previously set
!     save_frame_and_mov(0, Lmethod, Lmethod);     // Propagate Lmethod to helper frame for -Xprof
      ld_ptr(sp_addr, L0);
      tst(L0);
      breakpoint_trap(Assembler::zero, Assembler::ptr_cc);
      restore();
  #endif // ASSERT
--- 396,406 ----
    Address pc_addr(G2_thread, JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset());
    Address flags  (G2_thread, JavaThread::frame_anchor_offset() + JavaFrameAnchor::flags_offset());
  
  #ifdef ASSERT
    // check that it WAS previously set
!     save_frame_and_mov(0, Lmethod, Lmethod);     // Propagate Lmethod to helper frame
      ld_ptr(sp_addr, L0);
      tst(L0);
      breakpoint_trap(Assembler::zero, Assembler::ptr_cc);
      restore();
  #endif // ASSERT
*** 616,626 ****
    Address vm_result_addr(G2_thread, JavaThread::vm_result_offset());
    verify_oop(oop_result);
  
  # ifdef ASSERT
      // Check that we are not overwriting any other oop.
!     save_frame_and_mov(0, Lmethod, Lmethod);     // Propagate Lmethod for -Xprof
      ld_ptr(vm_result_addr, L0);
      tst(L0);
      restore();
      breakpoint_trap(notZero, Assembler::ptr_cc);
      // }
--- 616,626 ----
    Address vm_result_addr(G2_thread, JavaThread::vm_result_offset());
    verify_oop(oop_result);
  
  # ifdef ASSERT
      // Check that we are not overwriting any other oop.
!     save_frame_and_mov(0, Lmethod, Lmethod);     // Propagate Lmethod
      ld_ptr(vm_result_addr, L0);
      tst(L0);
      restore();
      breakpoint_trap(notZero, Assembler::ptr_cc);
      // }