mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Thu Mar 14 06:01:07 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* string/strnlen.c: New file. * string/Makefile (routines): Add strnlen. * string/string.h [__USE_GNU] (strnlen): Declare new function. [__OPTIMIZE__]: Define extern inline implementation of it. * stdlib/erand48_r.c: Use __mpn_construct_double instead of ldexp and addition, to avoid using anything from -lm. Mon Mar 4 21:57:14 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/Makefile: New file. * sysdeps/unix/sysv/linux/m68k/sysdep.h (SYS_ify): Redefine. (CALL_MCOUNT): New macro, empty unless [PROF]. (ENTRY): Do CALL_MCOUNT just after the label. (JUMPTARGET): New macro. (SYSCALL_ERROR_HANDLER): Fix syntax. Thu Mar 14 04:20:48 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/init-first.c (init): Call `__personality' function instead of using inline asm i386 syscall. * sysdeps/unix/sysv/linux/syscalls.list: Add personality syscall. * posix/unistd.h [__USE_BSD]: Declare usleep. * misc/efgcvt.c (MAXDIG): New macro computed from <floats.h> constants. (fcvt, ecvt): Use it for buffer size. * stdlib/drand48-iter.c (__drand48_iterate): Use u_int64_t instead of conditionalizing long vs long long. * stdlib/drand48-iter.c (__drand48_iterate): Don't check for null pointers; never return EFAULT. * stdlib/drand48_r.c (drand48_r): Likewise. * stdlib/erand48_r.c (erand48_r): Likewise.
This commit is contained in:
@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
/* Global state for non-reentrent functions. */
|
||||
struct drand48_data __libc_drand48_data;
|
||||
@ -31,12 +31,7 @@ __drand48_iterate (xsubi, buffer)
|
||||
unsigned short int xsubi[3];
|
||||
struct drand48_data *buffer;
|
||||
{
|
||||
/* Be generous for the arguments, detect some errors. */
|
||||
if (xsubi == NULL || buffer == NULL)
|
||||
{
|
||||
errno = EFAULT;
|
||||
return -1;
|
||||
}
|
||||
u_int64_t X, a, result;
|
||||
|
||||
/* Initialize buffer, if not yet done. */
|
||||
if (!buffer->init)
|
||||
@ -58,42 +53,28 @@ __drand48_iterate (xsubi, buffer)
|
||||
48 bits. Because we compute the modulus it does not care how
|
||||
many bits really are computed. */
|
||||
|
||||
if (sizeof (long int) >= 6)
|
||||
if (sizeof (unsigned short int) == 2)
|
||||
{
|
||||
/* The `long' data type is sufficent. */
|
||||
unsigned long int X, a, result;
|
||||
X = (xsubi[2] << 16 | xsubi[1]) << 16 | xsubi[0];
|
||||
a = (buffer->a[2] << 16 | buffer->a[1]) << 16 | buffer->a[0];
|
||||
|
||||
#define ONE_STEP \
|
||||
if (sizeof (unsigned short int) == 2) \
|
||||
{ \
|
||||
X = (xsubi[2] << 16 | xsubi[1]) << 16 | xsubi[0]; \
|
||||
a = (buffer->a[2] << 16 | buffer->a[1]) << 16 | buffer->a[0]; \
|
||||
\
|
||||
result = X * a + buffer->c; \
|
||||
\
|
||||
xsubi[0] = result & 0xffff; \
|
||||
result >>= 16; \
|
||||
xsubi[1] = result & 0xffff; \
|
||||
result >>= 16; \
|
||||
xsubi[2] = result & 0xffff; \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
X = xsubi[2] << 16 | xsubi[1] >> 16; \
|
||||
a = buffer->a[2] << 16 | buffer->a[1] >> 16; \
|
||||
\
|
||||
result = X * a + buffer->c; \
|
||||
\
|
||||
xsubi[0] = result >> 16 & 0xffffffffl; \
|
||||
xsubi[1] = result << 16 & 0xffff0000l; \
|
||||
}
|
||||
ONE_STEP;
|
||||
result = X * a + buffer->c;
|
||||
|
||||
xsubi[0] = result & 0xffff;
|
||||
result >>= 16;
|
||||
xsubi[1] = result & 0xffff;
|
||||
result >>= 16;
|
||||
xsubi[2] = result & 0xffff;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* We have to use the `long long' data type. */
|
||||
unsigned long long int X, a, result;
|
||||
ONE_STEP;
|
||||
X = xsubi[2] << 16 | xsubi[1] >> 16;
|
||||
a = buffer->a[2] << 16 | buffer->a[1] >> 16;
|
||||
|
||||
result = X * a + buffer->c;
|
||||
|
||||
xsubi[0] = result >> 16 & 0xffffffffl;
|
||||
xsubi[1] = result << 16 & 0xffff0000l;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user