src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp

rev 57534 : 8236555: [s390] Fix VerifyOops
Reviewed-by:

*** 292,302 ****
  }
  
  void PatchingStub::emit_code(LIR_Assembler* ce) {
    // Copy original code here.
    assert(NativeGeneralJump::instruction_size <= _bytes_to_copy && _bytes_to_copy <= 0xFF,
!          "not enough room for call");
  
    NearLabel call_patch;
  
    int being_initialized_entry = __ offset();
  
--- 292,302 ----
  }
  
  void PatchingStub::emit_code(LIR_Assembler* ce) {
    // Copy original code here.
    assert(NativeGeneralJump::instruction_size <= _bytes_to_copy && _bytes_to_copy <= 0xFF,
!          "not enough room for call, need %d", _bytes_to_copy);
  
    NearLabel call_patch;
  
    int being_initialized_entry = __ offset();
  
*** 329,339 ****
        int a_byte = (*ptr) & 0xFF;
        assert(a_byte == *start++, "should be the same code");
      }
  #endif
    } else {
!     // Make a copy the code which is going to be patched.
      for (int i = 0; i < _bytes_to_copy; i++) {
        address ptr = (address)(_pc_start + i);
        int a_byte = (*ptr) & 0xFF;
        __ emit_int8 (a_byte);
      }
--- 329,339 ----
        int a_byte = (*ptr) & 0xFF;
        assert(a_byte == *start++, "should be the same code");
      }
  #endif
    } else {
!     // Make a copy of the code which is going to be patched.
      for (int i = 0; i < _bytes_to_copy; i++) {
        address ptr = (address)(_pc_start + i);
        int a_byte = (*ptr) & 0xFF;
        __ emit_int8 (a_byte);
      }