generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 5911e25b: am 07d3c6ce: Merge "Fix the *rand48 functions on LP64."

Browse Source 
* commit '5911e25bfc8ef3815d0e1ab4f5829ff74a523088':
  Fix the *rand48 functions on LP64.
This commit is contained in:
Elliott Hughes 2013-10-28 16:19:02 -07:00 committed by Android Git Automerger
commit 87de1a0154
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/upstream-netbsd/libc/stdlib/jrand48.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: jrand48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $ */
/* $NetBSD: jrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@ -15,7 +15,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: jrand48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $");
__RCSID("$NetBSD: jrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -35,5 +35,5 @@ jrand48(unsigned short xseed[3])
_DIAGASSERT(xseed != NULL);
__dorand48(xseed);
return ((long) xseed[2] << 16) + (long) xseed[1];
return (int16_t)xseed[2] * 65536 + xseed[1];
}

7
libc/upstream-netbsd/libc/stdlib/lrand48.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lrand48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $ */
/* $NetBSD: lrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@ -15,7 +15,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: lrand48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $");
__RCSID("$NetBSD: lrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -29,6 +29,5 @@ long
lrand48(void)
{
__dorand48(__rand48_seed);
return (long)((unsigned long) __rand48_seed[2] << 15) +
((unsigned long) __rand48_seed[1] >> 1);
return __rand48_seed[2] * 32768 + (__rand48_seed[1] >> 1);
}

6
libc/upstream-netbsd/libc/stdlib/mrand48.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mrand48.c,v 1.7 2005/06/12 05:21:28 lukem Exp $ */
/* $NetBSD: mrand48.c,v 1.8 2013/10/22 08:08:51 matt Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@ -15,7 +15,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: mrand48.c,v 1.7 2005/06/12 05:21:28 lukem Exp $");
__RCSID("$NetBSD: mrand48.c,v 1.8 2013/10/22 08:08:51 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -29,5 +29,5 @@ long
mrand48(void)
{
__dorand48(__rand48_seed);
return ((long) __rand48_seed[2] << 16) + (long) __rand48_seed[1];
return (int16_t)__rand48_seed[2] * 65536 + __rand48_seed[1];
}

7
libc/upstream-netbsd/libc/stdlib/nrand48.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nrand48.c,v 1.9 2005/06/12 05:21:28 lukem Exp $ */
/* $NetBSD: nrand48.c,v 1.10 2013/10/22 08:08:51 matt Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@ -15,7 +15,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: nrand48.c,v 1.9 2005/06/12 05:21:28 lukem Exp $");
__RCSID("$NetBSD: nrand48.c,v 1.10 2013/10/22 08:08:51 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -34,6 +34,5 @@ nrand48(unsigned short xseed[3])
_DIAGASSERT(xseed != NULL);
__dorand48(xseed);
return (long)((unsigned long) xseed[2] << 15) +
((unsigned long) xseed[1] >> 1);
return xseed[2] * 32768 + (xseed[1] >> 1);
}