From 04ec972e338296810ccbdc7f58bfcf8788072752 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 3 Jul 2024 10:05:56 -0700 Subject: [PATCH] fixup! OpenSSL: Regen aarch64 assembly for Morello --- sys/crypto/openssl/aarch64/armv8-mont.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/crypto/openssl/aarch64/armv8-mont.S b/sys/crypto/openssl/aarch64/armv8-mont.S index 70699b145be1..1d51bcb12031 100644 --- a/sys/crypto/openssl/aarch64/armv8-mont.S +++ b/sys/crypto/openssl/aarch64/armv8-mont.S @@ -911,7 +911,7 @@ bn_mul8x_mont_neon: #ifdef __CHERI_PURE_CAPABILITY__ add PTR(3),PTR(3),x12,lsl#2 // rewind PTR(3) sub PTR(1),PTRN(sp),#0 - cmp x0,x0 // clear carry flag + cmn x0,xzr // clear carry flag #else sub PTR(3),PTR(3),x5,lsl#2 // rewind PTR(3) subs PTR(1),PTRN(sp),#0 // clear carry flag @@ -1818,7 +1818,7 @@ __bn_mul4x_mont: ldp x16,x17,[PTR(3),#8*2] #ifdef __CHERI_PURE_CAPABILITY__ add PTR(3),PTR(3),#8*4 - cmp x0,x0 // clear carry bit + cmn x0,xzr // clear carry bit #else adds PTR(3),PTR(3),#8*4 // clear carry bit #endif @@ -1969,7 +1969,7 @@ __bn_mul4x_mont: ldp x16,x17,[PTR(3),#8*2] #ifdef __CHERI_PURE_CAPABILITY__ add PTR(3),PTR(3),#8*4 - cmp x0,x0 // clear carry bit + cmn x0,xzr // clear carry bit #else adds PTR(3),PTR(3),#8*4 // clear carry bit #endif @@ -2140,7 +2140,7 @@ __bn_mul4x_mont: ldp x8,x9,[PTR(1),#8*2] #ifdef __CHERI_PURE_CAPABILITY__ add PTR(1),PTR(1),#8*4 - cmp x0,x0 // clear carry flag + cmn x0,xzr // clear carry bit #else adds PTR(1),PTR(1),#8*4 // clear carry bit #endif