From b20e47cb14ec8edccab7c722743a731e67280702 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 19 Mar 1996 20:21:54 +0000 Subject: Tue Mar 19 14:18:42 1996 Roland McGrath * sysdeps/unix/bsd/pause.c: Moved to sysdeps/unix/common/pause.c. Mon Mar 4 20:17:28 1996 David Mosberger-Tang * sysdeps/unix/sysv/linux/adjtime.c: Use INT_MAX instead of LONG_MAX. * sysdeps/unix/sysv/Makefile (sysdep_routines): Don't add s_getdents. * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Don't add mount, umount. * sysdeps/alpha/__math.h (atan, cabs): New functions. * sysdeps/unix/sysv/linux/alpha/sigsuspend.S: new file (syscall expects set-value, not pointer to it). Sun Feb 25 22:36:10 1996 David Mosberger-Tang * sysdeps/unix/sysv/linux/alpha/profil-counter.h: New file. * gmon/gmon.c (__bb_head): new variable. (write_hist, write_call_graph, write_bb_counts): new functions. (_mcleanup): modified to call above functions instead of directly writing out gmon.out. * gmon/sys/gmon.h (struct __bb): New type. (struct gmonhdr): Type removed. (struct gmonparam): New member `log_hashfraction'. (GMONVERSION): Macro removed. * gmon/sys/gmon_out.h, gmon/bb_exit_func.c, sysdeps/generic/bb_init_func.c, sysdeps/alpha/bb_init_func.S: new files. * gmon/Makefile (headers): Add sys/gmon_out.h. (routines): Add bb_init_func, bb_exit_func. * gmon/mcount.c: Avoid integer division. Wed Feb 21 23:56:41 1996 David Mosberger-Tang * sysdeps/alpha/setjmp.S: switched order in which sp and fp are passed to match what __sigsetjmp_aux() expects. Tue Feb 20 11:33:46 1996 David Mosberger-Tang * sysdeps/unix/sysv/linux/alpha/syscalls.list (select, bind, connect, getpeername, getsockname, listen, recv, recvfrom, recvmsg, send, sendmsg, sendto, setsockopt, shutdown, socketpair): added to override same-name assembly file in the parent directory. * stdlib/stdlib.h: add include of sys/types.h in front of random etc declarations to ensure int32_t is declared. * stdlib/random.c, stdlib/random_r.c: replaced "long int" by int32_t where 32 bit integers are required. Also change LONG_MAX into 0x7fffffff since the intent is to turn off the sign bit in a 32 bit integer. * time/offtime.c (__offtime): Use Paul Eggert's code to deal with very large values for "days" (e.g., 64 bit values). Mon Feb 19 22:22:12 1996 David Mosberger-Tang * stdlib/stdlib.h (__random, __random_r, random_r, struct random_data): use int32_t instead of `long int'. Sat Feb 17 11:29:29 1996 David Mosberger-Tang * sysdeps/unix/sysv/linux/alpha/ioperm.c: new file. * sysdeps/alpha/ffs.S: new file. * sysdeps/alpha/fabs.c: File removed. * time/tzfile.c (__tzfile_read): counter variable is i, *not* num_transitions! * time/offtime.c: make capable of dealing with very large (64 bit) time_t values. Use old algorithm until a year is reached that is an integer multiple of 400, then use DAYS_PER_400_YEARS to do the remainder in a single division. * sysdeps/generic/ffs.c (ffs): fix variable declarations to be unsigned int, not unsigned long. * string/test-ffs.c (main): add test case with all upper bits set. * stdlib/tst-strtol.c: add tests cases for machines where sizeof(long)==8. * stdlib/testrand.c (main): disallow rand() to return negative integers. * stdlib/testmb.c (main): fix format to use %lx instead of %x. * stdlib/stdlib.h: on 64 bit machines, declare struct random_data, __random(), __random_r, and random_r to return "int" instead of "long int". * stdlib/random_r.c: 64 bit machines use "int" instead of "long int". Similarly, use INT_MAX instead of LONG_MAX. * stdlib/random.c: on 64 bit machines, randtbl[] and __random[] need to operate on "int" instead of "long int". * locale/locfile-hash.c (compute_hashval): make shifted constant a long to avoid loosing bits on 64 bit machines. * dirent/tst-seekdir.c (main): fix confusing comment; print a line to mark point where directory is rewound. Fri Feb 16 15:01:49 1996 David Mosberger-Tang * time/strftime.c (strftime): any hour > 11 is PM (not > 12!). Wed Feb 14 00:21:17 1996 David Mosberger-Tang * sysdeps/unix/sysv/linux/alpha/Makefile, sysdeps/unix/sysv/linux/alpha/brk.S, sysdeps/unix/sysv/linux/alpha/fpu_control.c, sysdeps/unix/sysv/linux/alpha/fpu_control.h, sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S, sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S, sysdeps/unix/sysv/linux/alpha/pipe.S, sysdeps/unix/sysv/linux/alpha/setfpucw.c, sysdeps/unix/sysv/linux/alpha/sigprocmask.c, sysdeps/unix/sysv/linux/alpha/speed.c, sysdeps/unix/sysv/linux/alpha/start.S, sysdeps/unix/sysv/linux/alpha/syscall.S, sysdeps/unix/sysv/linux/alpha/syscalls.list, sysdeps/unix/sysv/linux/alpha/alpha/regdef.h, sysdeps/unix/sysv/linux/alpha/sysdep.S, sysdeps/unix/sysv/linux/alpha/sysdep.h: New files. * sysdeps/alpha/setjmp_aux.c (__sigsetjmp_aux): restore return address register before returning (gcc 2.7.1 doesn't do it, presumably because $26 is declared as a global variable). * sysdeps/unix/sysv/linux/sys/mman.h: msync was missing "flags" argument. * sysdeps/unix/alarm.c (alarm): do roundup using test & increment instead of multiplication. * sysdeps/posix/sleep.c (sleep): initialize sa_mask to mask of currently blocked signals instead of the empty mask to ensure that execution of alarm handler occurs with none of the currently blocked signals enabled. * sysdeps/unix/alpha/sysdep.h: new file (adapted from OSF/1 version). * sysdeps/unix/bsd/osf/alpha/sysdep.h: include sysdeps/unix/alpha/sysdep.h and removed definitions now in that file. * sysdeps/alpha/divrem.S, sysdeps/alpha/htonl.S, sysdeps/alpha/htons.S, sysdeps/alpha/machine-gmon.h, sysdeps/alpha/_mcount.S, sysdeps/alpha/ntohl.s, sysdeps/alpha/ntohs.s, sysdeps/alpha/strlen.S: New files. * sysdeps/alpha/divl.S, sysdeps/alpha/divlu.S, sysdeps/alpha/divq.S, sysdeps/alpha/divqu.S, sysdeps/alpha/divrem.m4, sysdeps/alpha/macros.m4, sysdeps/alpha/reml.S, sysdeps/alpha/remlu.S, sysdeps/alpha/remq.S, sysdeps/alpha/remqu.S, sysdeps/alpha/strlen.c: Removed. * sysdeps/generic/sbrk.c (__sbrk): argument is of type ptrdiff_t, not int. * sysdeps/alpha/__longjmp.c (__longjmp): moved dummy while loop to end of function to avoid a jump across NOPs. * sysdeps/alpha/Makefile (sysdep_routines): Removed all rules pertaining to integer division/remainder routines since new code doesn't require them. * sunrpc/xdr_mem.c, sunrpc/xdr_stdio.c: Use 4 instead of sizeof(long) where 32 bit quantities are consumed/stored. Various other minor 64-bit cleanups (casting). * sunrpc/xdr.c (xdr_int): test for sizeof(int)==4 to determine whether xdr_long or xdr_short should be used to encode an int. Notice that an xdr_long is 4 bytes independent of the architecture (otherwise no Alpha could interoperate with existing NFS servers, for example). Ditto for enums. * sunrpc/svc_udp.c (svcudp_recv): changed test from 4*sizeof(u_long) to 16 since it really wants 16 bytes. * sunrpc/svc.c (maskp): changed from u_long* to u_int32*. * sunrpc/rpc_cmsg.c (xdr_callmsg), sunrpc/svc_authux.c: increment "buf" pointer by casting it to a char* first since a long* may be 8 bytes or more and oa->oa_length may be any multiple of 4. * sunrpc/rpc/xdr.h (IXDR_GET_LONG, IXDR_PUT_LONG): change casts to u_int32_t (instead of u_long). * sunrpc/clnt_udp.c (clntudp_call): replaced sizeof(u_long) by 4 since it really is testing for 32 bits. Fixed casts to use u_int32 instead of u_long. * sunrpc/xdr_rec.c: Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): replaced u_long by u_int32. * sunrpc/rpc/auth.h: Likewise. * limits.h (LONG_MAX, LONG_MIN, ULONG_MAX): use 64 bit values for Alpha. Tue Mar 19 13:27:49 1996 Roland McGrath * sysdeps/i386/fpu/__math.h: New file. Contributed by John C. Bowman . Sun Mar 17 00:28:16 1996 Andreas Schwab * sysdeps/posix/clock.c: Don't multiply the return value by CLOCKS_PER_SEC or CLK_TCK. * sysdeps/mach/hurd/getcwd.c: Fail with ENOENT if a parent directory scan finds no match. * posix/unistd.h (setpgrp): Declare no-arg version unless __FAVOR_BSD. * misc/bsd-compat.c (setpgrp): New function, two arg version. * sysdeps/stub/setpgid.c: Remove setpgrp alias. * sysdeps/mach/hurd/setpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/setpgid.c: Likewise. * sysdeps/unix/common/syscalls.list (setpgid): Remove setpgrp alias. * sysdeps/unix/sysv/irix4/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/setpgrp.c: Obsolete file removed. * posix/setpgrp.c (setpgrp): New file. * posix/Makefile (routines): Add setpgrp. Tue Feb 6 12:46:29 1996 David Mosberger-Tang * libc-symbols.h (weak_alias, weak_symbol): added definitions for ECOFF (HAVE_ECOFF). --- stdlib/random.c | 6 +++--- stdlib/random_r.c | 12 ++++++------ stdlib/stdlib.h | 19 +++++++++++-------- stdlib/testmb.c | 2 +- stdlib/testrand.c | 3 +++ stdlib/tst-strtol.c | 30 ++++++++++++++++++++++++++++++ 6 files changed, 54 insertions(+), 18 deletions(-) (limited to 'stdlib') diff --git a/stdlib/random.c b/stdlib/random.c index c3f8eaa..0ab8f05 100644 --- a/stdlib/random.c +++ b/stdlib/random.c @@ -114,7 +114,7 @@ position of the rear pointer is just (MAX_TYPES * (rptr - state)) + TYPE_3 == TYPE_3. */ -static long int randtbl[DEG_3 + 1] = +static int32_t randtbl[DEG_3 + 1] = { TYPE_3, @@ -239,10 +239,10 @@ weak_alias (__setstate, setstate) rear pointers can't wrap on the same call by not testing the rear pointer if the front one has wrapped. Returns a 31-bit random number. */ -long int +int __random () { - long int retval; + int32_t retval; (void) __random_r (&unsafe_state, &retval); diff --git a/stdlib/random_r.c b/stdlib/random_r.c index aa7a33f..611deaf 100644 --- a/stdlib/random_r.c +++ b/stdlib/random_r.c @@ -145,7 +145,7 @@ __srandom_r (x, buf) buf->rptr = &buf->state[0]; for (i = 0; i < 10 * buf->rand_deg; ++i) { - long int discard; + int32_t discard; (void) __random_r (buf, &discard); } } @@ -217,7 +217,7 @@ __initstate_r (seed, arg_state, n, buf) buf->rand_sep = SEP_4; } - buf->state = &((long int *) arg_state)[1]; /* First location. */ + buf->state = &((int32_t *) arg_state)[1]; /* First location. */ /* Must set END_PTR before srandom. */ buf->end_ptr = &buf->state[buf->rand_deg]; @@ -246,7 +246,7 @@ __setstate_r (arg_state, buf) void *arg_state; struct random_data *buf; { - long int *new_state = (long int *) arg_state; + int32_t *new_state = (int32_t *) arg_state; int type = new_state[0] % MAX_TYPES; int rear = new_state[0] / MAX_TYPES; @@ -303,21 +303,21 @@ weak_alias (__setstate_r, setstate_r) int __random_r (buf, result) struct random_data *buf; - long int *result; + int32_t *result; { if (buf == NULL || result == NULL) return -1; if (buf->rand_type == TYPE_0) { - buf->state[0] = ((buf->state[0] * 1103515245) + 12345) & LONG_MAX; + buf->state[0] = ((buf->state[0] * 1103515245) + 12345) & 0x7fffffff; *result = buf->state[0]; } else { *buf->fptr += *buf->rptr; /* Chucking least random bit. */ - *result = (*buf->fptr >> 1) & LONG_MAX; + *result = (*buf->fptr >> 1) & 0x7fffffff; ++buf->fptr; if (buf->fptr >= buf->end_ptr) { diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 7c9c689..65932e3 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -172,12 +172,16 @@ extern int rand __P ((void)); /* Seed the random number generator with the given number. */ extern void srand __P ((unsigned int __seed)); +#ifdef __USE_BSD + +#include /* we need int32_t... */ + /* These are the functions that actually do things. The `random', `srandom', `initstate' and `setstate' functions are those from BSD Unices. The `rand' and `srand' functions are required by the ANSI standard. We provide both interfaces to the same random number generator. */ /* Return a random long integer between 0 and RAND_MAX inclusive. */ -extern long int __random __P ((void)); +extern int32_t __random __P ((void)); /* Seed the random number generator with the given number. */ extern void __srandom __P ((unsigned int __seed)); @@ -191,7 +195,6 @@ extern __ptr_t __initstate __P ((unsigned int __seed, __ptr_t __statebuf, which should have been previously initialized by `initstate'. */ extern __ptr_t __setstate __P ((__ptr_t __statebuf)); -#ifdef __USE_BSD extern long int random __P ((void)); extern void srandom __P ((unsigned int __seed)); extern __ptr_t initstate __P ((unsigned int __seed, __ptr_t __statebuf, @@ -217,22 +220,22 @@ extern __inline __ptr_t setstate (__ptr_t __statebuf) struct random_data { - long int *fptr; /* Front pointer. */ - long int *rptr; /* Rear pointer. */ - long int *state; /* Array of state values. */ + int32_t *fptr; /* Front pointer. */ + int32_t *rptr; /* Rear pointer. */ + int32_t *state; /* Array of state values. */ int rand_type; /* Type of random number generator. */ int rand_deg; /* Degree of random number generator. */ int rand_sep; /* Distance between front and rear. */ - long int *end_ptr; /* Pointer behind state table. */ + int32_t *end_ptr; /* Pointer behind state table. */ }; -extern int __random_r __P ((struct random_data *__buf, long int *__result)); +extern int __random_r __P ((struct random_data *__buf, int32_t *__result)); +extern int random_r __P ((struct random_data *__buf, int32_t *__result)); extern int __srandom_r __P ((unsigned int __seed, struct random_data *__buf)); extern int __initstate_r __P ((unsigned int __seed, __ptr_t __statebuf, size_t __statelen, struct random_data *__buf)); extern int __setstate_r __P ((__ptr_t __statebuf, struct random_data *__buf)); -extern int random_r __P ((struct random_data *__buf, long int *__result)); extern int srandom_r __P ((unsigned int __seed, struct random_data *__buf)); extern int initstate_r __P ((unsigned int __seed, __ptr_t __statebuf, size_t __statelen, struct random_data *__buf)); diff --git a/stdlib/testmb.c b/stdlib/testmb.c index c840ce1..a70fe08 100644 --- a/stdlib/testmb.c +++ b/stdlib/testmb.c @@ -53,7 +53,7 @@ main () } else { - printf ("wide value: 0x%04x\n", (unsigned long) wc); + printf ("wide value: 0x%04lx\n", (unsigned long) wc); mbc[0] = '\0'; if ((r = wctomb (mbc, wc)) <= 0) { diff --git a/stdlib/testrand.c b/stdlib/testrand.c index b66dca9..b31082e 100644 --- a/stdlib/testrand.c +++ b/stdlib/testrand.c @@ -34,6 +34,9 @@ DEFUN_VOID(main) srand (1); j1 = rand(); j2 = rand(); + if (i1 < 0 || i2 < 0 || j1 < 0 || j2 < 0) { + puts ("Test FAILED!"); + } if (j1 == i1 && j2 == i2) { puts ("Test succeeded."); diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c index 0682da3..5c3e2cb 100644 --- a/stdlib/tst-strtol.c +++ b/stdlib/tst-strtol.c @@ -18,6 +18,7 @@ struct ltest }; static CONST struct ltest tests[] = { +#if ~0UL == 0xffffffff /* First, signed numbers. */ { " -17", -17, 0, 0, 0 }, { " +0x123fg", 0x123f, 0, 'g', 0 }, @@ -40,6 +41,35 @@ static CONST struct ltest tests[] = { "-0x123456789", 0xffffffff, 0, 0, ERANGE }, { "-0xfedcba98", -0xfedcba98, 0, 0, 0 }, { NULL, 0, 0, 0, 0 }, +#else + /* assume 64 bit long... */ + + /* First, signed numbers. */ + { " -17", -17, 0, 0, 0 }, + { " +0x123fg", 0x123f, 0, 'g', 0 }, + { "2147483647", 2147483647, 0, 0, 0 }, + { "9223372036854775807", 9223372036854775807, 0, 0, 0 }, + { "9223372036854775808", 9223372036854775807, 0, 0, ERANGE }, + { "922337203685477580777", 9223372036854775807, 0, 0, ERANGE }, + { "9223372036854775810", 9223372036854775807, 0, 0, ERANGE }, + { "-2147483648", -2147483648, 0, 0, 0 }, + { "-9223372036854775808", -9223372036854775808, 0, 0, 0 }, + { "-9223372036854775809", -9223372036854775808, 0, 0, ERANGE }, + { "0123", 0123, 0, 0, 0 }, + { "0x112233445566778899z", 9223372036854775807, 16, 'z', ERANGE }, + { "0x0xc", 0, 0, 'x', 0 }, + { "yz!", 34*36+35, 36, '!', 0 }, + { NULL, 0, 0, 0, 0 }, + + /* Then unsigned. */ + { " 0", 0, 0, 0, 0 }, + { "0xffffffffg", 0xffffffff, 0, 'g', 0 }, + { "0xffffffffffffffffg", 0xffffffffffffffff, 0, 'g', 0 }, + { "0xf1f2f3f4f5f6f7f8f9", 0xffffffffffffffff, 0, 0, ERANGE }, + { "-0x123456789abcdef01", 0xffffffffffffffff, 0, 0, ERANGE }, + { "-0xfedcba987654321", -0xfedcba987654321, 0, 0, 0 }, + { NULL, 0, 0, 0, 0 }, +#endif }; static void EXFUN(expand, (char *dst, int c)); -- cgit v1.1