From 87e17632b5e1df383d7dac6d8e52fd6e791f6fd7 Mon Sep 17 00:00:00 2001
From: Ed Nevill <enevill@openjdk.org>
Date: Mon, 18 May 2015 15:52:33 +0000
Subject: [PATCH] 8080586: aarch64: hotspot test
 compiler/codegen/7184394/TestAESMain.java fails

Return correct length in generate_cipherBlockChaining_encryptAESCrypt

Reviewed-by: roland
---
 hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
index 5cf5bd77700..af461db8b61 100644
--- a/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
@@ -1891,7 +1891,7 @@ class StubGenerator: public StubCodeGenerator {
     address start = __ pc();
       __ enter();
 
-      __ mov(rscratch1, len_reg);
+      __ mov(rscratch2, len_reg);
       __ ldrw(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
 
       __ ld1(v0, __ T16B, rvec);