diff --git a/CryptoLib.Tests/src/Crypto/SpeckBlockCipherTestBase.pas b/CryptoLib.Tests/src/Crypto/SpeckBlockCipherTestBase.pas index be096482..310162d9 100644 --- a/CryptoLib.Tests/src/Crypto/SpeckBlockCipherTestBase.pas +++ b/CryptoLib.Tests/src/Crypto/SpeckBlockCipherTestBase.pas @@ -31,7 +31,6 @@ interface ClpIParametersWithIV, ClpParametersWithIV, ClpIBufferedCipher, - ClpIBufferedBlockCipher, ClpBufferedBlockCipher, ClpCbcBlockCipher, ClpICbcBlockCipher, diff --git a/CryptoLib/src/Crypto/Engines/ClpAesEngineX86.pas b/CryptoLib/src/Crypto/Engines/ClpAesEngineX86.pas index f8575d1e..9636ce45 100644 --- a/CryptoLib/src/Crypto/Engines/ClpAesEngineX86.pas +++ b/CryptoLib/src/Crypto/Engines/ClpAesEngineX86.pas @@ -170,11 +170,11 @@ implementation procedure AesNiExpandRoundKeys128(Key, KeysOut: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiExpandRoundKeys_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiExpandRoundKeys_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY128} @@ -183,11 +183,11 @@ procedure AesNiExpandRoundKeys128(Key, KeysOut: PByte); procedure AesNiExpandRoundKeys192(Key, KeysOut: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiExpandRoundKeys_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiExpandRoundKeys_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY192} @@ -196,11 +196,11 @@ procedure AesNiExpandRoundKeys192(Key, KeysOut: PByte); procedure AesNiExpandRoundKeys256(Key, KeysOut: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiExpandRoundKeys_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiExpandRoundKeys_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY256} @@ -208,11 +208,11 @@ procedure AesNiExpandRoundKeys256(Key, KeysOut: PByte); procedure AesNiPrepareDecryptRoundKeys(Keys: PByte; NRounds: Int32); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiPrepareDecryptRoundKeys_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiPrepareDecryptRoundKeys_i386.inc} {$ENDIF} end; @@ -220,11 +220,11 @@ procedure AesNiPrepareDecryptRoundKeys(Keys: PByte; NRounds: Int32); procedure AesNiOneEnc128(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY128} @@ -233,11 +233,11 @@ procedure AesNiOneEnc128(State, Keys: PByte); procedure AesNiOneEnc192(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY192} @@ -246,11 +246,11 @@ procedure AesNiOneEnc192(State, Keys: PByte); procedure AesNiOneEnc256(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY256} @@ -260,11 +260,11 @@ procedure AesNiOneDec128(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -275,11 +275,11 @@ procedure AesNiOneDec192(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -290,11 +290,11 @@ procedure AesNiOneDec256(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -304,11 +304,11 @@ procedure AesNiOneDec256(State, Keys: PByte); procedure AesNiFourEnc128(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY128} @@ -317,11 +317,11 @@ procedure AesNiFourEnc128(State, Keys: PByte); procedure AesNiFourEnc192(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY192} @@ -330,11 +330,11 @@ procedure AesNiFourEnc192(State, Keys: PByte); procedure AesNiFourEnc256(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY256} @@ -344,11 +344,11 @@ procedure AesNiFourDec128(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -359,11 +359,11 @@ procedure AesNiFourDec192(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -374,11 +374,11 @@ procedure AesNiFourDec256(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -388,11 +388,11 @@ procedure AesNiFourDec256(State, Keys: PByte); procedure AesNiEightEnc128(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY128} @@ -401,11 +401,11 @@ procedure AesNiEightEnc128(State, Keys: PByte); procedure AesNiEightEnc192(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY192} @@ -414,11 +414,11 @@ procedure AesNiEightEnc192(State, Keys: PByte); procedure AesNiEightEnc256(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY256} @@ -428,11 +428,11 @@ procedure AesNiEightDec128(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -443,11 +443,11 @@ procedure AesNiEightDec192(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -458,11 +458,11 @@ procedure AesNiEightDec256(State, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -473,11 +473,11 @@ procedure AesNiOneEnc128InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$DEFINE CRYPTOLIB_AESNI_INOUT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_INOUT} @@ -488,11 +488,11 @@ procedure AesNiOneEnc192InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$DEFINE CRYPTOLIB_AESNI_INOUT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_INOUT} @@ -503,11 +503,11 @@ procedure AesNiOneEnc256InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$DEFINE CRYPTOLIB_AESNI_INOUT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_INOUT} @@ -519,11 +519,11 @@ procedure AesNiOneDec128InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_INOUT} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -536,11 +536,11 @@ procedure AesNiOneDec192InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_INOUT} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -553,11 +553,11 @@ procedure AesNiOneDec256InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_INOUT} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiOneCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -569,11 +569,11 @@ procedure AesNiFourEnc128InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$DEFINE CRYPTOLIB_AESNI_INOUT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_INOUT} @@ -584,11 +584,11 @@ procedure AesNiFourEnc192InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$DEFINE CRYPTOLIB_AESNI_INOUT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_INOUT} @@ -599,11 +599,11 @@ procedure AesNiFourEnc256InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$DEFINE CRYPTOLIB_AESNI_INOUT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_INOUT} @@ -615,11 +615,11 @@ procedure AesNiFourDec128InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_INOUT} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -632,11 +632,11 @@ procedure AesNiFourDec192InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_INOUT} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -649,11 +649,11 @@ procedure AesNiFourDec256InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_INOUT} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiFourCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -665,11 +665,11 @@ procedure AesNiEightEnc128InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$DEFINE CRYPTOLIB_AESNI_INOUT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_INOUT} @@ -680,11 +680,11 @@ procedure AesNiEightEnc192InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$DEFINE CRYPTOLIB_AESNI_INOUT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_INOUT} @@ -695,11 +695,11 @@ procedure AesNiEightEnc256InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$DEFINE CRYPTOLIB_AESNI_INOUT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_INOUT} @@ -711,11 +711,11 @@ procedure AesNiEightDec128InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_INOUT} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -728,11 +728,11 @@ procedure AesNiEightDec192InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_INOUT} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -745,11 +745,11 @@ procedure AesNiEightDec256InOut(RIn, ROut, Keys: PByte); {$DEFINE CRYPTOLIB_AESNI_INOUT} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Aes\AesNiEightCipher_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} diff --git a/CryptoLib/src/Crypto/Engines/ClpChaChaX86Backend.pas b/CryptoLib/src/Crypto/Engines/ClpChaChaX86Backend.pas index 27f03d99..67e98368 100644 --- a/CryptoLib/src/Crypto/Engines/ClpChaChaX86Backend.pas +++ b/CryptoLib/src/Crypto/Engines/ClpChaChaX86Backend.pas @@ -52,11 +52,11 @@ implementation {$IFDEF CRYPTOLIB_X86_SIMD} procedure ChaCha20BlockSse2(ARounds: Int32; AInput, AOut: PByte); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\ChaCha\ChaCha20BlockSse2_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\ChaCha\ChaCha20BlockSse2_i386.inc} {$ENDIF} end; @@ -68,33 +68,33 @@ procedure ChaCha7539RaiseCounter7539; procedure ChaCha7539ProcessBlocks2Sse2(ARounds: Int32; AState, AIn, AOut: PByte); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\Include\Simd\ChaCha\ChaCha7539ProcessBlocks2Sse2_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\Include\Simd\ChaCha\ChaCha7539ProcessBlocks2Sse2_i386.inc} {$ENDIF} end; procedure ChaCha7539ProcessBlocks2Avx2(ARounds: Int32; AState, AIn, AOut: PByte); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\Include\Simd\ChaCha\ChaCha7539ProcessBlocks2Avx2_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\Include\Simd\ChaCha\ChaCha7539ProcessBlocks2Avx2_i386.inc} {$ENDIF} end; procedure ChaCha7539ProcessBlocks4Avx2(ARounds: Int32; AState, AIn, AOut: PByte); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\Include\Simd\ChaCha\ChaCha7539ProcessBlocks4Avx2_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\Include\Simd\ChaCha\ChaCha7539ProcessBlocks4Avx2_i386.inc} {$ENDIF} end; diff --git a/CryptoLib/src/Crypto/Engines/ClpSalsaX86Backend.pas b/CryptoLib/src/Crypto/Engines/ClpSalsaX86Backend.pas index f60a33e0..46745e16 100644 --- a/CryptoLib/src/Crypto/Engines/ClpSalsaX86Backend.pas +++ b/CryptoLib/src/Crypto/Engines/ClpSalsaX86Backend.pas @@ -46,22 +46,22 @@ implementation {$IFDEF CRYPTOLIB_X86_SIMD} procedure Salsa20BlockSse41(ARounds: Int32; AInput, AOut: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\Include\Simd\Salsa\Salsa20BlockSse41_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\Include\Simd\Salsa\Salsa20BlockSse41_i386.inc} {$ENDIF} end; procedure Salsa20ProcessBlocks2Sse41(ARounds: Int32; AState, AIn, AOut: PByte); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\Include\Simd\Salsa\Salsa20ProcessBlocks2Sse41_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\Include\Simd\Salsa\Salsa20ProcessBlocks2Sse41_i386.inc} {$ENDIF} end; diff --git a/CryptoLib/src/Crypto/Macs/ClpPoly1305X86Backend.pas b/CryptoLib/src/Crypto/Macs/ClpPoly1305X86Backend.pas index 3e726f11..cdd71d09 100644 --- a/CryptoLib/src/Crypto/Macs/ClpPoly1305X86Backend.pas +++ b/CryptoLib/src/Crypto/Macs/ClpPoly1305X86Backend.pas @@ -171,18 +171,18 @@ procedure Poly1305Avx2InitPowerTable(var APowTable: TCryptoLibByteArray; // Asm wrapper around the architecture-specific 4-way bulk kernel. The .inc // files contain pure assembly (db-encoded VEX with mnemonic comments); the -// Pascal layer below is just the procedure header + the SimdProc5Begin ABI +// Pascal layer below is just the procedure header + the ClpSimdProc5Begin ABI // glue + the kernel body include. ACtx points at the 72-byte R/S/H/K // portion of TPoly1305State; APowTable points at the separate 320-byte // power table buffer; the kernel never reads the K limbs. procedure Poly1305BlocksBulkAvx2Core(ACtx, APowTable, AInp: PByte; ALen: NativeUInt; APad: Int32); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc5Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc5Begin_x86_64.inc} {$I ..\..\Include\Simd\Poly1305\Poly1305BlocksBulkAvx2Core_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc5Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc5Begin_i386.inc} {$I ..\..\Include\Simd\Poly1305\Poly1305BlocksBulkAvx2Core_i386.inc} {$ENDIF} end; diff --git a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCbcKernel.pas b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCbcKernel.pas index 229d1ea6..fb341932 100644 --- a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCbcKernel.pas +++ b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCbcKernel.pas @@ -87,11 +87,11 @@ TCbcEncryptFusedCtx = record procedure AesNiCbcEncrypt128(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Cbc\AesNiCbcEncryptSerial_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Cbc\AesNiCbcEncryptSerial_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY128} @@ -100,11 +100,11 @@ procedure AesNiCbcEncrypt128(PCtx: Pointer); procedure AesNiCbcEncrypt192(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Cbc\AesNiCbcEncryptSerial_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Cbc\AesNiCbcEncryptSerial_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY192} @@ -113,11 +113,11 @@ procedure AesNiCbcEncrypt192(PCtx: Pointer); procedure AesNiCbcEncrypt256(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Cbc\AesNiCbcEncryptSerial_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Cbc\AesNiCbcEncryptSerial_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY256} diff --git a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCcmKernel.pas b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCcmKernel.pas index 3f4bd174..3cff60f4 100644 --- a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCcmKernel.pas +++ b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCcmKernel.pas @@ -102,11 +102,11 @@ TCcmFusedTwoCtx = record procedure CcmFusedCtrCbcMacEnc128(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY128} @@ -115,11 +115,11 @@ procedure CcmFusedCtrCbcMacEnc128(PCtx: Pointer); procedure CcmFusedCtrCbcMacEnc192(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY192} @@ -128,11 +128,11 @@ procedure CcmFusedCtrCbcMacEnc192(PCtx: Pointer); procedure CcmFusedCtrCbcMacEnc256(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY256} @@ -142,11 +142,11 @@ procedure CcmFusedCtrCbcMacDec128(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$DEFINE CRYPTOLIB_CCM_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_CCM_DECRYPT} @@ -157,11 +157,11 @@ procedure CcmFusedCtrCbcMacDec192(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$DEFINE CRYPTOLIB_CCM_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_CCM_DECRYPT} @@ -172,11 +172,11 @@ procedure CcmFusedCtrCbcMacDec256(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$DEFINE CRYPTOLIB_CCM_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ccm\AesCcmFusedCtrCbcMacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_CCM_DECRYPT} diff --git a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCtrKernel.pas b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCtrKernel.pas index d839f04a..1321a903 100644 --- a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCtrKernel.pas +++ b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiCtrKernel.pas @@ -90,11 +90,11 @@ TCtrFusedCtx = record procedure AesNiCtrEnc128(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ctr\AesNiCtrEight_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ctr\AesNiCtrEight_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY128} @@ -103,11 +103,11 @@ procedure AesNiCtrEnc128(PCtx: Pointer); procedure AesNiCtrEnc192(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ctr\AesNiCtrEight_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ctr\AesNiCtrEight_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY192} @@ -116,11 +116,11 @@ procedure AesNiCtrEnc192(PCtx: Pointer); procedure AesNiCtrEnc256(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ctr\AesNiCtrEight_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ctr\AesNiCtrEight_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY256} diff --git a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiEaxKernel.pas b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiEaxKernel.pas index 8b17386e..8b2bed9f 100644 --- a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiEaxKernel.pas +++ b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiEaxKernel.pas @@ -100,11 +100,11 @@ TEaxFusedTwoCtx = record procedure EaxFusedCtrOmacEnc128(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY128} @@ -113,11 +113,11 @@ procedure EaxFusedCtrOmacEnc128(PCtx: Pointer); procedure EaxFusedCtrOmacEnc192(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY192} @@ -126,11 +126,11 @@ procedure EaxFusedCtrOmacEnc192(PCtx: Pointer); procedure EaxFusedCtrOmacEnc256(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY256} @@ -140,11 +140,11 @@ procedure EaxFusedCtrOmacDec128(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$DEFINE CRYPTOLIB_EAX_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_EAX_DECRYPT} @@ -155,11 +155,11 @@ procedure EaxFusedCtrOmacDec192(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$DEFINE CRYPTOLIB_EAX_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_EAX_DECRYPT} @@ -170,11 +170,11 @@ procedure EaxFusedCtrOmacDec256(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$DEFINE CRYPTOLIB_EAX_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Eax\AesEaxFusedCtrOmacTwo_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_EAX_DECRYPT} diff --git a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiGcmKernel.pas b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiGcmKernel.pas index 722d1f02..d2124fd1 100644 --- a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiGcmKernel.pas +++ b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiGcmKernel.pas @@ -104,11 +104,11 @@ TGcmFusedCtx = record procedure GcmFusedAesEnc128GhashEight(PCtx: Pointer); {$DEFINE GCM_FUSED_AES_ROUNDS_10} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Gcm\AesGcmFusedCtrGhashEight_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Gcm\AesGcmFusedCtrGhashEight_i386.inc} {$ENDIF} {$UNDEF GCM_FUSED_AES_ROUNDS_10} @@ -117,11 +117,11 @@ procedure GcmFusedAesEnc128GhashEight(PCtx: Pointer); procedure GcmFusedAesEnc192GhashEight(PCtx: Pointer); {$DEFINE GCM_FUSED_AES_ROUNDS_12} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Gcm\AesGcmFusedCtrGhashEight_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Gcm\AesGcmFusedCtrGhashEight_i386.inc} {$ENDIF} {$UNDEF GCM_FUSED_AES_ROUNDS_12} @@ -130,11 +130,11 @@ procedure GcmFusedAesEnc192GhashEight(PCtx: Pointer); procedure GcmFusedAesEnc256GhashEight(PCtx: Pointer); {$DEFINE GCM_FUSED_AES_ROUNDS_14} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Gcm\AesGcmFusedCtrGhashEight_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Gcm\AesGcmFusedCtrGhashEight_i386.inc} {$ENDIF} {$UNDEF GCM_FUSED_AES_ROUNDS_14} diff --git a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiOcbKernel.pas b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiOcbKernel.pas index bb97b856..e49d2db8 100644 --- a/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiOcbKernel.pas +++ b/CryptoLib/src/Crypto/Modes/Fused/ClpAesNiOcbKernel.pas @@ -110,11 +110,11 @@ TOcbFusedKernelCtx = record procedure OcbFusedEncWide128(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY128} @@ -123,11 +123,11 @@ procedure OcbFusedEncWide128(PCtx: Pointer); procedure OcbFusedEncWide192(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY192} @@ -136,11 +136,11 @@ procedure OcbFusedEncWide192(PCtx: Pointer); procedure OcbFusedEncWide256(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_KEY256} @@ -150,11 +150,11 @@ procedure OcbFusedDecWide128(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY128} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -165,11 +165,11 @@ procedure OcbFusedDecWide192(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY192} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} @@ -180,11 +180,11 @@ procedure OcbFusedDecWide256(PCtx: Pointer); {$DEFINE CRYPTOLIB_AESNI_KEY256} {$DEFINE CRYPTOLIB_AESNI_DECRYPT} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} {$I ..\..\..\Include\Simd\Aes\Ocb\AesOcbFusedWide_i386.inc} {$ENDIF} {$UNDEF CRYPTOLIB_AESNI_DECRYPT} diff --git a/CryptoLib/src/Crypto/Modes/Gcm/ClpGcmSivX86Backend.pas b/CryptoLib/src/Crypto/Modes/Gcm/ClpGcmSivX86Backend.pas index 78a08894..1b2f84e8 100644 --- a/CryptoLib/src/Crypto/Modes/Gcm/ClpGcmSivX86Backend.pas +++ b/CryptoLib/src/Crypto/Modes/Gcm/ClpGcmSivX86Backend.pas @@ -45,11 +45,11 @@ implementation {$IFDEF CRYPTOLIB_X86_SIMD} procedure GcmSivPolyvalHornerEight(PFS, PC0, PHPow128, PMask: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\..\Include\Simd\GcmSiv\PolyvalHornerEight_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\..\Include\Simd\GcmSiv\PolyvalHornerEight_i386.inc} {$ENDIF} end; diff --git a/CryptoLib/src/Crypto/Modes/Gcm/ClpGhashX86Backend.pas b/CryptoLib/src/Crypto/Modes/Gcm/ClpGhashX86Backend.pas index b6315427..60b67233 100644 --- a/CryptoLib/src/Crypto/Modes/Gcm/ClpGhashX86Backend.pas +++ b/CryptoLib/src/Crypto/Modes/Gcm/ClpGhashX86Backend.pas @@ -77,44 +77,44 @@ TGcmFieldRaw = record procedure GcmPclmulFieldPartial(PX, PY, POut: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Gcm\GcmPclmulPartial_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\..\Include\Simd\Gcm\GcmPclmulPartial_i386.inc} {$ENDIF} end; procedure GcmPclmulMultiplyExtBytes(PX, PY, POut48: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Gcm\GcmPclmulMultiplyExt_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\..\Include\Simd\Gcm\GcmPclmulMultiplyExt_i386.inc} {$ENDIF} end; procedure GcmReduce3FoldSse2(PZ0, PZ1, PZ2, POut: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Gcm\GcmReduce3FoldSse2_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\..\Include\Simd\Gcm\GcmReduce3FoldSse2_i386.inc} {$ENDIF} end; procedure GcmXorMultiplyExtLimbs48Sse2(PA0, PA1, PA2, PSrc48: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Gcm\GcmXorMultiplyExtLimbs48Sse2_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\..\Include\Simd\Gcm\GcmXorMultiplyExtLimbs48Sse2_i386.inc} {$ENDIF} end; @@ -122,11 +122,11 @@ procedure GcmXorMultiplyExtLimbs48Sse2(PA0, PA1, PA2, PSrc48: Pointer); procedure GcmGhashFourFull(PFS, PC0, PHPow64, PMask: Pointer); {$DEFINE GCM_GHASH_FULL_BLOCKS_4} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Gcm\GcmGhashFull_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\..\Include\Simd\Gcm\GcmGhashFull_i386.inc} {$ENDIF} {$UNDEF GCM_GHASH_FULL_BLOCKS_4} @@ -135,11 +135,11 @@ procedure GcmGhashFourFull(PFS, PC0, PHPow64, PMask: Pointer); procedure GcmGhashEightFull(PFS, PC0, PHPow128, PMask: Pointer); {$DEFINE GCM_GHASH_FULL_BLOCKS_8} {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Gcm\GcmGhashFull_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\..\Include\Simd\Gcm\GcmGhashFull_i386.inc} {$ENDIF} {$UNDEF GCM_GHASH_FULL_BLOCKS_8} @@ -154,11 +154,11 @@ procedure GcmGhashEightFull(PFS, PC0, PHPow128, PMask: Pointer); procedure GcmBlockReverse128Ssse3(PDst, PSrc, PMask: PByte); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} {$I ..\..\..\Include\Simd\Gcm\GcmBlockReverse128Ssse3_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} {$I ..\..\..\Include\Simd\Gcm\GcmBlockReverse128Ssse3_i386.inc} {$ENDIF} end; diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiEightCipher_i386.inc b/CryptoLib/src/Include/Simd/Aes/AesNiEightCipher_i386.inc index 090aebe9..b99b4650 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiEightCipher_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiEightCipher_i386.inc @@ -7,8 +7,8 @@ // Mode selection: // CRYPTOLIB_AESNI_INOUT defined -> out-of-place (read RIn, write ROut). // undefined -> in-place (read/write state). -// In-place (SimdProc2Begin): ebx = state, esi = keys. -// Out-of-place (SimdProc3Begin, CRYPTOLIB_AESNI_INOUT): ebx = RIn, esi = ROut, edi = keys. +// In-place (ClpSimdProc2Begin): ebx = state, esi = keys. +// Out-of-place (ClpSimdProc3Begin, CRYPTOLIB_AESNI_INOUT): ebx = RIn, esi = ROut, edi = keys. // // In-place must move the keys pointer into the canonical rounds-only // register (edi); the 2-param prologue did not push edi, so it is diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiEightCipher_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/AesNiEightCipher_x86_64.inc index 71f27578..365391bc 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiEightCipher_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiEightCipher_x86_64.inc @@ -7,8 +7,8 @@ // Mode selection: // CRYPTOLIB_AESNI_INOUT defined -> out-of-place (read RIn, write ROut). // undefined -> in-place (read/write state). -// In-place (SimdProc2Begin): rcx = state, rdx = keys. -// Out-of-place (SimdProc3Begin, CRYPTOLIB_AESNI_INOUT): rcx = RIn, rdx = ROut, r8 = keys. +// In-place (ClpSimdProc2Begin): rcx = state, rdx = keys. +// Out-of-place (ClpSimdProc3Begin, CRYPTOLIB_AESNI_INOUT): rcx = RIn, rdx = ROut, r8 = keys. // // In-place must move the keys pointer into the canonical rounds-only // register (mov r8, rdx); out-of-place already has keys in r8. @@ -16,7 +16,7 @@ // Variant selection (forwarded to the rounds-only include): // CRYPTOLIB_AESNI_DECRYPT -> decrypt; else encrypt. // Exactly one of CRYPTOLIB_AESNI_KEY128 / KEY192 / KEY256 selects N_R. -{$I ..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} movdqu xmm0, [rcx] movdqu xmm1, [rcx + 16] movdqu xmm2, [rcx + 32] @@ -48,4 +48,4 @@ movdqu [rcx + 96], xmm6 movdqu [rcx + 112], xmm7 {$ENDIF} -{$I ..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiExpandRoundKeys_i386.inc b/CryptoLib/src/Include/Simd/Aes/AesNiExpandRoundKeys_i386.inc index a4b96129..6c3c5ce0 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiExpandRoundKeys_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiExpandRoundKeys_i386.inc @@ -8,7 +8,7 @@ // Exactly one of CRYPTOLIB_AESNI_KEY128 / KEY192 / KEY256 selects the // schedule (see ClpAesEngineX86 for the allocation site). // -// Entry (after SimdProc2Begin_i386.inc): ebx = user key (16 / 24 / 32 bytes), +// Entry (after ClpSimdProc2Begin_i386.inc): ebx = user key (16 / 24 / 32 bytes), // esi = KeysOut (16 * (N_R + 1) bytes). // Saves edi (and uses ebx as scratch, restoring on exit). Stack scratch: // 48 / 96 / 80 bytes (KEY128 / 192 / 256). Uses xmm0..xmm2 as scratch. diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiExpandRoundKeys_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/AesNiExpandRoundKeys_x86_64.inc index ec542f64..9d49b934 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiExpandRoundKeys_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiExpandRoundKeys_x86_64.inc @@ -8,7 +8,7 @@ // Exactly one of CRYPTOLIB_AESNI_KEY128 / KEY192 / KEY256 selects the // schedule (see ClpAesEngineX86 for the allocation site). // -// Entry (after SimdProc2Begin_x86_64.inc): rcx = user key +// Entry (after ClpSimdProc2Begin_x86_64.inc): rcx = user key // (16 / 24 / 32 bytes), rdx = KeysOut (16 * (N_R + 1) bytes). // Saves r12 and rbx; uses 48 / 96 / 80 bytes of stack scratch (KEY128 // / 192 / 256). Uses xmm0..xmm2 as scratch. AES-NI instructions are diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiFourCipher_i386.inc b/CryptoLib/src/Include/Simd/Aes/AesNiFourCipher_i386.inc index d1e7f115..17df1858 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiFourCipher_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiFourCipher_i386.inc @@ -7,8 +7,8 @@ // Mode selection: // CRYPTOLIB_AESNI_INOUT defined -> out-of-place (read RIn, write ROut). // undefined -> in-place (read/write state). -// In-place (SimdProc2Begin): ebx = state, esi = keys. -// Out-of-place (SimdProc3Begin, CRYPTOLIB_AESNI_INOUT): ebx = RIn, esi = ROut, edi = keys. +// In-place (ClpSimdProc2Begin): ebx = state, esi = keys. +// Out-of-place (ClpSimdProc3Begin, CRYPTOLIB_AESNI_INOUT): ebx = RIn, esi = ROut, edi = keys. // // In-place must move the keys pointer into the canonical rounds-only // register (edi); the 2-param prologue did not push edi, so it is diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiFourCipher_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/AesNiFourCipher_x86_64.inc index 8f97cda4..ee9b00ab 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiFourCipher_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiFourCipher_x86_64.inc @@ -7,8 +7,8 @@ // Mode selection: // CRYPTOLIB_AESNI_INOUT defined -> out-of-place (read RIn, write ROut). // undefined -> in-place (read/write state). -// In-place (SimdProc2Begin): rcx = state, rdx = keys. -// Out-of-place (SimdProc3Begin, CRYPTOLIB_AESNI_INOUT): rcx = RIn, rdx = ROut, r8 = keys. +// In-place (ClpSimdProc2Begin): rcx = state, rdx = keys. +// Out-of-place (ClpSimdProc3Begin, CRYPTOLIB_AESNI_INOUT): rcx = RIn, rdx = ROut, r8 = keys. // // In-place must move the keys pointer into the canonical rounds-only // register (mov r8, rdx); out-of-place already has keys in r8. diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiOneCipher_i386.inc b/CryptoLib/src/Include/Simd/Aes/AesNiOneCipher_i386.inc index 484cd326..6bec23a1 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiOneCipher_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiOneCipher_i386.inc @@ -7,8 +7,8 @@ // Mode selection: // CRYPTOLIB_AESNI_INOUT defined -> out-of-place (read RIn, write ROut). // undefined -> in-place (read/write state). -// In-place (SimdProc2Begin): ebx = state, esi = keys. -// Out-of-place (SimdProc3Begin, CRYPTOLIB_AESNI_INOUT): ebx = RIn, esi = ROut, edi = keys. +// In-place (ClpSimdProc2Begin): ebx = state, esi = keys. +// Out-of-place (ClpSimdProc3Begin, CRYPTOLIB_AESNI_INOUT): ebx = RIn, esi = ROut, edi = keys. // // In-place must move the keys pointer into the canonical rounds-only // register (edi); the 2-param prologue did not push edi, so it is diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiOneCipher_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/AesNiOneCipher_x86_64.inc index 45f24a1e..2e656424 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiOneCipher_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiOneCipher_x86_64.inc @@ -7,8 +7,8 @@ // Mode selection: // CRYPTOLIB_AESNI_INOUT defined -> out-of-place (read RIn, write ROut). // undefined -> in-place (read/write state). -// In-place (SimdProc2Begin): rcx = state, rdx = keys. -// Out-of-place (SimdProc3Begin, CRYPTOLIB_AESNI_INOUT): rcx = RIn, rdx = ROut, r8 = keys. +// In-place (ClpSimdProc2Begin): rcx = state, rdx = keys. +// Out-of-place (ClpSimdProc3Begin, CRYPTOLIB_AESNI_INOUT): rcx = RIn, rdx = ROut, r8 = keys. // // In-place must move the keys pointer into the canonical rounds-only // register (mov r8, rdx); out-of-place already has keys in r8. diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiPrepareDecryptRoundKeys_i386.inc b/CryptoLib/src/Include/Simd/Aes/AesNiPrepareDecryptRoundKeys_i386.inc index e3a837c3..ba3840d8 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiPrepareDecryptRoundKeys_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiPrepareDecryptRoundKeys_i386.inc @@ -3,7 +3,7 @@ // reverses the order of the N_R + 1 round keys to produce a schedule suitable // for aesdec / aesdeclast during decrypt. // -// Entry (after SimdProc2Begin_i386.inc): ebx = round keys +// Entry (after ClpSimdProc2Begin_i386.inc): ebx = round keys // (16 * (N_R + 1) bytes, in place), esi = NRounds in {10, 12, 14}. // Pushes/pops edi; remaps internally to ecx = keys, ebx = nrounds. // Uses esi / edi / eax / edx as loop counters and scratch, xmm0 / xmm1 for diff --git a/CryptoLib/src/Include/Simd/Aes/AesNiPrepareDecryptRoundKeys_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/AesNiPrepareDecryptRoundKeys_x86_64.inc index 6a9eeab7..716c4345 100644 --- a/CryptoLib/src/Include/Simd/Aes/AesNiPrepareDecryptRoundKeys_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/AesNiPrepareDecryptRoundKeys_x86_64.inc @@ -3,7 +3,7 @@ // reverses the order of the N_R + 1 round keys to produce a schedule suitable // for aesdec / aesdeclast during decrypt. // -// Entry (after SimdProc2Begin_x86_64.inc): rcx = round keys +// Entry (after ClpSimdProc2Begin_x86_64.inc): rcx = round keys // (16 * (N_R + 1) bytes, in place), edx = NRounds in {10, 12, 14}. // Uses r8..r11 / eax as loop counters and scratch, xmm0 / xmm1 for aesimc / // swap. diff --git a/CryptoLib/src/Include/Simd/Aes/Cbc/AesNiCbcEncryptSerial_i386.inc b/CryptoLib/src/Include/Simd/Aes/Cbc/AesNiCbcEncryptSerial_i386.inc index 5edcd989..b64f838f 100644 --- a/CryptoLib/src/Include/Simd/Aes/Cbc/AesNiCbcEncryptSerial_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/Cbc/AesNiCbcEncryptSerial_i386.inc @@ -12,7 +12,7 @@ // i386 has only xmm0..7 (all volatile); the chain uses xmm1. ebx (pushed by the // prologue), esi and edi are callee-saved and restored before return. // -// Entry (after SimdProc1Begin_i386.inc): ebx = pointer to TCbcEncryptFusedCtx. The +// Entry (after ClpSimdProc1Begin_i386.inc): ebx = pointer to TCbcEncryptFusedCtx. The // kernel pushes esi/edi and unpacks the record: // [ebx + 0] InPtr -> esi : input (advances +16 per block) // [ebx + 4] OutPtr -> edx : output (advances +16) diff --git a/CryptoLib/src/Include/Simd/Aes/Cbc/AesNiCbcEncryptSerial_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/Cbc/AesNiCbcEncryptSerial_x86_64.inc index 78e2693c..1dac946e 100644 --- a/CryptoLib/src/Include/Simd/Aes/Cbc/AesNiCbcEncryptSerial_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/Cbc/AesNiCbcEncryptSerial_x86_64.inc @@ -12,7 +12,7 @@ // Every working register (rcx,rdx,r8,r9,r10,r11,xmm0,xmm1) is volatile on the // MS x64 ABI, so this stays a true leaf: no xmm6-15 save, no callee-saved push. // -// Entry (after SimdProc1Begin_x86_64.inc): rcx = pointer to TCbcEncryptFusedCtx. +// Entry (after ClpSimdProc1Begin_x86_64.inc): rcx = pointer to TCbcEncryptFusedCtx. // The kernel unpacks it (InPtr loaded into r11): // [rcx + 0] InPtr -> r11 : input (advances +16 per block) // [rcx + 8] OutPtr -> rdx : output (advances +16) diff --git a/CryptoLib/src/Include/Simd/Aes/Ccm/AesCcmFusedCtrCbcMacTwo_i386.inc b/CryptoLib/src/Include/Simd/Aes/Ccm/AesCcmFusedCtrCbcMacTwo_i386.inc index 3dfeea74..73bb5d92 100644 --- a/CryptoLib/src/Include/Simd/Aes/Ccm/AesCcmFusedCtrCbcMacTwo_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/Ccm/AesCcmFusedCtrCbcMacTwo_i386.inc @@ -17,7 +17,7 @@ // CRYPTOLIB_CCM_DECRYPT -> decrypt variant (MAC lags CTR by 1). // Exactly one of CRYPTOLIB_AESNI_KEY128 / KEY192 / KEY256 selects N_R. // -// On entry (after SimdProc1Begin_i386.inc): ebx = PCtx. +// On entry (after ClpSimdProc1Begin_i386.inc): ebx = PCtx. // // Context layout (7 pointers + 1 NativeUInt = 32 bytes, 4-byte aligned). // See TCcmFusedTwoCtx in ClpAesNiCcmKernel.pas. diff --git a/CryptoLib/src/Include/Simd/Aes/Ccm/AesCcmFusedCtrCbcMacTwo_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/Ccm/AesCcmFusedCtrCbcMacTwo_x86_64.inc index 31925f88..e331afa4 100644 --- a/CryptoLib/src/Include/Simd/Aes/Ccm/AesCcmFusedCtrCbcMacTwo_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/Ccm/AesCcmFusedCtrCbcMacTwo_x86_64.inc @@ -19,7 +19,7 @@ // Pass 1 cold start + Pass 3 trailing MAC). // Exactly one of CRYPTOLIB_AESNI_KEY128 / KEY192 / KEY256 selects N_R. // -// On entry (after SimdProc1Begin_x86_64.inc): rcx = PCtx. +// On entry (after ClpSimdProc1Begin_x86_64.inc): rcx = PCtx. // // Context layout (7 pointers + 1 NativeUInt = 64 bytes, 8-byte aligned). // See TCcmFusedTwoCtx in ClpAesNiCcmKernel.pas. @@ -46,7 +46,7 @@ // AES-NI instructions and xmm8-touching forms are db-encoded for broad // assembler compatibility. -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} mov rax, [rcx + 0] // rax = InPtr mov rdx, [rcx + 8] // rdx = OutPtr mov r8, [rcx + 16] // r8 = Keys (base) @@ -754,5 +754,5 @@ movdqu [r9], xmm6 // CtrState <- updated counter mov r9, [rcx + 32] movdqu [r9], xmm1 // MacState <- final MAC -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/Aes/Ctr/AesNiCtrEight_i386.inc b/CryptoLib/src/Include/Simd/Aes/Ctr/AesNiCtrEight_i386.inc index c9414a2d..fade6bc6 100644 --- a/CryptoLib/src/Include/Simd/Aes/Ctr/AesNiCtrEight_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/Ctr/AesNiCtrEight_i386.inc @@ -10,7 +10,7 @@ // batch - the scalar counter build overlaps the aesenc throughput instead of // serialising ahead of it. // -// Entry (after SimdProc1Begin_i386.inc): ebx = pointer to TCtrFusedCtx. The +// Entry (after ClpSimdProc1Begin_i386.inc): ebx = pointer to TCtrFusedCtx. The // kernel pushes esi/edi and unpacks the record (InPtr loaded into ebx last): // [ebx + 0] InPtr -> ebx : input (advances +128 per 8-block iteration) // [ebx + 4] OutPtr -> esi : output (advances +128) diff --git a/CryptoLib/src/Include/Simd/Aes/Ctr/AesNiCtrEight_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/Ctr/AesNiCtrEight_x86_64.inc index 6c8ba096..ad14023f 100644 --- a/CryptoLib/src/Include/Simd/Aes/Ctr/AesNiCtrEight_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/Ctr/AesNiCtrEight_x86_64.inc @@ -12,7 +12,7 @@ // throughput (vector port) instead of serialising ahead of it. The XOR with // plaintext reuses xmm8 (the round-key scratch) after the final round. // -// Entry (after SimdProc1Begin_x86_64.inc): rcx = pointer to TCtrFusedCtx. The +// Entry (after ClpSimdProc1Begin_x86_64.inc): rcx = pointer to TCtrFusedCtx. The // kernel unpacks it (InPtr loaded into rcx last) into the working registers: // [rcx + 0] InPtr -> rcx : input (advances +128 per 8-block iteration) // [rcx + 8] OutPtr -> rdx : output (advances +128) @@ -37,7 +37,7 @@ // AES-NI instructions and pxor forms touching xmm8 are db-encoded for broad // assembler compatibility. push rbx -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} sub rsp, 128 // next-batch counter scratch: [rsp+0..127] // ---- unpack TCtrFusedCtx (rcx = PCtx); load InPtr into rcx last ---- @@ -408,5 +408,5 @@ mov [r9 + 8], rax add rsp, 128 -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} pop rbx diff --git a/CryptoLib/src/Include/Simd/Aes/Eax/AesEaxFusedCtrOmacTwo_i386.inc b/CryptoLib/src/Include/Simd/Aes/Eax/AesEaxFusedCtrOmacTwo_i386.inc index dc879fc9..22912886 100644 --- a/CryptoLib/src/Include/Simd/Aes/Eax/AesEaxFusedCtrOmacTwo_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/Eax/AesEaxFusedCtrOmacTwo_i386.inc @@ -21,7 +21,7 @@ // CRYPTOLIB_EAX_DECRYPT -> decrypt variant (no MAC lag; 2-wide loop). // Exactly one of CRYPTOLIB_AESNI_KEY128 / KEY192 / KEY256 selects N_R. // -// On entry (after SimdProc1Begin_i386.inc): ebx = PCtx. +// On entry (after ClpSimdProc1Begin_i386.inc): ebx = PCtx. // // Context layout (7 pointers + 1 NativeUInt = 32 bytes, 4-byte aligned). // See TEaxFusedTwoCtx in ClpAesNiEaxKernel.pas. diff --git a/CryptoLib/src/Include/Simd/Aes/Eax/AesEaxFusedCtrOmacTwo_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/Eax/AesEaxFusedCtrOmacTwo_x86_64.inc index 3159ace8..ab5bea5f 100644 --- a/CryptoLib/src/Include/Simd/Aes/Eax/AesEaxFusedCtrOmacTwo_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/Eax/AesEaxFusedCtrOmacTwo_x86_64.inc @@ -22,7 +22,7 @@ // CRYPTOLIB_EAX_DECRYPT -> decrypt variant (no MAC lag; 2-wide loop). // Exactly one of CRYPTOLIB_AESNI_KEY128 / KEY192 / KEY256 selects N_R. // -// On entry (after SimdProc1Begin_x86_64.inc): rcx = PCtx. +// On entry (after ClpSimdProc1Begin_x86_64.inc): rcx = PCtx. // // Context layout (7 pointers + 1 NativeUInt = 64 bytes, 8-byte aligned). // See TEaxFusedTwoCtx in ClpAesNiEaxKernel.pas. @@ -49,7 +49,7 @@ // AES-NI instructions and xmm8-touching forms are db-encoded for broad // assembler compatibility. -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} mov rax, [rcx + 0] // rax = InPtr mov rdx, [rcx + 8] // rdx = OutPtr mov r8, [rcx + 16] // r8 = Keys (base) @@ -755,5 +755,5 @@ movdqu [r9], xmm6 // CtrState <- updated counter mov r9, [rcx + 32] movdqu [r9], xmm1 // OmacState <- final OMAC -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/Aes/Gcm/AesGcmFusedCtrGhashEight_i386.inc b/CryptoLib/src/Include/Simd/Aes/Gcm/AesGcmFusedCtrGhashEight_i386.inc index 3f713aca..7b401a64 100644 --- a/CryptoLib/src/Include/Simd/Aes/Gcm/AesGcmFusedCtrGhashEight_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/Gcm/AesGcmFusedCtrGhashEight_i386.inc @@ -24,7 +24,7 @@ // GCM_FUSED_AES_ROUNDS_12 -> AES-192 (schedule = 13 x 16 bytes). // GCM_FUSED_AES_ROUNDS_14 -> AES-256 (schedule = 15 x 16 bytes). // -// On entry (after SimdProc1Begin_i386.inc): ebx = PCtx. +// On entry (after ClpSimdProc1Begin_i386.inc): ebx = PCtx. // // Context layout (TGcmFusedCtx in ClpAesNiGcmKernel.pas; 4-byte fields). // [ebx + 0] PXorIn : 128-byte input to XOR with keystream (advances) @@ -56,7 +56,7 @@ // instructions are db-encoded for broad assembler compatibility. // ------------------------------------------------------------------- - // --- Callee-save prologue. SimdProc1Begin_i386.inc already pushed ebx + // --- Callee-save prologue. ClpSimdProc1Begin_i386.inc already pushed ebx // and moved PCtx into ebx, so this block only pushes the other // three callee-saved GPRs and reserves the Z / br(PFS) scratch. --- push edi @@ -726,7 +726,7 @@ jnz @@GcmFusedLoop // --- Epilogue: unwind stack scratch and pop callee-saved GPRs. ebx - // is popped last because SimdProc1Begin_i386.inc pushed it first. --- + // is popped last because ClpSimdProc1Begin_i386.inc pushed it first. --- add esp, 64 pop ebp pop esi diff --git a/CryptoLib/src/Include/Simd/Aes/Gcm/AesGcmFusedCtrGhashEight_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/Gcm/AesGcmFusedCtrGhashEight_x86_64.inc index 13c6d9a6..7fa864b7 100644 --- a/CryptoLib/src/Include/Simd/Aes/Gcm/AesGcmFusedCtrGhashEight_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/Gcm/AesGcmFusedCtrGhashEight_x86_64.inc @@ -20,7 +20,7 @@ // GCM_FUSED_AES_ROUNDS_12 -> AES-192 (schedule = 13 x 16 bytes). // GCM_FUSED_AES_ROUNDS_14 -> AES-256 (schedule = 15 x 16 bytes). // -// On entry (after SimdProc1Begin_x86_64.inc): rcx = PCtx. +// On entry (after ClpSimdProc1Begin_x86_64.inc): rcx = PCtx. // // Context layout (TGcmFusedCtx in ClpAesNiGcmKernel.pas; 8-byte fields). // [rcx + 0] PXorIn : 128-byte input to XOR with keystream (advances) @@ -49,7 +49,7 @@ // compatibility. // ------------------------------------------------------------------- -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} // --- Batch loop. The context (rcx) carries advancing PXorIn/POut/PPrevCipher, // the 32-bit GCM counter [rcx+64], the J0 template [rcx+72], the batch // count [rcx+80], and the "GHASH-from-output" flag [rcx+88] (1=encrypt). @@ -588,4 +588,4 @@ dec qword ptr [rcx + 72] // batch count jnz @@GcmFusedLoop mov [rcx + 56], r8d // store advanced counter32 -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/Aes/Ocb/AesOcbFusedWide_i386.inc b/CryptoLib/src/Include/Simd/Aes/Ocb/AesOcbFusedWide_i386.inc index 8ac411f5..01d10874 100644 --- a/CryptoLib/src/Include/Simd/Aes/Ocb/AesOcbFusedWide_i386.inc +++ b/CryptoLib/src/Include/Simd/Aes/Ocb/AesOcbFusedWide_i386.inc @@ -20,7 +20,7 @@ // CRYPTOLIB_AESNI_DECRYPT -> aesdec / aesdeclast; else aesenc / aesenclast. // Exactly one of CRYPTOLIB_AESNI_KEY128 / KEY192 / KEY256 selects N_R. // -// On entry (after SimdProc1Begin_i386.inc): ebx = PCtx. +// On entry (after ClpSimdProc1Begin_i386.inc): ebx = PCtx. // // Context layout (7 pointers + NativeUInt + UInt64 = 40 bytes, 4-byte aligned). // See TOcbFusedKernelCtx in ClpAesNiOcbKernel.pas. @@ -55,7 +55,7 @@ // AES-NI instructions are db-encoded for broad assembler compatibility. // ------------------------------------------------------------------- - // --- Callee-save prologue. SimdProc1Begin_i386.inc already pushed ebx + // --- Callee-save prologue. ClpSimdProc1Begin_i386.inc already pushed ebx // and moved PCtx into ebx, so this block only pushes the other // three callee-saved GPRs and reserves stack scratch. --- push edi @@ -434,7 +434,7 @@ // --- Epilogue: flush accumulators back to memory, then unwind the // stack scratch and pop the callee-saved GPRs. ebx is popped - // last because SimdProc1Begin_i386.inc pushed it first. --- + // last because ClpSimdProc1Begin_i386.inc pushed it first. --- mov eax, [ebx + 12] // eax = OffsetPtr movdqu [eax], xmm4 mov eax, [ebx + 16] // eax = ChecksumPtr diff --git a/CryptoLib/src/Include/Simd/Aes/Ocb/AesOcbFusedWide_x86_64.inc b/CryptoLib/src/Include/Simd/Aes/Ocb/AesOcbFusedWide_x86_64.inc index ae4b95ca..c414e16a 100644 --- a/CryptoLib/src/Include/Simd/Aes/Ocb/AesOcbFusedWide_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Aes/Ocb/AesOcbFusedWide_x86_64.inc @@ -16,7 +16,7 @@ // CRYPTOLIB_AESNI_DECRYPT -> aesdec / aesdeclast; else aesenc / aesenclast. // Exactly one of CRYPTOLIB_AESNI_KEY128 / KEY192 / KEY256 selects N_R. // -// On entry (after SimdProc1Begin_x86_64.inc): rcx = PCtx. +// On entry (after ClpSimdProc1Begin_x86_64.inc): rcx = PCtx. // // Context layout (7 pointers + NativeUInt + UInt64 = 72 bytes, 8-byte aligned). // See TOcbFusedKernelCtx in ClpAesNiOcbKernel.pas. @@ -45,7 +45,7 @@ // movdqa) are db-encoded for broad assembler compatibility. // ------------------------------------------------------------------- -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} // --- Prologue: preserve rbx, reserve 128B aligned stack scratch. --- push rbx // rsp: 8 -> 0 mod 16 sub rsp, 128 // rsp stays 0 mod 16 @@ -627,5 +627,5 @@ add rsp, 128 pop rbx -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulEven_i386.inc b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulEven_i386.inc index 0c660b5c..7872d5ef 100644 --- a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulEven_i386.inc +++ b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulEven_i386.inc @@ -1,5 +1,5 @@ // V128 BinPoly medium multiply, even limb count (i386). -// Entry (after SimdProc4Begin_i386.inc): +// Entry (after ClpSimdProc4Begin_i386.inc): // ebx = ALen (UInt32 limb count, even), esi = PX, edi = PY, eax = PZz. // ZZ is addressed as packed V128 slots (16-byte stride). // diff --git a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulEven_x86_64.inc b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulEven_x86_64.inc index 6e030d9e..a2ee79e9 100644 --- a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulEven_x86_64.inc +++ b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulEven_x86_64.inc @@ -1,5 +1,5 @@ // V128 BinPoly medium multiply, even limb count (x86-64). -// Entry (after SimdProc4Begin_x86_64.inc): +// Entry (after ClpSimdProc4Begin_x86_64.inc): // rcx = ALen (UInt64 limb count, even), rdx = PX, r8 = PY, r9 = PZz. // ZZ is addressed as packed V128 slots (16-byte stride). @@ -11,7 +11,7 @@ push r13 push r14 push r15 -{$I ..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} mov r12, rdx mov r13, r8 @@ -149,7 +149,7 @@ jmp @@BinPolyMulEvenZPosLoop @@BinPolyMulEvenDone: -{$I ..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} pop r15 pop r14 pop r13 diff --git a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulOdd_i386.inc b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulOdd_i386.inc index e649b778..5820ac89 100644 --- a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulOdd_i386.inc +++ b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulOdd_i386.inc @@ -1,5 +1,5 @@ // V128 BinPoly medium multiply, odd limb count (i386). -// Entry (after SimdProc4Begin_i386.inc): +// Entry (after ClpSimdProc4Begin_i386.inc): // ebx = ALen (UInt32 limb count, odd), esi = PX, edi = PY, eax = PZz. // ZZ is addressed as packed V128 slots (16-byte stride). // diff --git a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulOdd_x86_64.inc b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulOdd_x86_64.inc index 6fdb897c..90eb2bcc 100644 --- a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulOdd_x86_64.inc +++ b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulOdd_x86_64.inc @@ -1,5 +1,5 @@ // V128 BinPoly medium multiply, odd limb count (x86-64). -// Entry (after SimdProc4Begin_x86_64.inc): +// Entry (after ClpSimdProc4Begin_x86_64.inc): // rcx = ALen (UInt64 limb count, odd), rdx = PX, r8 = PY, r9 = PZz. // ZZ is addressed as packed V128 slots (16-byte stride). @@ -11,7 +11,7 @@ push r13 push r14 push r15 -{$I ..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} mov r12, rdx mov r13, r8 @@ -190,7 +190,7 @@ jmp @@BinPolyMulOddZPosLoop @@BinPolyMulOddDone: -{$I ..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} pop r15 pop r14 pop r13 diff --git a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulSmall_i386.inc b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulSmall_i386.inc index 9126e10c..0e98501c 100644 --- a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulSmall_i386.inc +++ b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulSmall_i386.inc @@ -1,6 +1,6 @@ // x86/V128 BinPoly fixed-size carryless multiply kernels for limb counts 1..10. // PCLMULQDQ instruction is db-encoded for broad assembler compatibility. -// Included inside BinPolyPclmulImplMulSmall after SimdProc4Begin_i386.inc: +// Included inside BinPolyPclmulImplMulSmall after ClpSimdProc4Begin_i386.inc: // ebx = ALen, esi = PX, edi = PY, eax = PZz // ZZ output: V128 lane k at byte offset 16*k in PZz. diff --git a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulSmall_x86_64.inc b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulSmall_x86_64.inc index 24081f9f..2ffc6d5d 100644 --- a/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulSmall_x86_64.inc +++ b/CryptoLib/src/Include/Simd/BinPoly/BinPolyPclmulImplMulSmall_x86_64.inc @@ -1,12 +1,12 @@ // x86/V128 BinPoly fixed-size carryless multiply kernels for limb counts 1..10. // PCLMULQDQ instruction is db-encoded for broad assembler compatibility. -// Included inside BinPolyPclmulImplMulSmall after SimdProc4Begin_x86_64.inc: +// Included inside BinPolyPclmulImplMulSmall after ClpSimdProc4Begin_x86_64.inc: // rcx = ALen, rdx = PX, r8 = PY, r9 = PZz // ZZ output: V128 lane k at byte offset 16*k in PZz. // Each size case reaches @@BinPolySmallXmmDone via `jmp` (not `ret`) so the // restore of the registers saved here always runs. -{$I ..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} cmp rcx, 1 je @@BinPolySmallSize1 cmp rcx, 2 @@ -2515,5 +2515,5 @@ jmp @@BinPolySmallXmmDone @@BinPolySmallXmmDone: -{$I ..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/ByteXor/ByteXorSse2_i386.inc b/CryptoLib/src/Include/Simd/ByteXor/ByteXorSse2_i386.inc index b0b61ae5..fed0e3d0 100644 --- a/CryptoLib/src/Include/Simd/ByteXor/ByteXorSse2_i386.inc +++ b/CryptoLib/src/Include/Simd/ByteXor/ByteXorSse2_i386.inc @@ -1,8 +1,8 @@ // SSE2 variable-length XOR utility (i386). -// After SimdProc4Begin_i386.inc: ebx = ALen, esi = PX, edi = PY, eax = PZ. +// After ClpSimdProc4Begin_i386.inc: ebx = ALen, esi = PX, edi = PY, eax = PZ. // Computes PZ[i] := PX[i] xor PY[i] for i in [0, ALen). PZ may alias PX or PY. // 16-byte movdqu/pxor chunks, then a byte tail (dl scratch). Callee-saved -// EBX/ESI/EDI are popped in the epilogue below (pushed by SimdProc4Begin_i386). +// EBX/ESI/EDI are popped in the epilogue below (pushed by ClpSimdProc4Begin_i386). // @@ByteXorLoop16: cmp ebx, 16 diff --git a/CryptoLib/src/Include/Simd/ByteXor/ByteXorSse2_x86_64.inc b/CryptoLib/src/Include/Simd/ByteXor/ByteXorSse2_x86_64.inc index 831189e8..b1207627 100644 --- a/CryptoLib/src/Include/Simd/ByteXor/ByteXorSse2_x86_64.inc +++ b/CryptoLib/src/Include/Simd/ByteXor/ByteXorSse2_x86_64.inc @@ -1,5 +1,5 @@ // SSE2 variable-length XOR utility (x86-64). -// After SimdProc4Begin_x86_64.inc: rcx = ALen, rdx = PX, r8 = PY, r9 = PZ. +// After ClpSimdProc4Begin_x86_64.inc: rcx = ALen, rdx = PX, r8 = PY, r9 = PZ. // Computes PZ[i] := PX[i] xor PY[i] for i in [0, ALen). PZ may alias PX or PY. // 16-byte movdqu/pxor chunks, then a byte tail. Uses xmm0, xmm1, al - all // volatile on both ABIs, so no register save is needed (leaf, nostackframe). diff --git a/CryptoLib/src/Include/Simd/ChaCha/ChaCha20BlockSse2_i386.inc b/CryptoLib/src/Include/Simd/ChaCha/ChaCha20BlockSse2_i386.inc index a2fb0c4a..c07ced05 100644 --- a/CryptoLib/src/Include/Simd/ChaCha/ChaCha20BlockSse2_i386.inc +++ b/CryptoLib/src/Include/Simd/ChaCha/ChaCha20BlockSse2_i386.inc @@ -1,5 +1,5 @@ // ChaCha20 one 64B block, SSE2, i386. Keystream only: state in, 64B out to AOut (not ChaCha7539 fused I/O xor). Rounds: ChaChaSse2_DoubleRoundBody.inc. -// After SimdProc3Begin_i386.inc: ebx=ARounds, esi=AIn, edi=AOut. End: add esp, 64; add esp, eax; pop edi; pop esi; pop ebx +// After ClpSimdProc3Begin_i386.inc: ebx=ARounds, esi=AIn, edi=AOut. End: add esp, 64; add esp, eax; pop edi; pop esi; pop ebx mov eax, esp and eax, 15 sub esp, eax diff --git a/CryptoLib/src/Include/Simd/ChaCha/ChaCha20BlockSse2_x86_64.inc b/CryptoLib/src/Include/Simd/ChaCha/ChaCha20BlockSse2_x86_64.inc index 65671f1e..c96f5fb7 100644 --- a/CryptoLib/src/Include/Simd/ChaCha/ChaCha20BlockSse2_x86_64.inc +++ b/CryptoLib/src/Include/Simd/ChaCha/ChaCha20BlockSse2_x86_64.inc @@ -1,6 +1,6 @@ // ChaCha20 one 64B block, SSE2, x86-64. Little-endian state in, 64B keystream out to AOut (keystream-only path, not ChaCha7539 fused I/O xor). // Rounds: ChaChaSse2_DoubleRoundBody.inc. 64B stack copy of state; add initial state; store block to AOut. -// After SimdProc3Begin_x86_64.inc: rcx=ARounds, rdx=AIn (16 UInt32 state), r8=AOut (64B output). +// After ClpSimdProc3Begin_x86_64.inc: rcx=ARounds, rdx=AIn (16 UInt32 state), r8=AOut (64B output). sub rsp, 64 movdqu xmm0, [rdx+0] movdqu xmm1, [rdx+16] diff --git a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Avx2_i386.inc b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Avx2_i386.inc index 30d796b2..647c3305 100644 --- a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Avx2_i386.inc +++ b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Avx2_i386.inc @@ -1,7 +1,7 @@ // ChaCha7539 (IETF) 128B, AVX2, i386. Little-endian state in [esi]; two 32-bit block counters in YMM lanes. // Fused I/O xor: read plaintext at AIn (edi), xor with ChaCha output, write to AOut (eax). // Fragments: ChaCha7539_Avx2_128B_LoadState_i386, ChaCha7539_Avx2_DoubleRound.inc, ChaCha7539_Avx2_128B_XorStore_i386 -// After SimdProc4Begin_i386.inc: ebx=ARounds, esi=AState, edi=AIn, eax=AOut. +// After ClpSimdProc4Begin_i386.inc: ebx=ARounds, esi=AState, edi=AIn, eax=AOut. mov edx, ebx {$I ..\..\Include\Simd\ChaCha\ChaCha7539_Avx2_128B_LoadState_i386.inc} @@chacha7539_avx2_i386_pb2: diff --git a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Avx2_x86_64.inc b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Avx2_x86_64.inc index 815793ee..1fbebd20 100644 --- a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Avx2_x86_64.inc +++ b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Avx2_x86_64.inc @@ -1,7 +1,7 @@ // ChaCha7539 (IETF) 128B, AVX2. Little-endian state in [rdx]; two 32-bit block counters in YMM lanes. // Fused I/O xor: read plaintext at AIn (r8), xor with ChaCha output, write to AOut (r9) — no 128B keystream temp in Pascal; xor in asm (XorStore) after rounds. // Fragments: ChaCha7539_Avx2_128B_LoadState, ChaCha7539_Avx2_DoubleRound.inc (VEX db), ChaCha7539_Avx2_128B_XorStore .inc -// After SimdProc4Begin_x86_64.inc: rcx=ARounds, rdx=AState, r8=AIn, r9=AOut. +// After ClpSimdProc4Begin_x86_64.inc: rcx=ARounds, rdx=AState, r8=AIn, r9=AOut. mov r10, rcx {$I ..\..\Include\Simd\ChaCha\ChaCha7539_Avx2_128B_LoadState_x86_64.inc} @@chacha7539_avx2_dround: diff --git a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Sse2_i386.inc b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Sse2_i386.inc index 4bd1349f..e3641b17 100644 --- a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Sse2_i386.inc +++ b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Sse2_i386.inc @@ -1,6 +1,6 @@ // ChaCha7539 (IETF) 128B, SSE2, i386. Two 64B blocks; little-endian state in [esi]. Rounds: ChaChaSse2_DoubleRoundBody.inc. // Fused I/O xor: read plaintext at AIn (edi), xor with ChaCha output, write to AOut (eax) — no 64B LK/keystream temp in Pascal. -// After SimdProc4Begin_i386.inc: ebx=ARounds, esi=AState (R/W), edi=AIn, eax=AOut. +// After ClpSimdProc4Begin_i386.inc: ebx=ARounds, esi=AState (R/W), edi=AIn, eax=AOut. // ecx: 16B stack realign before each 64B round scratch. edx: copy of ARounds between blocks. Word 12 at [esi+48] +2 per 64B block; wrap 0 -> ChaCha7539RaiseCounter7539. mov edx, ebx // --- block 1 (counter C in memory) --- diff --git a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Sse2_x86_64.inc b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Sse2_x86_64.inc index 6d4d62ad..6965cd10 100644 --- a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Sse2_x86_64.inc +++ b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks2Sse2_x86_64.inc @@ -1,6 +1,6 @@ // ChaCha7539 (IETF) 128B, SSE2. Two 64B blocks; little-endian state in [rdx]. Rounds: ChaChaSse2_DoubleRoundBody.inc. // Fused I/O xor: read plaintext at AIn (r8), xor with ChaCha output, write to AOut (r9) — no 64B LK/keystream temp in Pascal. -// After SimdProc4Begin_x86_64.inc: rcx=ARounds, rdx=AState (R/W, 16 UInt32), r8=AIn, r9=AOut. +// After ClpSimdProc4Begin_x86_64.inc: rcx=ARounds, rdx=AState (R/W, 16 UInt32), r8=AIn, r9=AOut. // Word 12 at [rdx+48] is advanced by 2 (once per 64B block). On 32-bit counter wrap to 0, calls ChaCha7539RaiseCounter7539. mov r11, rcx // --- block 1 (counter C in memory) --- diff --git a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks4Avx2_i386.inc b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks4Avx2_i386.inc index 7b0a757d..8eea7cf1 100644 --- a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks4Avx2_i386.inc +++ b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks4Avx2_i386.inc @@ -1,6 +1,6 @@ // ChaCha7539 (IETF) 256B, AVX2, i386. Two 128B blocks: same fused I/O xor as ProcessBlocks2 (AIn=edi, AOut=eax). // One vzeroupper; add edi/eax,+128 between blocks. LoadState .inc reloads IETF state at [esi] (word 12 already advanced after block 1). -// After SimdProc4Begin_i386.inc: ebx=ARounds, esi=AState, edi=AIn, eax=AOut. +// After ClpSimdProc4Begin_i386.inc: ebx=ARounds, esi=AState, edi=AIn, eax=AOut. mov edx, ebx // --- first 128B --- {$I ..\..\Include\Simd\ChaCha\ChaCha7539_Avx2_128B_LoadState_i386.inc} diff --git a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks4Avx2_x86_64.inc b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks4Avx2_x86_64.inc index fb1129ad..e2a9a728 100644 --- a/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks4Avx2_x86_64.inc +++ b/CryptoLib/src/Include/Simd/ChaCha/ChaCha7539ProcessBlocks4Avx2_x86_64.inc @@ -1,6 +1,6 @@ // ChaCha7539 (IETF) 256B, AVX2. Two 128B blocks: same fused I/O xor as ProcessBlocks2 (AIn=r8, AOut=r9; no large keystream temp in Pascal). // One vzeroupper; add r8/r9,+128 between blocks. LoadState .inc reloads IETF state at [rdx] (word 12 already advanced after block 1). -// After SimdProc4Begin_x86_64.inc: rcx=ARounds, rdx=AState, r8=AIn, r9=AOut. +// After ClpSimdProc4Begin_x86_64.inc: rcx=ARounds, rdx=AState, r8=AIn, r9=AOut. mov r10, rcx // --- first 128B --- {$I ..\..\Include\Simd\ChaCha\ChaCha7539_Avx2_128B_LoadState_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/Common/SimdNonVolatileRestore_x86_64.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdNonVolatileRestore_x86_64.inc similarity index 74% rename from CryptoLib/src/Include/Simd/Common/SimdNonVolatileRestore_x86_64.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdNonVolatileRestore_x86_64.inc index aa26f908..ace06b77 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdNonVolatileRestore_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdNonVolatileRestore_x86_64.inc @@ -1,7 +1,7 @@ -// Shared nonvolatile-XMM restore (x86-64). Mirror of SimdNonVolatileSave_x86_64.inc: +// Shared nonvolatile-XMM restore (x86-64). Mirror of ClpSimdNonVolatileSave_x86_64.inc: // restores xmm6..xmm15 and frees the 160-byte save frame. Include it at the // kernel's restore point (after the last use of xmm6..15, before returning), in -// any procedure that included SimdNonVolatileSave_x86_64.inc. No-op on SysV x86-64. +// any procedure that included ClpSimdNonVolatileSave_x86_64.inc. No-op on SysV x86-64. {$IFNDEF CRYPTOLIB_SYSV_X64_ABI} movups xmm6, [rsp] movups xmm7, [rsp + 16] diff --git a/CryptoLib/src/Include/Simd/Common/SimdNonVolatileSave_x86_64.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdNonVolatileSave_x86_64.inc similarity index 93% rename from CryptoLib/src/Include/Simd/Common/SimdNonVolatileSave_x86_64.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdNonVolatileSave_x86_64.inc index 2ed97b1a..93a061ea 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdNonVolatileSave_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdNonVolatileSave_x86_64.inc @@ -1,6 +1,6 @@ // Shared nonvolatile-XMM save (x86-64). Opt-in by inclusion: a kernel that uses // any of xmm6..xmm15 includes this at its save point (before it first writes -// those registers), and the matching SimdNonVolatileRestore_x86_64.inc at its restore +// those registers), and the matching ClpSimdNonVolatileRestore_x86_64.inc at its restore // point (after the last use, before returning). Light kernels that touch only // xmm0..xmm5 do NOT include it. // diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc1Begin_i386.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc1Begin_i386.inc similarity index 87% rename from CryptoLib/src/Include/Simd/Common/SimdProc1Begin_i386.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc1Begin_i386.inc index 2f0f3c43..743cfb4f 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc1Begin_i386.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc1Begin_i386.inc @@ -4,7 +4,7 @@ // Bodies must end with: pop ebx before the Pascal 'end' (which emits ret). // Usage: // procedure MyProc(P1: Pointer); -// {$I ..\..\Include\Simd\Common\SimdProc1Begin_i386.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc1Begin_i386.inc} // // ... SIMD instructions using ebx ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc1Begin_x86_64.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc1Begin_x86_64.inc similarity index 85% rename from CryptoLib/src/Include/Simd/Common/SimdProc1Begin_x86_64.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc1Begin_x86_64.inc index 7fde8957..2a4fcd4a 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc1Begin_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc1Begin_x86_64.inc @@ -3,7 +3,7 @@ // When CRYPTOLIB_SYSV_X64_ABI is defined, remaps rdi -> rcx. // Usage: // procedure MyProc(P1: Pointer); -// {$I ..\..\Include\Simd\Common\SimdProc1Begin_x86_64.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc1Begin_x86_64.inc} // // ... instructions using rcx ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc2Begin_i386.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc2Begin_i386.inc similarity index 86% rename from CryptoLib/src/Include/Simd/Common/SimdProc2Begin_i386.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc2Begin_i386.inc index 9d358879..bddcbf32 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc2Begin_i386.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc2Begin_i386.inc @@ -3,7 +3,7 @@ // Callee-saved EBX, ESI - epilogue must pop ESI, EBX. // Usage: // procedure MyProc(P1, P2: Pointer); -// {$I ..\..\Include\Simd\Common\SimdProc2Begin_i386.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_i386.inc} // // ... SIMD instructions using ebx, esi ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc2Begin_x86_64.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc2Begin_x86_64.inc similarity index 87% rename from CryptoLib/src/Include/Simd/Common/SimdProc2Begin_x86_64.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc2Begin_x86_64.inc index ac2d9b4f..7f1238ab 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc2Begin_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc2Begin_x86_64.inc @@ -3,7 +3,7 @@ // When CRYPTOLIB_SYSV_X64_ABI is defined, remaps rdi, rsi -> rcx, rdx. // Usage: // procedure MyProc(P1, P2: Pointer); -// {$I ..\..\Include\Simd\Common\SimdProc2Begin_x86_64.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc2Begin_x86_64.inc} // // ... instructions using rcx, rdx ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc3Begin_i386.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc3Begin_i386.inc similarity index 88% rename from CryptoLib/src/Include/Simd/Common/SimdProc3Begin_i386.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc3Begin_i386.inc index 025ff877..b4e2738d 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc3Begin_i386.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc3Begin_i386.inc @@ -3,7 +3,7 @@ // Callee-saved EBX, ESI, EDI - epilogue must pop EDI, ESI, EBX. // Usage: // procedure MyProc(P1, P2, P3: Pointer); -// {$I ..\..\Include\Simd\Common\SimdProc3Begin_i386.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_i386.inc} // // ... SIMD instructions using ebx, esi, edi ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc3Begin_x86_64.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc3Begin_x86_64.inc similarity index 89% rename from CryptoLib/src/Include/Simd/Common/SimdProc3Begin_x86_64.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc3Begin_x86_64.inc index 8569cda3..52142b20 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc3Begin_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc3Begin_x86_64.inc @@ -4,7 +4,7 @@ // Move order avoids register clobbering: save rdx before overwriting. // Usage: // procedure MyProc(P1, P2, P3: Pointer); -// {$I ..\..\Include\Simd\Common\SimdProc3Begin_x86_64.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc3Begin_x86_64.inc} // // ... instructions using rcx, rdx, r8 ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc4Begin_i386.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc4Begin_i386.inc similarity index 93% rename from CryptoLib/src/Include/Simd/Common/SimdProc4Begin_i386.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc4Begin_i386.inc index 7ab54d5d..61bd5795 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc4Begin_i386.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc4Begin_i386.inc @@ -7,7 +7,7 @@ // the EBX push but before the ESI / EDI pushes (see asm). // Usage: // procedure MyProc(P1, P2, P3: Pointer; P4: Int32); -// {$I ..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} // // ... SIMD instructions using ebx, esi, edi, eax ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc4Begin_x86_64.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc4Begin_x86_64.inc similarity index 90% rename from CryptoLib/src/Include/Simd/Common/SimdProc4Begin_x86_64.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc4Begin_x86_64.inc index 120c1b1c..0b8177a0 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc4Begin_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc4Begin_x86_64.inc @@ -5,7 +5,7 @@ // Move order avoids register clobbering: save rcx and rdx first. // Usage: // procedure MyProc(P1, P2, P3: Pointer; P4: Int32); -// {$I ..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} // // ... instructions using rcx, rdx, r8, r9 ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc5Begin_i386.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc5Begin_i386.inc similarity index 94% rename from CryptoLib/src/Include/Simd/Common/SimdProc5Begin_i386.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc5Begin_i386.inc index 1e23d49f..20b353f2 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc5Begin_i386.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc5Begin_i386.inc @@ -6,7 +6,7 @@ // Callee-saved EBX, ESI, EDI - epilogue must pop EDI, ESI, EBX. // Usage: // procedure MyProc(P1, P2: Pointer; P3, P4: Int32; P5: Pointer); -// {$I ..\..\Include\Simd\Common\SimdProc5Begin_i386.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc5Begin_i386.inc} // // ... SIMD instructions using ebx, esi, edi, eax, ecx ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc5Begin_x86_64.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc5Begin_x86_64.inc similarity index 91% rename from CryptoLib/src/Include/Simd/Common/SimdProc5Begin_x86_64.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc5Begin_x86_64.inc index 5341c7ab..410bb4a8 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc5Begin_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc5Begin_x86_64.inc @@ -5,7 +5,7 @@ // On MS x64, param5 is loaded from [rsp+40] (above 32-byte shadow space + 8-byte return addr). // Usage: // procedure MyProc(P1, P2: Pointer; P3, P4: Int32; P5: Pointer); -// {$I ..\..\Include\Simd\Common\SimdProc5Begin_x86_64.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc5Begin_x86_64.inc} // // ... instructions using rcx, rdx, r8, r9, r10 ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc6Begin_i386.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc6Begin_i386.inc similarity index 95% rename from CryptoLib/src/Include/Simd/Common/SimdProc6Begin_i386.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc6Begin_i386.inc index 79d64663..301f663d 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc6Begin_i386.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc6Begin_i386.inc @@ -7,7 +7,7 @@ // Callee-saved EBX, ESI, EDI - epilogue must pop EDI, ESI, EBX; SIMD bodies may adjust ESP for locals. // Usage: // procedure MyProc(P1, P2, P3: Pointer; P4: Int32; P5: UInt64; P6: UInt32); -// {$I ..\..\Include\Simd\Common\SimdProc6Begin_i386.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc6Begin_i386.inc} // // ... SIMD instructions using ebx, esi, edi, eax, ecx, edx (load param6 from stack if needed) ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/Common/SimdProc6Begin_x86_64.inc b/CryptoLib/src/Include/Simd/Common/ClpSimdProc6Begin_x86_64.inc similarity index 92% rename from CryptoLib/src/Include/Simd/Common/SimdProc6Begin_x86_64.inc rename to CryptoLib/src/Include/Simd/Common/ClpSimdProc6Begin_x86_64.inc index 3130421a..87dd518e 100644 --- a/CryptoLib/src/Include/Simd/Common/SimdProc6Begin_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Common/ClpSimdProc6Begin_x86_64.inc @@ -6,7 +6,7 @@ // On MS x64, param5/6 are loaded from [rsp+40]/[rsp+48] (above shadow space + return addr). // Usage: // procedure MyProc(P1, P2, P3: Pointer; P4: Int32; P5: UInt64; P6: UInt32); -// {$I ..\..\Include\Simd\Common\SimdProc6Begin_x86_64.inc} +// {$I ..\..\Include\Simd\Common\ClpSimdProc6Begin_x86_64.inc} // // ... SIMD instructions using rcx, rdx, r8, r9, r10, r11 ... // end; {$IFDEF FPC} diff --git a/CryptoLib/src/Include/Simd/CpuFeatures/CpuIdQuery.inc b/CryptoLib/src/Include/Simd/CpuFeatures/ClpCpuIdQuery.inc similarity index 100% rename from CryptoLib/src/Include/Simd/CpuFeatures/CpuIdQuery.inc rename to CryptoLib/src/Include/Simd/CpuFeatures/ClpCpuIdQuery.inc diff --git a/CryptoLib/src/Include/Simd/CpuFeatures/XGetBvQuery.inc b/CryptoLib/src/Include/Simd/CpuFeatures/ClpXGetBvQuery.inc similarity index 100% rename from CryptoLib/src/Include/Simd/CpuFeatures/XGetBvQuery.inc rename to CryptoLib/src/Include/Simd/CpuFeatures/ClpXGetBvQuery.inc diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmBlockReverse128Ssse3_i386.inc b/CryptoLib/src/Include/Simd/Gcm/GcmBlockReverse128Ssse3_i386.inc index 0482b255..cafd7ed3 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmBlockReverse128Ssse3_i386.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmBlockReverse128Ssse3_i386.inc @@ -1,5 +1,5 @@ // SSSE3 16-byte byte-reverse utility (i386). -// After SimdProc3Begin_i386.inc: ebx = PDst, esi = PSrc, edi = PShuffleCtrl. +// After ClpSimdProc3Begin_i386.inc: ebx = PDst, esi = PSrc, edi = PShuffleCtrl. // Computes [ebx] := pshufb([esi], [edi]). // Uses xmm0 (data) and xmm1 (control). // diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmBlockReverse128Ssse3_x86_64.inc b/CryptoLib/src/Include/Simd/Gcm/GcmBlockReverse128Ssse3_x86_64.inc index d178403e..31210ce9 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmBlockReverse128Ssse3_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmBlockReverse128Ssse3_x86_64.inc @@ -1,5 +1,5 @@ // SSSE3 16-byte byte-reverse utility (x86-64). -// After SimdProc3Begin_x86_64.inc: rcx = PDst, rdx = PSrc, r8 = PShuffleCtrl. +// After ClpSimdProc3Begin_x86_64.inc: rcx = PDst, rdx = PSrc, r8 = PShuffleCtrl. // Computes [rcx] := pshufb([rdx], [r8]). // Uses xmm0 (data) and xmm1 (control). // diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmGhashFull_i386.inc b/CryptoLib/src/Include/Simd/Gcm/GcmGhashFull_i386.inc index 6ddb692d..fa5b49ed 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmGhashFull_i386.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmGhashFull_i386.inc @@ -21,7 +21,7 @@ // still byte-reversed. Unset for GCM (canonical // input), leaving that path byte-identical. // -// On entry (after SimdProc4Begin_i386.inc): +// On entry (after ClpSimdProc4Begin_i386.inc): // ebx = PFS (16-byte running GHASH state, canonical; in/out) // esi = PC0 (64 or 128 bytes data; canonical, or field form with RAW_INPUT) // edi = PHPow (H^N..H^1 as 16-byte limbs, field form) diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmGhashFull_x86_64.inc b/CryptoLib/src/Include/Simd/Gcm/GcmGhashFull_x86_64.inc index f263a76f..8a88bd6e 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmGhashFull_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmGhashFull_x86_64.inc @@ -22,7 +22,7 @@ // still byte-reversed. Unset for GCM (canonical // input), leaving that path byte-identical. // -// On entry (after SimdProc4Begin_x86_64.inc): +// On entry (after ClpSimdProc4Begin_x86_64.inc): // rcx = PFS (16-byte running GHASH state, canonical; in/out) // rdx = PC0 (64 or 128 bytes data; canonical, or field form with RAW_INPUT) // r8 = PHPow (H^N..H^1 as 16-byte limbs, field form) @@ -37,7 +37,7 @@ // // PCLMULQDQ instructions are db-encoded for broad assembler compatibility. // -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} movdqu xmm8, [r9] pxor xmm0, xmm0 pxor xmm1, xmm1 @@ -271,4 +271,4 @@ // Byte-reverse to canonical form and store to PFS. pshufb xmm0, xmm8 movdqu [rcx], xmm0 -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmPclmulMultiplyExt_i386.inc b/CryptoLib/src/Include/Simd/Gcm/GcmPclmulMultiplyExt_i386.inc index 7ee637fe..8e2ca75b 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmPclmulMultiplyExt_i386.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmPclmulMultiplyExt_i386.inc @@ -1,7 +1,7 @@ // SSE2 + PCLMULQDQ Karatsuba-style carryless multiply without reduction (i386). // MultiplyExt: Z0, Z1, Z2 only (no Z1 merge / reduction). Operands are 16-byte // limbs, LE UInt64 pair each. -// After SimdProc3Begin_i386.inc: ebx = PX, esi = PY, edi = POut +// After ClpSimdProc3Begin_i386.inc: ebx = PX, esi = PY, edi = POut // (48 bytes: Z0, Z1, Z2). // PCLMULQDQ instructions are db-encoded for broad assembler compatibility. // diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmPclmulMultiplyExt_x86_64.inc b/CryptoLib/src/Include/Simd/Gcm/GcmPclmulMultiplyExt_x86_64.inc index 7ca95492..96f87374 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmPclmulMultiplyExt_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmPclmulMultiplyExt_x86_64.inc @@ -1,7 +1,7 @@ // SSE2 + PCLMULQDQ Karatsuba-style carryless multiply without reduction (x86-64). // MultiplyExt: Z0, Z1, Z2 only (no Z1 merge / reduction). Operands are 16-byte // limbs, LE UInt64 pair each. -// After SimdProc3Begin_x86_64.inc: rcx = PX, rdx = PY, r8 = POut +// After ClpSimdProc3Begin_x86_64.inc: rcx = PX, rdx = PY, r8 = POut // (48 bytes: Z0, Z1, Z2). // PCLMULQDQ instructions are db-encoded for broad assembler compatibility. // diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmPclmulPartial_i386.inc b/CryptoLib/src/Include/Simd/Gcm/GcmPclmulPartial_i386.inc index 9688689f..77f58a7f 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmPclmulPartial_i386.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmPclmulPartial_i386.inc @@ -1,12 +1,12 @@ // SSE2 + PCLMULQDQ GHASH field multiply, partial carryless product (i386). // Produces the 256-bit Karatsuba partial product (Z0, Z1, Z2) for two GHASH // field elements before degree reduction. -// After SimdProc3Begin_i386.inc: ebx = @X (TFieldElement), esi = @Y, +// After ClpSimdProc3Begin_i386.inc: ebx = @X (TFieldElement), esi = @Y, // edi = @TGcmPartial128 output. // X.N0, X.N1 and Y.N0, Y.N1 are UInt64 GHASH field limbs (TFieldElement). // Pack each limb into xmm as high qword then low (movq + punpcklqdq); // little-endian 128-bit layout. -// Epilogue: pop edi, esi, ebx (matches SimdProc3Begin_i386.inc pushes). +// Epilogue: pop edi, esi, ebx (matches ClpSimdProc3Begin_i386.inc pushes). // PCLMULQDQ instructions are db-encoded for broad assembler compatibility. // movq xmm0, qword ptr [ebx + 8] diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmPclmulPartial_x86_64.inc b/CryptoLib/src/Include/Simd/Gcm/GcmPclmulPartial_x86_64.inc index c88ba408..87d31ace 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmPclmulPartial_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmPclmulPartial_x86_64.inc @@ -1,7 +1,7 @@ // SSE2 + PCLMULQDQ GHASH field multiply, partial carryless product (x86-64). // Produces the 256-bit Karatsuba partial product (Z0, Z1, Z2) for two GHASH // field elements before degree reduction. -// After SimdProc3Begin_x86_64.inc: rcx = @X (TFieldElement), rdx = @Y, +// After ClpSimdProc3Begin_x86_64.inc: rcx = @X (TFieldElement), rdx = @Y, // r8 = @TGcmPartial128 output. // X.N0, X.N1 and Y.N0, Y.N1 are UInt64 GHASH field limbs (TFieldElement). // Pack each limb into xmm as high qword then low (movq + punpcklqdq); diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmReduce3FoldSse2_i386.inc b/CryptoLib/src/Include/Simd/Gcm/GcmReduce3FoldSse2_i386.inc index 1ca464e5..82043dc1 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmReduce3FoldSse2_i386.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmReduce3FoldSse2_i386.inc @@ -3,7 +3,7 @@ // polynomial x^128 + x^7 + x^2 + x + 1, writing the resulting 16-byte field // element to POut. Z0/Z1/Z2 are the three 128-bit limbs carried across a batch // of Karatsuba-style PCLMULQDQ GHASH products. -// After SimdProc4Begin_i386.inc: ebx = PZ0, esi = PZ1, edi = PZ2, eax = POut. +// After ClpSimdProc4Begin_i386.inc: ebx = PZ0, esi = PZ1, edi = PZ2, eax = POut. // movdqu xmm0, [ebx] movdqu xmm2, [edi] diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmReduce3FoldSse2_x86_64.inc b/CryptoLib/src/Include/Simd/Gcm/GcmReduce3FoldSse2_x86_64.inc index 77c0c3f5..ca1a6885 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmReduce3FoldSse2_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmReduce3FoldSse2_x86_64.inc @@ -3,9 +3,9 @@ // polynomial x^128 + x^7 + x^2 + x + 1, writing the resulting 16-byte field // element to POut. Z0/Z1/Z2 are the three 128-bit limbs carried across a batch // of Karatsuba-style PCLMULQDQ GHASH products. -// After SimdProc4Begin_x86_64.inc: rcx = PZ0, rdx = PZ1, r8 = PZ2, r9 = POut. +// After ClpSimdProc4Begin_x86_64.inc: rcx = PZ0, rdx = PZ1, r8 = PZ2, r9 = POut. // -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} movdqu xmm0, [rcx] movdqu xmm2, [r8] movdqu xmm1, [rdx] @@ -74,4 +74,4 @@ pxor xmm7, xmm2 movq qword ptr [r9], xmm7 movq qword ptr [r9 + 8], xmm6 -{$I ..\..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmXorMultiplyExtLimbs48Sse2_i386.inc b/CryptoLib/src/Include/Simd/Gcm/GcmXorMultiplyExtLimbs48Sse2_i386.inc index 5db1eeea..954fc1de 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmXorMultiplyExtLimbs48Sse2_i386.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmXorMultiplyExtLimbs48Sse2_i386.inc @@ -1,7 +1,7 @@ // SSE2 48-byte 3-limb XOR utility (i386). // Xor 16-byte limbs in place: [ebx] ^= [eax + 0], [esi] ^= [eax + 16], // [edi] ^= [eax + 32]. Unaligned movdqu (stack buffers may be misaligned). -// After SimdProc4Begin_i386.inc: ebx = PA0, esi = PA1, edi = PA2, eax = PSrc48. +// After ClpSimdProc4Begin_i386.inc: ebx = PA0, esi = PA1, edi = PA2, eax = PSrc48. // Uses xmm0, xmm1. // movdqu xmm0, [ebx] diff --git a/CryptoLib/src/Include/Simd/Gcm/GcmXorMultiplyExtLimbs48Sse2_x86_64.inc b/CryptoLib/src/Include/Simd/Gcm/GcmXorMultiplyExtLimbs48Sse2_x86_64.inc index 1f559571..bb05e8d3 100644 --- a/CryptoLib/src/Include/Simd/Gcm/GcmXorMultiplyExtLimbs48Sse2_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Gcm/GcmXorMultiplyExtLimbs48Sse2_x86_64.inc @@ -1,7 +1,7 @@ // SSE2 48-byte 3-limb XOR utility (x86-64). // Xor 16-byte limbs in place: *PA0 ^= PSrc[0..15], *PA1 ^= PSrc[16..31], // *PA2 ^= PSrc[32..47]. Unaligned movdqu (stack buffers may be misaligned). -// After SimdProc4Begin_x86_64.inc: rcx = PA0, rdx = PA1, r8 = PA2, r9 = PSrc48. +// After ClpSimdProc4Begin_x86_64.inc: rcx = PA0, rdx = PA1, r8 = PA2, r9 = PSrc48. // Uses xmm0, xmm1. // movdqu xmm0, [rcx] diff --git a/CryptoLib/src/Include/Simd/Poly1305/Poly1305BlocksBulkAvx2Core_i386.inc b/CryptoLib/src/Include/Simd/Poly1305/Poly1305BlocksBulkAvx2Core_i386.inc index 28dd5f09..851e1b50 100644 --- a/CryptoLib/src/Include/Simd/Poly1305/Poly1305BlocksBulkAvx2Core_i386.inc +++ b/CryptoLib/src/Include/Simd/Poly1305/Poly1305BlocksBulkAvx2Core_i386.inc @@ -15,7 +15,7 @@ // sibling - only the base register names change to match the i386 // argument map. // -// On entry (after SimdProc5Begin_i386.inc): +// On entry (after ClpSimdProc5Begin_i386.inc): // ebx = ACtx (PTPoly1305State; 72-byte R/S/H/K record) // esi = APowTable (PByte; 320-byte 10x8 power table; layout below) // edi = AInp (PByte) diff --git a/CryptoLib/src/Include/Simd/Poly1305/Poly1305BlocksBulkAvx2Core_x86_64.inc b/CryptoLib/src/Include/Simd/Poly1305/Poly1305BlocksBulkAvx2Core_x86_64.inc index ee774ea5..dd2429b6 100644 --- a/CryptoLib/src/Include/Simd/Poly1305/Poly1305BlocksBulkAvx2Core_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Poly1305/Poly1305BlocksBulkAvx2Core_x86_64.inc @@ -17,7 +17,7 @@ // include shares the same algorithm but uses a different register mapping // (ebx/esi/edi/eax instead of rcx/rdx/r8/r9) and stays inside ymm0..ymm7. // -// On entry (after SimdProc5Begin_x86_64.inc): +// On entry (after ClpSimdProc5Begin_x86_64.inc): // rcx = ACtx (PTPoly1305State; 72-byte R/S/H/K record) // rdx = APowTable (PByte; 320-byte 10x8 power table; layout below) // r8 = AInp (PByte; 16-byte aligned-or-not) @@ -41,7 +41,7 @@ // ymm6 : padbit (0x1000000 per 64-bit lane low half) // ymm7..ymm15: D0..D4 / M0..M4 / scratch (transient) // -{$I ..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} // ---- Prologue: build mask26 (ymm5) and padbit (ymm6) constants ---- db $C5, $D5, $76, $ED // vpcmpeqd ymm5, ymm5, ymm5 db $C5, $D5, $73, $D5, $26 // vpsrlq ymm5, ymm5, 38 ; mask26 = 0x3FFFFFF per lane @@ -329,4 +329,4 @@ db $C5, $F8, $77 // vzeroupper // restore caller xmm6..15 (legacy SSE moves are safe after vzeroupper) -{$I ..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/Salsa/Salsa20BlockSse41_i386.inc b/CryptoLib/src/Include/Simd/Salsa/Salsa20BlockSse41_i386.inc index 2a97c329..f20ccbb2 100644 --- a/CryptoLib/src/Include/Simd/Salsa/Salsa20BlockSse41_i386.inc +++ b/CryptoLib/src/Include/Simd/Salsa/Salsa20BlockSse41_i386.inc @@ -1,4 +1,4 @@ -// Salsa20 block, SSE4.1 (pblendw). After SimdProc3Begin_i386.inc: ebx = ARounds, esi = AIn, edi = AOut. +// Salsa20 block, SSE4.1 (pblendw). After ClpSimdProc3Begin_i386.inc: ebx = ARounds, esi = AIn, edi = AOut. // Rounds: Salsa20Sse41_TwoColumnRoundsBody.inc. // End with: add esp, 512; pop edi; pop esi; pop ebx sub esp, 512 diff --git a/CryptoLib/src/Include/Simd/Salsa/Salsa20BlockSse41_x86_64.inc b/CryptoLib/src/Include/Simd/Salsa/Salsa20BlockSse41_x86_64.inc index 6d378171..30881bfa 100644 --- a/CryptoLib/src/Include/Simd/Salsa/Salsa20BlockSse41_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Salsa/Salsa20BlockSse41_x86_64.inc @@ -1,8 +1,8 @@ // Salsa20 one 16*UInt32 block: LE state in, LE state+input out, SSE4.1 (pblendw) + SSSE3 (pshufd) + SSE2. // 4-lane quarter rounds; UInt16 interleave and pack/unpack via pblendw. // Rounds: Salsa20Sse41_TwoColumnRoundsBody.inc. -// After SimdProc3Begin_x86_64.inc: rcx = ARounds, rdx = AIn (16 UInt32), r8 = AOut (16 UInt32). -{$I ..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +// After ClpSimdProc3Begin_x86_64.inc: rcx = ARounds, rdx = AIn (16 UInt32), r8 = AOut (16 UInt32). +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} sub rsp, 512 mov r9, rcx { -- expand 4*4 dwords to 4*8 u16 in [rsp+0] } @@ -180,4 +180,4 @@ mov eax, [rsp+316] mov [r8+60], eax add rsp, 512 -{$I ..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Include/Simd/Salsa/Salsa20ProcessBlocks2Sse41_i386.inc b/CryptoLib/src/Include/Simd/Salsa/Salsa20ProcessBlocks2Sse41_i386.inc index b2144ab1..6692a9f3 100644 --- a/CryptoLib/src/Include/Simd/Salsa/Salsa20ProcessBlocks2Sse41_i386.inc +++ b/CryptoLib/src/Include/Simd/Salsa/Salsa20ProcessBlocks2Sse41_i386.inc @@ -1,4 +1,4 @@ -// Salsa20 128B, SSE4.1 i386. After SimdProc4Begin: ebx=ARounds, esi=AState, edi=AIn, eax=AOut. +// Salsa20 128B, SSE4.1 i386. After ClpSimdProc4Begin: ebx=ARounds, esi=AState, edi=AIn, eax=AOut. // Rounds: Salsa20Sse41_TwoColumnRoundsBody.inc. // edx: saved ARounds. push eax/ pop eax: expand clobbers eax; xor needs AOut in eax. mov edx, ebx diff --git a/CryptoLib/src/Include/Simd/Salsa/Salsa20ProcessBlocks2Sse41_x86_64.inc b/CryptoLib/src/Include/Simd/Salsa/Salsa20ProcessBlocks2Sse41_x86_64.inc index efe2ae0b..40b81953 100644 --- a/CryptoLib/src/Include/Simd/Salsa/Salsa20ProcessBlocks2Sse41_x86_64.inc +++ b/CryptoLib/src/Include/Simd/Salsa/Salsa20ProcessBlocks2Sse41_x86_64.inc @@ -1,8 +1,8 @@ // Salsa20 128B, SSE4.1: two 64B blocks, fused I/O (xor) like ChaCha7539ProcessBlocks2Sse2. // Rounds: Salsa20Sse41_TwoColumnRoundsBody.inc. -// After SimdProc4Begin_x86_64.inc: rcx=ARounds, rdx=AState, r8=AIn (plain), r9=AOut (cipher). +// After ClpSimdProc4Begin_x86_64.inc: rcx=ARounds, rdx=AState, r8=AIn (plain), r9=AOut (cipher). // r10 = round counter per block. Advance counter: FEngineState[8]@[rdx+32], FEngineState[9]@[rdx+36]. -{$I ..\..\Include\Simd\Common\SimdNonVolatileSave_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileSave_x86_64.inc} { -------- block 1 (64B) -------- } sub rsp, 512 mov r10, rcx @@ -407,4 +407,4 @@ jnz @@s2p2_x64_c2d add dword [rdx+36], 1 @@s2p2_x64_c2d: -{$I ..\..\Include\Simd\Common\SimdNonVolatileRestore_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdNonVolatileRestore_x86_64.inc} diff --git a/CryptoLib/src/Math/BinPoly/ClpBinPolyX86V128Kernels.pas b/CryptoLib/src/Math/BinPoly/ClpBinPolyX86V128Kernels.pas index e2434a00..52794b81 100644 --- a/CryptoLib/src/Math/BinPoly/ClpBinPolyX86V128Kernels.pas +++ b/CryptoLib/src/Math/BinPoly/ClpBinPolyX86V128Kernels.pas @@ -47,33 +47,33 @@ implementation {$IFDEF CRYPTOLIB_X86_SIMD} procedure BinPolyPclmulImplMulSmall(ALen: Int32; PX, PY, PZz: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\Include\Simd\BinPoly\BinPolyPclmulImplMulSmall_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\Include\Simd\BinPoly\BinPolyPclmulImplMulSmall_i386.inc} {$ENDIF} end; procedure BinPolyPclmulImplMulEven(ALen: Int32; PX, PY, PZz: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\Include\Simd\BinPoly\BinPolyPclmulImplMulEven_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\Include\Simd\BinPoly\BinPolyPclmulImplMulEven_i386.inc} {$ENDIF} end; procedure BinPolyPclmulImplMulOdd(ALen: Int32; PX, PY, PZz: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\..\Include\Simd\BinPoly\BinPolyPclmulImplMulOdd_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\..\Include\Simd\BinPoly\BinPolyPclmulImplMulOdd_i386.inc} {$ENDIF} end; diff --git a/CryptoLib/src/Misc/ClpX86SimdFeatures.pas b/CryptoLib/src/Misc/ClpX86SimdFeatures.pas index 21de27b0..b7d9fad0 100644 --- a/CryptoLib/src/Misc/ClpX86SimdFeatures.pas +++ b/CryptoLib/src/Misc/ClpX86SimdFeatures.pas @@ -90,11 +90,11 @@ TCpuIdResult = record {$IFDEF CRYPTOLIB_X86_SIMD} procedure CpuIdQuery(ALeaf, ASubLeaf: UInt32; out AResult: TCpuIdResult); - {$I ..\Include\Simd\CpuFeatures\CpuIdQuery.inc} + {$I ..\Include\Simd\CpuFeatures\ClpCpuIdQuery.inc} end; procedure XGetBvQuery(out AResult: UInt64); - {$I ..\Include\Simd\CpuFeatures\XGetBvQuery.inc} + {$I ..\Include\Simd\CpuFeatures\ClpXGetBvQuery.inc} end; {$ENDIF} diff --git a/CryptoLib/src/NumberUtilities/ClpByteUtilities.pas b/CryptoLib/src/NumberUtilities/ClpByteUtilities.pas index 9436be5e..82a5a354 100644 --- a/CryptoLib/src/NumberUtilities/ClpByteUtilities.pas +++ b/CryptoLib/src/NumberUtilities/ClpByteUtilities.pas @@ -37,11 +37,6 @@ TByteUtilities = class sealed(TObject) class procedure &Xor(ALen: Int32; const AX: TCryptoLibByteArray; AXOff: Int32; const AY: TCryptoLibByteArray; AYOff: Int32; const AZ: TCryptoLibByteArray; AZOff: Int32); overload; static; - /// - /// Triple-XOR: AZ := AX xor AY. Intentionally NOT inline: FPC 3.2 for - /// i386 miscompiles the equivalent loop when inlined inside pipelined - /// GCM steps at -O3, so the CALL boundary is load-bearing. - /// class procedure &Xor(ALen: Int32; AX, AY, AZ: PByte); overload; static; class procedure &Xor(ALen: Int32; AX, AY, AZ: PByte; AXOff, AYOff, AZOff: Integer); overload; static; diff --git a/CryptoLib/src/NumberUtilities/ClpByteXorX86Backend.pas b/CryptoLib/src/NumberUtilities/ClpByteXorX86Backend.pas index 3c6b0ccd..8a8fdb86 100644 --- a/CryptoLib/src/NumberUtilities/ClpByteXorX86Backend.pas +++ b/CryptoLib/src/NumberUtilities/ClpByteXorX86Backend.pas @@ -46,11 +46,11 @@ implementation {$IFDEF CRYPTOLIB_X86_SIMD} procedure ByteXorSse2(ALen: NativeInt; AX, AY, AZ: Pointer); {$IFDEF CRYPTOLIB_X86_64_ASM} -{$I ..\Include\Simd\Common\SimdProc4Begin_x86_64.inc} +{$I ..\Include\Simd\Common\ClpSimdProc4Begin_x86_64.inc} {$I ..\Include\Simd\ByteXor\ByteXorSse2_x86_64.inc} {$ENDIF} {$IFDEF CRYPTOLIB_I386_ASM} -{$I ..\Include\Simd\Common\SimdProc4Begin_i386.inc} +{$I ..\Include\Simd\Common\ClpSimdProc4Begin_i386.inc} {$I ..\Include\Simd\ByteXor\ByteXorSse2_i386.inc} {$ENDIF} end;