svn commit: r274250 - head/sys/dev/random

[Dimitry Andric]

On 07 Nov 2014, at 21:10, Konstantin Belousov <kib at FreeBSD.org> wrote:
> 
> Author: kib
> Date: Fri Nov  7 20:10:09 2014
> New Revision: 274250
> URL: https://svnweb.freebsd.org/changeset/base/274250
> 
> Log:
>  Simplify assembler in ivy.c.  Move the copying of the random bits into
>  buffer from asm to C, which reduces amount of arguments for inline asm
>  and simplifies constraints.  Use unsigned types consistently.
> 
>  Submitted by:	bde
>  Approved by:	secteam (delphij)
>  Reviewed by:	markm
>  MFC after:	1 week
> 
> Modified:
>  head/sys/dev/random/ivy.c
> 
> Modified: head/sys/dev/random/ivy.c
> ==============================================================================
> --- head/sys/dev/random/ivy.c	Fri Nov  7 19:34:10 2014	(r274249)
> +++ head/sys/dev/random/ivy.c	Fri Nov  7 20:10:09 2014	(r274250)
> @@ -61,42 +61,41 @@ static struct live_entropy_source random
> };
> 
> static inline int
> -ivy_rng_store(long *buf)
> +ivy_rng_store(u_long *buf)
> {
> #ifdef __GNUCLIKE_ASM
> -	long tmp;
> +	u_long rndval;
> 	int retry;
> 
> 	retry = RETRY_COUNT;
> 	__asm __volatile(
> 	    "1:\n\t"
> -	    "rdrand	%2\n\t"	/* read randomness into tmp */
> -	    "jb		2f\n\t" /* CF is set on success, exit retry loop */
> +	    "rdrand	%1\n\t"	/* read randomness into tmp */
> +	    "jc		2f\n\t" /* CF is set on success, exit retry loop */

You might want to update the first comment to "read randomness into
rndval", for consistency.

-Dimitry

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 194 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20141110/86fcd2b3/attachment.sig>