X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/354ea7a4eecb1c4046bebacc19cad55a5b571ec0..HEAD:/symm/rijndael-arm64-crypto.S diff --git a/symm/rijndael-arm64-crypto.S b/symm/rijndael-arm64-crypto.S index 9f68ae84..df0bb9d9 100644 --- a/symm/rijndael-arm64-crypto.S +++ b/symm/rijndael-arm64-crypto.S @@ -25,19 +25,21 @@ /// MA 02111-1307, USA. ///-------------------------------------------------------------------------- -/// External definitions. +/// Preliminaries. #include "config.h" #include "asm-common.h" + .arch armv8-a+crypto + .extern F(abort) .extern F(rijndael_rcon) + .text + ///-------------------------------------------------------------------------- /// Main code. - .arch armv8-a+crypto - /// The ARM crypto extension implements a little-endian version of AES /// (though the manual doesn't actually spell this out and you have to /// experiment), but Catacomb's internal interface presents as big-endian so @@ -129,7 +131,7 @@ FUNC(rijndael_setup_arm64_crypto) sub x6, x6, #1 cmp x8, x3 cbz x6, 9f - csel x8, x8, xzr, cc + cmov.cs x8, xzr b 0b // Next job is to construct the decryption keys. The keys for the