src/cpu/s390/vm/compiledIC_s390.cpp

*** 88,110 ****
  // Relocation entries for call stub, compiled java to interpreter.
  int CompiledStaticCall::reloc_to_interp_stub() {
    return 5; // 4 in emit_java_to_interp + 1 in Java_Static_Call
  }
  
! void CompiledStaticCall::set_to_interpreted(methodHandle callee, address entry) {
!   address stub = find_stub();
    guarantee(stub != NULL, "stub not found");
  
    if (TraceICs) {
      ResourceMark rm;
!     tty->print_cr("CompiledStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s",
                    p2i(instruction_address()),
                    callee->name_and_sig_as_C_string());
    }
  
    // Creation also verifies the object.
!   NativeMovConstReg* method_holder = nativeMovConstReg_at(stub + get_IC_pos_in_java_to_interp_stub());
    NativeJump*        jump          = nativeJump_at(method_holder->next_instruction_address());
  
    // A generated lambda form might be deleted from the Lambdaform
    // cache in MethodTypeForm.  If a jit compiled lambdaform method
    // becomes not entrant and the cache access returns null, the new
--- 88,110 ----
  // Relocation entries for call stub, compiled java to interpreter.
  int CompiledStaticCall::reloc_to_interp_stub() {
    return 5; // 4 in emit_java_to_interp + 1 in Java_Static_Call
  }
  
! void CompiledDirectStaticCall::set_to_interpreted(const methodHandle& callee, address entry) {
!   address stub = find_stub(/*is_aot*/ false);
    guarantee(stub != NULL, "stub not found");
  
    if (TraceICs) {
      ResourceMark rm;
!     tty->print_cr("CompiledDirectStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s",
                    p2i(instruction_address()),
                    callee->name_and_sig_as_C_string());
    }
  
    // Creation also verifies the object.
!   NativeMovConstReg* method_holder = nativeMovConstReg_at(stub + NativeCall::get_IC_pos_in_java_to_interp_stub());
    NativeJump*        jump          = nativeJump_at(method_holder->next_instruction_address());
  
    // A generated lambda form might be deleted from the Lambdaform
    // cache in MethodTypeForm.  If a jit compiled lambdaform method
    // becomes not entrant and the cache access returns null, the new
*** 121,158 ****
  
    // Update jump to call.
    set_destination_mt_safe(stub);
  }
  
! void CompiledStaticCall::set_stub_to_clean(static_stub_Relocation* static_stub) {
    assert (CompiledIC_lock->is_locked() || SafepointSynchronize::is_at_safepoint(), "mt unsafe call");
    // Reset stub.
    address stub = static_stub->addr();
    assert(stub != NULL, "stub not found");
    // Creation also verifies the object.
!   NativeMovConstReg* method_holder = nativeMovConstReg_at(stub + get_IC_pos_in_java_to_interp_stub());
    NativeJump*        jump          = nativeJump_at(method_holder->next_instruction_address());
    method_holder->set_data(0);
    jump->set_jump_destination((address)-1);
  }
  
  //-----------------------------------------------------------------------------
  
  #ifndef PRODUCT
  
! void CompiledStaticCall::verify() {
    // Verify call.
!   NativeCall::verify();
    if (os::is_MP()) {
!     verify_alignment();
    }
  
    // Verify stub.
!   address stub = find_stub();
    assert(stub != NULL, "no stub found for static call");
    // Creation also verifies the object.
!   NativeMovConstReg* method_holder = nativeMovConstReg_at(stub + get_IC_pos_in_java_to_interp_stub());
    NativeJump*        jump          = nativeJump_at(method_holder->next_instruction_address());
  
    // Verify state.
    assert(is_clean() || is_call_to_compiled() || is_call_to_interpreted(), "sanity check");
  }
--- 121,158 ----
  
    // Update jump to call.
    set_destination_mt_safe(stub);
  }
  
! void CompiledDirectStaticCall::set_stub_to_clean(static_stub_Relocation* static_stub) {
    assert (CompiledIC_lock->is_locked() || SafepointSynchronize::is_at_safepoint(), "mt unsafe call");
    // Reset stub.
    address stub = static_stub->addr();
    assert(stub != NULL, "stub not found");
    // Creation also verifies the object.
!   NativeMovConstReg* method_holder = nativeMovConstReg_at(stub + NativeCall::get_IC_pos_in_java_to_interp_stub());
    NativeJump*        jump          = nativeJump_at(method_holder->next_instruction_address());
    method_holder->set_data(0);
    jump->set_jump_destination((address)-1);
  }
  
  //-----------------------------------------------------------------------------
  
  #ifndef PRODUCT
  
! void CompiledDirectStaticCall::verify() {
    // Verify call.
!   _call->verify();
    if (os::is_MP()) {
!     _call->verify_alignment();
    }
  
    // Verify stub.
!   address stub = find_stub(/*is_aot*/ false);
    assert(stub != NULL, "no stub found for static call");
    // Creation also verifies the object.
!   NativeMovConstReg* method_holder = nativeMovConstReg_at(stub + NativeCall::get_IC_pos_in_java_to_interp_stub());
    NativeJump*        jump          = nativeJump_at(method_holder->next_instruction_address());
  
    // Verify state.
    assert(is_clean() || is_call_to_compiled() || is_call_to_interpreted(), "sanity check");
  }