From 3a026cda72d2624d1d2ccf891dabcde5f7a1f784 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 3 Jul 2024 10:05:32 -0700 Subject: [PATCH] fixup! OpenSSL armv8-mont.pl: Add purecap support --- crypto/openssl/crypto/bn/asm/armv8-mont.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/openssl/crypto/bn/asm/armv8-mont.pl b/crypto/openssl/crypto/bn/asm/armv8-mont.pl index 4611d3d80592..42ebbd47642e 100755 --- a/crypto/openssl/crypto/bn/asm/armv8-mont.pl +++ b/crypto/openssl/crypto/bn/asm/armv8-mont.pl @@ -651,7 +651,7 @@ #ifdef __CHERI_PURE_CAPABILITY__ add $nptr,$nptr,$negnum,lsl#2 // rewind $nptr sub $aptr,PTRN(sp),#0 - cmp x0,x0 // clear carry flag + cmn x0,xzr // clear carry flag #else sub $nptr,$nptr,$num,lsl#2 // rewind $nptr subs $aptr,PTRN(sp),#0 // clear carry flag @@ -1597,7 +1597,7 @@ ldp $m2,$m3,[$np,#8*2] #ifdef __CHERI_PURE_CAPABILITY__ add $np,$np,#8*4 - cmp x0,x0 // clear carry bit + cmn x0,xzr // clear carry bit #else adds $np,$np,#8*4 // clear carry bit #endif @@ -1748,7 +1748,7 @@ ldp $m2,$m3,[$np,#8*2] #ifdef __CHERI_PURE_CAPABILITY__ add $np,$np,#8*4 - cmp x0,x0 // clear carry bit + cmn x0,xzr // clear carry bit #else adds $np,$np,#8*4 // clear carry bit #endif @@ -1919,7 +1919,7 @@ ldp $a2,$a3,[$ap,#8*2] #ifdef __CHERI_PURE_CAPABILITY__ add $ap,$ap,#8*4 - cmp x0,x0 // clear carry flag + cmn x0,xzr // clear carry bit #else adds $ap,$ap,#8*4 // clear carry bit #endif