Merge pull request #1968

5e5b8512 Fix obsolete OpenSSL API usage (hyc)
6c72d6a0 Fix Android recognition (hyc)
e65d66fe Fix ARM64 identification (hyc)
a4673218 Clean up ARMv8-a aes_expand_key() (hyc)
a3d77901 Fix block_longhash_worker thread (hyc)

2 files changed, 19 insertions, 25 deletions

diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c
index 117f158ee..6afa28934 100644
--- a/src/crypto/slow-hash.c
+++ b/src/crypto/slow-hash.c
@@ -722,32 +722,24 @@ union cn_slow_hash_state
  * key schedule. Don't try to use this for vanilla AES.
 */
 static void aes_expand_key(const uint8_t *key, uint8_t *expandedKey) {
-__asm__("mov x2, %1\n\t" : : "r"(key), "r"(expandedKey));
+static const int rcon[] = {
+	0x01,0x01,0x01,0x01,
+	0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d,	// rotate-n-splat
+	0x1b,0x1b,0x1b,0x1b };
 __asm__(
-"	adr	x3,Lrcon\n"
-"\n"
 "	eor	v0.16b,v0.16b,v0.16b\n"
-"	ld1	{v3.16b},[x0],#16\n"
-"	ld1	{v1.4s,v2.4s},[x3],#32\n"
-"	b	L256\n"
-".align 5\n"
-"Lrcon:\n"
-".long	0x01,0x01,0x01,0x01\n"
-".long	0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d	// rotate-n-splat\n"
-".long	0x1b,0x1b,0x1b,0x1b\n"
-"\n"
-".align 4\n"
-"L256:\n"
-"	ld1	{v4.16b},[x0]\n"
-"	mov	w1,#5\n"
-"	st1	{v3.4s},[x2],#16\n"
+"	ld1	{v3.16b},[%0],#16\n"
+"	ld1	{v1.4s,v2.4s},[%2],#32\n"
+"	ld1	{v4.16b},[%0]\n"
+"	mov	w2,#5\n"
+"	st1	{v3.4s},[%1],#16\n"
 "\n"
-"Loop256:\n"
+"1:\n"
 "	tbl	v6.16b,{v4.16b},v2.16b\n"
 "	ext	v5.16b,v0.16b,v3.16b,#12\n"
-"	st1	{v4.4s},[x2],#16\n"
+"	st1	{v4.4s},[%1],#16\n"
 "	aese	v6.16b,v0.16b\n"
-"	subs	w1,w1,#1\n"
+"	subs	w2,w2,#1\n"
 "\n"
 "	eor	v3.16b,v3.16b,v5.16b\n"
 "	ext	v5.16b,v0.16b,v5.16b,#12\n"
@@ -757,8 +749,8 @@ __asm__(
 "	eor	v3.16b,v3.16b,v5.16b\n"
 "	shl	v1.16b,v1.16b,#1\n"
 "	eor	v3.16b,v3.16b,v6.16b\n"
-"	st1	{v3.4s},[x2],#16\n"
-"	b.eq	Ldone\n"
+"	st1	{v3.4s},[%1],#16\n"
+"	b.eq	2f\n"
 "\n"
 "	dup	v6.4s,v3.s[3]		// just splat\n"
 "	ext	v5.16b,v0.16b,v4.16b,#12\n"
@@ -771,9 +763,9 @@ __asm__(
 "	eor	v4.16b,v4.16b,v5.16b\n"
 "\n"
 "	eor	v4.16b,v4.16b,v6.16b\n"
-"	b	Loop256\n"
+"	b	1b\n"
 "\n"
-"Ldone:\n");
+"2:\n" : : "r"(key), "r"(expandedKey), "r"(rcon));
 }
 
 /* An ordinary AES round is a sequence of SubBytes, ShiftRows, MixColumns, AddRoundKey. There
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 8fe7da6b4..74c5b3b83 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -3665,6 +3665,8 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
     std::vector<std::unordered_map<crypto::hash, crypto::hash>> maps(threads);
     std::vector < std::vector < block >> blocks(threads);
     auto it = blocks_entry.begin();
+    boost::thread::attributes attrs;
+    attrs.set_stack_size(THREAD_STACK_SIZE);
 
     for (uint64_t i = 0; i < threads; i++)
     {
@@ -3724,7 +3726,7 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
       m_blocks_longhash_table.clear();
       for (uint64_t i = 0; i < threads; i++)
       {
-        thread_list.push_back(new boost::thread(&Blockchain::block_longhash_worker, this, height + (i * batches), std::cref(blocks[i]), std::ref(maps[i])));
+        thread_list.push_back(new boost::thread(attrs, boost::bind(&Blockchain::block_longhash_worker, this, height + (i * batches), std::cref(blocks[i]), std::ref(maps[i]))));
       }
 
       for (size_t j = 0; j < thread_list.size(); j++)