From 36da00cc9293aa7f5297489e7d32d0cb19e2a4a4 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 10 Jul 2016 15:16:20 -0400 Subject: Add RDRAND and RDSEED for SunCC 12.1 and above --- rdrand.asm | 48 ++++++++++++++++++++++++------------------------ rdrand.cpp | 15 +++++++++++++-- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/rdrand.asm b/rdrand.asm index 73f5a964..9fcf6e0a 100644 --- a/rdrand.asm +++ b/rdrand.asm @@ -108,7 +108,7 @@ Call_RDRAND_EAX: ;; RDRAND is not available prior to VS2012. Just emit ;; the byte codes using DB. This is `rdrand eax`. DB 0Fh, 0C7h, 0F0h - + ;; If CF=1, the number returned by RDRAND is valid. ;; If CF=0, a random number was not available. jc RDRAND_succeeded @@ -126,13 +126,13 @@ RDRAND_succeeded: cmp bsize, MWSIZE jb Partial_Machine_Word - + Full_Machine_Word: mov DWORD PTR [buffer], eax add buffer, MWSIZE ;; No need for Intel Core 2 slow workarounds, like sub bsize, MWSIZE ;; `lea buffer,[buffer+MWSIZE]` for faster adds - + ;; Continue jmp GenerateBlock_Top @@ -146,9 +146,9 @@ Partial_Machine_Word: mov WORD PTR [buffer], ax shr eax, 16 add buffer, 2 - + Bit_1_Not_Set: - + ;; Test bit 0 to see if size is at least 1 test bsize, 1 jz GenerateBlock_Success @@ -164,14 +164,14 @@ GenerateBlock_PreRet: ;; Test for success (was the request completely fulfilled?) cmp bsize, 0 - je GenerateBlock_Success - + je GenerateBlock_Success + GenerateBlock_Failure: xor eax, eax mov al, RDRAND_FAILURE ret - + GenerateBlock_Success: xor eax, eax @@ -241,7 +241,7 @@ RDRAND_succeeded: cmp bsize, MWSIZE jb Partial_Machine_Word - + Full_Machine_Word: mov QWORD PTR [buffer], rax @@ -284,19 +284,19 @@ Bit_0_Not_Set: ;; We've hit all the bits jmp GenerateBlock_Success - + GenerateBlock_PreRet: ;; Test for success (was the request completely fulfilled?) cmp bsize, 0 je GenerateBlock_Success - + GenerateBlock_Failure: xor rax, rax mov al, RDRAND_FAILURE ret - + GenerateBlock_Success: xor rax, rax @@ -352,7 +352,7 @@ Call_RDSEED_EAX: ;; RDSEED is not available prior to VS2012. Just emit ;; the byte codes using DB. This is `rdseed eax`. DB 0Fh, 0C7h, 0F8h - + ;; If CF=1, the number returned by RDSEED is valid. ;; If CF=0, a random number was not available. jc RDSEED_succeeded @@ -370,13 +370,13 @@ RDSEED_succeeded: cmp bsize, MWSIZE jb Partial_Machine_Word - + Full_Machine_Word: mov DWORD PTR [buffer], eax add buffer, MWSIZE ;; No need for Intel Core 2 slow workarounds, like sub bsize, MWSIZE ;; `lea buffer,[buffer+MWSIZE]` for faster adds - + ;; Continue jmp GenerateBlock_Top @@ -390,9 +390,9 @@ Partial_Machine_Word: mov WORD PTR [buffer], ax shr eax, 16 add buffer, 2 - + Bit_1_Not_Set: - + ;; Test bit 0 to see if size is at least 1 test bsize, 1 jz GenerateBlock_Success @@ -408,14 +408,14 @@ GenerateBlock_PreRet: ;; Test for success (was the request completely fulfilled?) cmp bsize, 0 - je GenerateBlock_Success - + je GenerateBlock_Success + GenerateBlock_Failure: xor eax, eax mov al, RDSEED_FAILURE ret - + GenerateBlock_Success: xor eax, eax @@ -485,7 +485,7 @@ RDSEED_succeeded: cmp bsize, MWSIZE jb Partial_Machine_Word - + Full_Machine_Word: mov QWORD PTR [buffer], rax @@ -528,19 +528,19 @@ Bit_0_Not_Set: ;; We've hit all the bits jmp GenerateBlock_Success - + GenerateBlock_PreRet: ;; Test for success (was the request completely fulfilled?) cmp bsize, 0 je GenerateBlock_Success - + GenerateBlock_Failure: xor rax, rax mov al, RDSEED_FAILURE ret - + GenerateBlock_Success: xor rax, rax diff --git a/rdrand.cpp b/rdrand.cpp index 4edb1bd8..2cbca4fe 100644 --- a/rdrand.cpp +++ b/rdrand.cpp @@ -68,7 +68,7 @@ #if defined(CRYPTOPP_CPUID_AVAILABLE) # define MSC_INTRIN_COMPILER ((CRYPTOPP_MSC_VERSION >= 1700) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30200) || (_INTEL_COMPILER >= 1210)) -# define GCC_INTRIN_COMPILER ((CRYPTOPP_GCC_VERSION >= 40600) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30200) || (_INTEL_COMPILER >= 1210)) +# define GCC_INTRIN_COMPILER ((CRYPTOPP_GCC_VERSION >= 40600) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30200) || (_INTEL_COMPILER >= 1210)) || (__SUNPRO_CC >= 0x5130) #else # define MSC_INTRIN_COMPILER 0 # define GCC_INTRIN_COMPILER 0 @@ -99,6 +99,17 @@ # elif CRYPTOPP_BOOL_RDSEED_ASM # define GCC_RDSEED_ASM_AVAILABLE 1 # endif +#elif defined(CRYPTOPP_CPUID_AVAILABLE) && (__SUNPRO_CC >= 0x5100) +# if GCC_INTRIN_COMPILER && defined(__RDRND__) +# define ALL_RDRAND_INTRIN_AVAILABLE 1 +# elif CRYPTOPP_BOOL_RDRAND_ASM +# define GCC_RDRAND_ASM_AVAILABLE 1 +# endif +# if GCC_INTRIN_COMPILER && defined(__RDSEED__) +# define ALL_RDSEED_INTRIN_AVAILABLE 1 +# elif CRYPTOPP_BOOL_RDSEED_ASM +# define GCC_RDSEED_ASM_AVAILABLE 1 +# endif #endif // Debug diagnostics @@ -131,7 +142,7 @@ ///////////////////////////////////////////////////////////////////// #if (ALL_RDRAND_INTRIN_AVAILABLE || ALL_RDSEED_INTRIN_AVAILABLE) -# include // rdrand, MSC, ICC, and GCC +# include // rdrand, MSC, ICC, GCC, and SunCC # if defined(__GNUC__) && (CRYPTOPP_GCC_VERSION >= 40600) # include // rdseed for some compilers, like GCC # endif -- cgit v1.2.1