src/hotspot/cpu/s390/vtableStubs_s390.cpp

*** 1,8 ****
  /*
!  * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,8 ----
  /*
!  * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2016, 2021 SAP SE. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 72,82 ****
      assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
      // Use generic emitter for direct memory increment.
      // Abuse Z_method as scratch register for generic emitter.
      // It is loaded further down anyway before it is first used.
      // No dynamic code size variance here, increment is 1, always.
!     __ add2mem_32(Address(Z_R1_scratch), 1, Z_method);
    }
  #endif
  
    assert(VtableStub::receiver_location() == Z_R2->as_VMReg(), "receiver expected in Z_ARG1");
  
--- 72,82 ----
      assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
      // Use generic emitter for direct memory increment.
      // Abuse Z_method as scratch register for generic emitter.
      // It is loaded further down anyway before it is first used.
      // No dynamic code size variance here, increment is 1, always.
!     __ add2mem_64(Address(Z_R1_scratch), 1, Z_method);
    }
  #endif
  
    assert(VtableStub::receiver_location() == Z_R2->as_VMReg(), "receiver expected in Z_ARG1");
  
*** 155,164 ****
--- 155,165 ----
    VtableStub* s = new(stub_code_length) VtableStub(false, itable_index);
    // Can be NULL if there is no free space in the code cache.
    if (s == NULL) {
      return NULL;
    }
+ 
    // Count unused bytes in instruction sequences of variable size.
    // We add them to the computed buffer size in order to avoid
    // overflow in subsequently generated stubs.
    address   start_pc;
    int       slop_bytes = 0;
*** 176,186 ****
      assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
      // Use generic emitter for direct memory increment.
      // Abuse Z_method as scratch register for generic emitter.
      // It is loaded further down anyway before it is first used.
      // No dynamic code size variance here, increment is 1, always.
!     __ add2mem_32(Address(Z_R1_scratch), 1, Z_method);
    }
  #endif
  
    assert(VtableStub::receiver_location() == Z_R2->as_VMReg(), "receiver expected in Z_ARG1");
  
--- 177,187 ----
      assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
      // Use generic emitter for direct memory increment.
      // Abuse Z_method as scratch register for generic emitter.
      // It is loaded further down anyway before it is first used.
      // No dynamic code size variance here, increment is 1, always.
!     __ add2mem_64(Address(Z_R1_scratch), 1, Z_method);
    }
  #endif
  
    assert(VtableStub::receiver_location() == Z_R2->as_VMReg(), "receiver expected in Z_ARG1");