arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use local labels for RDRAND and RDSEED code (GH #872) 

This did not fix the issue, but it is something on the TODO list.
pull/873/head
Jeffrey Walton 2019-08-06 00:18:56 -04:00
parent a01711e347
commit 41864fd49e
1 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
rdrand.asm
View File

@ -63,13 +63,13 @@ MASM_RDRAND_GenerateBlock PROC ;; arg1:DWORD, arg2:DWORD
bsize EQU edx bsize EQU edx
;; Top of While loop ;; Top of While loop
GenerateBlock_Top: RDRAND_GenerateBlock_Top:
;; Check remaining size ;; Check remaining size
cmp bsize, 0 cmp bsize, 0
je GenerateBlock_Return je RDRAND_GenerateBlock_Return
Call_RDRAND_EAX: RDRAND_Call_EAX:
;; RDRAND is not available prior to VS2012. Just emit ;; RDRAND is not available prior to VS2012. Just emit
;; the byte codes using DB. This is `rdrand eax`. ;; the byte codes using DB. This is `rdrand eax`.
DB 0Fh, 0C7h, 0F0h DB 0Fh, 0C7h, 0F0h
@ -78,46 +78,46 @@ Call_RDRAND_EAX:
;; If CF=0, a random number was not available. ;; If CF=0, a random number was not available.
;; Retry immediately ;; Retry immediately
jnc Call_RDRAND_EAX jnc RDRAND_Call_EAX
RDRAND_succeeded: RDRAND_succeeded:
cmp bsize, MWSIZE cmp bsize, MWSIZE
jb Partial_Machine_Word jb RDRAND_Partial_Machine_Word
Full_Machine_Word: RDRAND_Full_Machine_Word:
mov DWORD PTR [buffer], eax mov DWORD PTR [buffer], eax
add buffer, MWSIZE ;; No need for Intel Core 2 slow workarounds, like add buffer, MWSIZE ;; No need for Intel Core 2 slow workarounds, like
sub bsize, MWSIZE ;; `lea buffer,[buffer+MWSIZE]` for faster adds sub bsize, MWSIZE ;; `lea buffer,[buffer+MWSIZE]` for faster adds
;; Continue ;; Continue
jmp GenerateBlock_Top jmp RDRAND_GenerateBlock_Top
;; 1,2,3 bytes remain ;; 1,2,3 bytes remain
Partial_Machine_Word: RDRAND_Partial_Machine_Word:
;; Test bit 1 to see if size is at least 2 ;; Test bit 1 to see if size is at least 2
test bsize, 2 test bsize, 2
jz Bit_1_Not_Set jz RDRAND_Bit_1_Not_Set
mov WORD PTR [buffer], ax mov WORD PTR [buffer], ax
shr eax, 16 shr eax, 16
add buffer, 2 add buffer, 2
Bit_1_Not_Set: RDRAND_Bit_1_Not_Set:
;; Test bit 0 to see if size is at least 1 ;; Test bit 0 to see if size is at least 1
test bsize, 1 test bsize, 1
jz Bit_0_Not_Set jz RDRAND_Bit_0_Not_Set
mov BYTE PTR [buffer], al mov BYTE PTR [buffer], al
Bit_0_Not_Set: RDRAND_Bit_0_Not_Set:
;; We've hit all the bits ;; We've hit all the bits
GenerateBlock_Return: RDRAND_GenerateBlock_Return:
;; Clear artifacts ;; Clear artifacts
xor eax, eax xor eax, eax
@ -151,13 +151,13 @@ MASM_RDRAND_GenerateBlock PROC ;; arg1:QWORD, arg2:QWORD
bsize EQU rdx bsize EQU rdx
;; Top of While loop ;; Top of While loop
GenerateBlock_Top: RDRAND_GenerateBlock_Top:
;; Check remaining size ;; Check remaining size
cmp bsize, 0 cmp bsize, 0
je GenerateBlock_Return je RDRAND_GenerateBlock_Return
Call_RDRAND_RAX: RDRAND_Call_RAX:
;; RDRAND is not available prior to VS2012. Just emit ;; RDRAND is not available prior to VS2012. Just emit
;; the byte codes using DB. This is `rdrand rax`. ;; the byte codes using DB. This is `rdrand rax`.
DB 048h, 0Fh, 0C7h, 0F0h DB 048h, 0Fh, 0C7h, 0F0h
@ -166,60 +166,60 @@ Call_RDRAND_RAX:
;; If CF=0, a random number was not available. ;; If CF=0, a random number was not available.
;; Retry immediately ;; Retry immediately
jnc Call_RDRAND_RAX jnc RDRAND_Call_RAX
RDRAND_succeeded: RDRAND_succeeded:
cmp bsize, MWSIZE cmp bsize, MWSIZE
jb Partial_Machine_Word jb RDRAND_Partial_Machine_Word
Full_Machine_Word: RDRAND_Full_Machine_Word:
mov QWORD PTR [buffer], rax mov QWORD PTR [buffer], rax
add buffer, MWSIZE add buffer, MWSIZE
sub bsize, MWSIZE sub bsize, MWSIZE
;; Continue ;; Continue
jmp GenerateBlock_Top jmp RDRAND_GenerateBlock_Top
;; 1,2,3,4,5,6,7 bytes remain ;; 1,2,3,4,5,6,7 bytes remain
Partial_Machine_Word: RDRAND_Partial_Machine_Word:
;; Test bit 2 to see if size is at least 4 ;; Test bit 2 to see if size is at least 4
test bsize, 4 test bsize, 4
jz Bit_2_Not_Set jz RDRAND_Bit_2_Not_Set
mov DWORD PTR [buffer], eax mov DWORD PTR [buffer], eax
shr rax, 32 shr rax, 32
add buffer, 4 add buffer, 4
Bit_2_Not_Set: RDRAND_Bit_2_Not_Set:
;; Test bit 1 to see if size is at least 2 ;; Test bit 1 to see if size is at least 2
test bsize, 2 test bsize, 2
jz Bit_1_Not_Set jz RDRAND_Bit_1_Not_Set
mov WORD PTR [buffer], ax mov WORD PTR [buffer], ax
shr eax, 16 shr eax, 16
add buffer, 2 add buffer, 2
Bit_1_Not_Set: RDRAND_Bit_1_Not_Set:
;; Test bit 0 to see if size is at least 1 ;; Test bit 0 to see if size is at least 1
test bsize, 1 test bsize, 1
jz Bit_0_Not_Set jz RDRAND_Bit_0_Not_Set
mov BYTE PTR [buffer], al mov BYTE PTR [buffer], al
Bit_0_Not_Set: RDRAND_Bit_0_Not_Set:
;; We've hit all the bits ;; We've hit all the bits
GenerateBlock_Return: RDRAND_GenerateBlock_Return:
;; Clear artifacts ;; Clear artifacts
xor rax, rax xor rax, rax
ret ret
MASM_RDRAND_GenerateBlock ENDP MASM_RDRAND_GenerateBlock ENDP
@ -249,13 +249,13 @@ MASM_RDSEED_GenerateBlock PROC ;; arg1:DWORD, arg2:DWORD
bsize EQU edx bsize EQU edx
;; Top of While loop ;; Top of While loop
GenerateBlock_Top: RDSEED_GenerateBlock_Top:
;; Check remaining size ;; Check remaining size
cmp bsize, 0 cmp bsize, 0
je GenerateBlock_Return je RDSEED_GenerateBlock_Return
Call_RDSEED_EAX: RDSEED_Call_EAX:
;; RDSEED is not available prior to VS2012. Just emit ;; RDSEED is not available prior to VS2012. Just emit
;; the byte codes using DB. This is `rdseed eax`. ;; the byte codes using DB. This is `rdseed eax`.
DB 0Fh, 0C7h, 0F8h DB 0Fh, 0C7h, 0F8h
@ -264,50 +264,50 @@ Call_RDSEED_EAX:
;; If CF=0, a random number was not available. ;; If CF=0, a random number was not available.
;; Retry immediately ;; Retry immediately
jnc Call_RDSEED_EAX jnc RDSEED_Call_EAX
RDSEED_succeeded: RDSEED_succeeded:
cmp bsize, MWSIZE cmp bsize, MWSIZE
jb Partial_Machine_Word jb RDSEED_Partial_Machine_Word
Full_Machine_Word: RDSEED_Full_Machine_Word:
mov DWORD PTR [buffer], eax mov DWORD PTR [buffer], eax
add buffer, MWSIZE ;; No need for Intel Core 2 slow workarounds, like add buffer, MWSIZE ;; No need for Intel Core 2 slow workarounds, like
sub bsize, MWSIZE ;; `lea buffer,[buffer+MWSIZE]` for faster adds sub bsize, MWSIZE ;; `lea buffer,[buffer+MWSIZE]` for faster adds
;; Continue ;; Continue
jmp GenerateBlock_Top jmp RDSEED_GenerateBlock_Top
;; 1,2,3 bytes remain ;; 1,2,3 bytes remain
Partial_Machine_Word: RDSEED_Partial_Machine_Word:
;; Test bit 1 to see if size is at least 2 ;; Test bit 1 to see if size is at least 2
test bsize, 2 test bsize, 2
jz Bit_1_Not_Set jz RDSEED_Bit_1_Not_Set
mov WORD PTR [buffer], ax mov WORD PTR [buffer], ax
shr eax, 16 shr eax, 16
add buffer, 2 add buffer, 2
Bit_1_Not_Set: RDSEED_Bit_1_Not_Set:
;; Test bit 0 to see if size is at least 1 ;; Test bit 0 to see if size is at least 1
test bsize, 1 test bsize, 1
jz Bit_0_Not_Set jz RDSEED_Bit_0_Not_Set
mov BYTE PTR [buffer], al mov BYTE PTR [buffer], al
Bit_0_Not_Set: RDSEED_Bit_0_Not_Set:
;; We've hit all the bits ;; We've hit all the bits
GenerateBlock_Return: RDSEED_GenerateBlock_Return:
;; Clear artifacts ;; Clear artifacts
xor eax, eax xor eax, eax
ret ret
MASM_RDSEED_GenerateBlock ENDP MASM_RDSEED_GenerateBlock ENDP
@ -337,13 +337,13 @@ MASM_RDSEED_GenerateBlock PROC ;; arg1:QWORD, arg2:QWORD
bsize EQU rdx bsize EQU rdx
;; Top of While loop ;; Top of While loop
GenerateBlock_Top: RDSEED_GenerateBlock_Top:
;; Check remaining size ;; Check remaining size
cmp bsize, 0 cmp bsize, 0
je GenerateBlock_Return je RDSEED_GenerateBlock_Return
Call_RDSEED_RAX: RDSEED_Call_RAX:
;; RDSEED is not available prior to VS2012. Just emit ;; RDSEED is not available prior to VS2012. Just emit
;; the byte codes using DB. This is `rdseed rax`. ;; the byte codes using DB. This is `rdseed rax`.
DB 048h, 0Fh, 0C7h, 0F8h DB 048h, 0Fh, 0C7h, 0F8h
@ -352,56 +352,56 @@ Call_RDSEED_RAX:
;; If CF=0, a random number was not available. ;; If CF=0, a random number was not available.
;; Retry immediately ;; Retry immediately
jnc Call_RDSEED_RAX jnc RDSEED_Call_RAX
RDSEED_succeeded: RDSEED_succeeded:
cmp bsize, MWSIZE cmp bsize, MWSIZE
jb Partial_Machine_Word jb RDSEED_Partial_Machine_Word
Full_Machine_Word: RDSEED_Full_Machine_Word:
mov QWORD PTR [buffer], rax mov QWORD PTR [buffer], rax
add buffer, MWSIZE add buffer, MWSIZE
sub bsize, MWSIZE sub bsize, MWSIZE
;; Continue ;; Continue
jmp GenerateBlock_Top jmp RDSEED_GenerateBlock_Top
;; 1,2,3,4,5,6,7 bytes remain ;; 1,2,3,4,5,6,7 bytes remain
Partial_Machine_Word: RDSEED_Partial_Machine_Word:
;; Test bit 2 to see if size is at least 4 ;; Test bit 2 to see if size is at least 4
test bsize, 4 test bsize, 4
jz Bit_2_Not_Set jz RDSEED_Bit_2_Not_Set
mov DWORD PTR [buffer], eax mov DWORD PTR [buffer], eax
shr rax, 32 shr rax, 32
add buffer, 4 add buffer, 4
Bit_2_Not_Set: RDSEED_Bit_2_Not_Set:
;; Test bit 1 to see if size is at least 2 ;; Test bit 1 to see if size is at least 2
test bsize, 2 test bsize, 2
jz Bit_1_Not_Set jz RDSEED_Bit_1_Not_Set
mov WORD PTR [buffer], ax mov WORD PTR [buffer], ax
shr eax, 16 shr eax, 16
add buffer, 2 add buffer, 2
Bit_1_Not_Set: RDSEED_Bit_1_Not_Set:
;; Test bit 0 to see if size is at least 1 ;; Test bit 0 to see if size is at least 1
test bsize, 1 test bsize, 1
jz Bit_0_Not_Set jz RDSEED_Bit_0_Not_Set
mov BYTE PTR [buffer], al mov BYTE PTR [buffer], al
Bit_0_Not_Set: RDSEED_Bit_0_Not_Set:
;; We've hit all the bits ;; We've hit all the bits
GenerateBlock_Return: RDSEED_GenerateBlock_Return:
;; Clear artifacts ;; Clear artifacts
xor rax, rax xor rax, rax