src/hotspot/cpu/s390/vm_version_s390.cpp

rev 54763 : 8213084: Rework and enhance Print[Opto]Assembly output
Reviewed-by:

*** 802,821 ****
    a->z_br(Z_R14);
  
    address code_end = a->pc();
    a->flush();
  
    // Print the detection code.
    bool printVerbose = Verbose || PrintAssembly || PrintStubCode;
    if (printVerbose) {
      ttyLocker ttyl;
      tty->print_cr("Decoding CPU feature detection stub at " INTPTR_FORMAT " before execution:", p2i(code));
      tty->print_cr("Stub length is %ld bytes, codebuffer reserves %d bytes, %ld bytes spare.",
                    code_end-code, cbuf_size, cbuf_size-(code_end-code));
  
!     // Use existing decode function. This enables the [Code] format which is needed to DecodeErrorFile.
!     Disassembler::decode((u_char*)code, (u_char*)code_end, tty);
    }
  
    // Prepare for detection code execution and clear work buffer.
    _nfeatures        = 0;
    _ncipher_features = 0;
--- 802,823 ----
    a->z_br(Z_R14);
  
    address code_end = a->pc();
    a->flush();
  
+   cbuf.insts()->set_end(code_end);
+ 
    // Print the detection code.
    bool printVerbose = Verbose || PrintAssembly || PrintStubCode;
    if (printVerbose) {
      ttyLocker ttyl;
      tty->print_cr("Decoding CPU feature detection stub at " INTPTR_FORMAT " before execution:", p2i(code));
      tty->print_cr("Stub length is %ld bytes, codebuffer reserves %d bytes, %ld bytes spare.",
                    code_end-code, cbuf_size, cbuf_size-(code_end-code));
  
!     // Use existing decode function. This enables the [MachCode] format which is needed to DecodeErrorFile.
!     Disassembler::decode(&cbuf, code, code_end, tty);
    }
  
    // Prepare for detection code execution and clear work buffer.
    _nfeatures        = 0;
    _ncipher_features = 0;