src/cpu/aarch64/vm/stubGenerator_aarch64.cpp

*** 2741,2751 ****
    address generate_cipherBlockChaining_encryptAESCrypt() {
      assert(UseAES, "need AES instructions and misaligned SSE support");
      __ align(CodeEntryAlignment);
      StubCodeMark mark(this, "StubRoutines", "cipherBlockChaining_encryptAESCrypt");
  
!     Label L_loadkeys_44, L_loadkeys_52, L_aes_loop, L_rounds_44, L_rounds_52, _L_finish;
  
      const Register from        = c_rarg0;  // source array address
      const Register to          = c_rarg1;  // destination array address
      const Register key         = c_rarg2;  // key array address
      const Register rvec        = c_rarg3;  // r byte array initialized from initvector array address
--- 2741,2751 ----
    address generate_cipherBlockChaining_encryptAESCrypt() {
      assert(UseAES, "need AES instructions and misaligned SSE support");
      __ align(CodeEntryAlignment);
      StubCodeMark mark(this, "StubRoutines", "cipherBlockChaining_encryptAESCrypt");
  
!     Label L_loadkeys_44, L_loadkeys_52, L_aes_loop, L_rounds_44, L_rounds_52;
  
      const Register from        = c_rarg0;  // source array address
      const Register to          = c_rarg1;  // destination array address
      const Register key         = c_rarg2;  // key array address
      const Register rvec        = c_rarg3;  // r byte array initialized from initvector array address
*** 2755,2766 ****
  
      address start = __ pc();
  
        __ enter();
  
!       __ subsw(rscratch2, len_reg, zr);
!       __ br(Assembler::LE, _L_finish);
  
        __ ldrw(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
  
        __ ld1(v0, __ T16B, rvec);
  
--- 2755,2765 ----
  
      address start = __ pc();
  
        __ enter();
  
!       __ movw(rscratch2, len_reg);
  
        __ ldrw(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
  
        __ ld1(v0, __ T16B, rvec);
  
*** 2821,2831 ****
        __ subw(len_reg, len_reg, 16);
        __ cbnzw(len_reg, L_aes_loop);
  
        __ st1(v0, __ T16B, rvec);
  
-     __ BIND(_L_finish);
        __ mov(r0, rscratch2);
  
        __ leave();
        __ ret(lr);
  
--- 2820,2829 ----
*** 2847,2857 ****
    address generate_cipherBlockChaining_decryptAESCrypt() {
      assert(UseAES, "need AES instructions and misaligned SSE support");
      __ align(CodeEntryAlignment);
      StubCodeMark mark(this, "StubRoutines", "cipherBlockChaining_decryptAESCrypt");
  
!     Label L_loadkeys_44, L_loadkeys_52, L_aes_loop, L_rounds_44, L_rounds_52, _L_finish;
  
      const Register from        = c_rarg0;  // source array address
      const Register to          = c_rarg1;  // destination array address
      const Register key         = c_rarg2;  // key array address
      const Register rvec        = c_rarg3;  // r byte array initialized from initvector array address
--- 2845,2855 ----
    address generate_cipherBlockChaining_decryptAESCrypt() {
      assert(UseAES, "need AES instructions and misaligned SSE support");
      __ align(CodeEntryAlignment);
      StubCodeMark mark(this, "StubRoutines", "cipherBlockChaining_decryptAESCrypt");
  
!     Label L_loadkeys_44, L_loadkeys_52, L_aes_loop, L_rounds_44, L_rounds_52;
  
      const Register from        = c_rarg0;  // source array address
      const Register to          = c_rarg1;  // destination array address
      const Register key         = c_rarg2;  // key array address
      const Register rvec        = c_rarg3;  // r byte array initialized from initvector array address
*** 2861,2872 ****
  
      address start = __ pc();
  
        __ enter();
  
!       __ subsw(rscratch2, len_reg, zr);
!       __ br(Assembler::LE, _L_finish);
  
        __ ldrw(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
  
        __ ld1(v2, __ T16B, rvec);
  
--- 2859,2869 ----
  
      address start = __ pc();
  
        __ enter();
  
!       __ movw(rscratch2, len_reg);
  
        __ ldrw(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
  
        __ ld1(v2, __ T16B, rvec);
  
*** 2931,2941 ****
        __ subw(len_reg, len_reg, 16);
        __ cbnzw(len_reg, L_aes_loop);
  
        __ st1(v2, __ T16B, rvec);
  
-     __ BIND(_L_finish);
        __ mov(r0, rscratch2);
  
        __ leave();
        __ ret(lr);
  
--- 2928,2937 ----