shadps4-emu/ext-cryptopp
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-cryptopp.git synced 2025-02-07 13:38:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update GCC clobber list for SHA-256 and SHA-512 (PR #1139)

Browse Source 
* Clear documentation warning

* Update GCC clobber list for SHA-256 and SHA-512
  Also see PR #1133 and GH #1134
This commit is contained in:
Jeffrey Walton 2022-08-06 01:24:29 -04:00 committed by GitHub
parent 42bd192d8e
commit d01ab643e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arm_simd.h
View File

@ -385,19 +385,19 @@ inline uint64x2_t VEOR3(uint64x2_t a, uint64x2_t b, uint64x2_t c)
/// \param a the first value
/// \param b the second value
/// \param c the third value
/// \return two-way exclusive OR of the values, then rotated by imm6
/// \return two-way exclusive OR of the values, then rotated by c
/// \details VXARQ() performs vxarq_u64(). VXARQ is provided as GCC inline assembly due
/// to Clang and lack of support for the intrinsic.
/// \details VXARQ requires ARMv8.2.
/// \since Crypto++ 8.6
inline uint64x2_t VXAR(uint64x2_t a, uint64x2_t b, const int imm6)
inline uint64x2_t VXAR(uint64x2_t a, uint64x2_t b, const int c)
{
#if defined(_MSC_VER)
return vxarq_u64(a, b, imm6);
return vxarq_u64(a, b, c);
#else
uint64x2_t r;
__asm__ ("xar %0.2d, %1.2d, %2.2d, %3 \n\t"
:"=w" (r) : "w" (a), "w" (b), "I" (imm6));
:"=w" (r) : "w" (a), "w" (b), "I" (c));
return r;
#endif
}

4
cpu.h
View File

@ -60,6 +60,10 @@
#define ATT_NOPREFIX
#endif
// Thanks to v1ne at https://github.com/weidai11/cryptopp/pull/1133
#define PERCENT_PASTE(x) "%" #x
#define PERCENT_REG(x) PERCENT_PASTE(x)
#ifdef CRYPTOPP_GENERATE_X64_MASM
#define CRYPTOPP_X86_ASM_AVAILABLE

2
gcm.cpp
View File

@ -559,8 +559,6 @@ size_t GCM_Base::AuthenticateBlocks(const byte *data, size_t len)
#endif
#if CRYPTOPP_SSE2_ASM_AVAILABLE
#define PERCENT_REG_(x) "%" #x
#define PERCENT_REG(x) PERCENT_REG_(x)
case 1: // SSE2 and 2K tables
{

12
sha.cpp
View File

@ -825,12 +825,14 @@ INTEL_NOPREFIX
ATT_PREFIX
:
: "c" (state), "d" (data), "S" (SHA256_K+48), "D" (len)
#if CRYPTOPP_BOOL_X64
#if CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
, "m" (workspace[0])
#endif
: "memory", "cc", "%eax"
#if CRYPTOPP_BOOL_X64
: "memory", "cc", "%eax", "%xmm0", "%xmm1", PERCENT_REG(AS_REG_7)
#if CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
, "%rbx", "%r8", "%r10"
#else
, "%ebx"
#endif
);
#endif
@ -1294,7 +1296,9 @@ void CRYPTOPP_FASTCALL SHA512_HashBlock_SSE2(word64 *state, const word64 *data)
ATT_PREFIX
:
: "a" (SHA512_K), "c" (state), "d" (data)
: "%esi", "%edi", "memory", "cc"
: "%ebx", "%esi", "%edi", "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5",
"%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7",
"memory", "cc"
);
#else
AS1( pop edi)