X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/a65a873e56c35780711e9f73872c4fe0254589b0..7aac7a7e5d525d103439a884f659f2b5070ee394:/primes/primes.c diff --git a/primes/primes.c b/primes/primes.c index 868d994f..a022aa96 100644 --- a/primes/primes.c +++ b/primes/primes.c @@ -1,4 +1,4 @@ -/* $NetBSD: primes.c,v 1.5 1995/04/24 12:24:47 cgd Exp $ */ +/* $NetBSD: primes.c,v 1.22 2018/02/03 15:40:29 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -36,33 +32,33 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; +__COPYRIGHT("@(#) Copyright (c) 1989, 1993\ + The Regents of the University of California. All rights reserved."); #endif /* not lint */ #ifndef lint #if 0 -static char sccsid[] = "@(#)primes.c 8.4 (Berkeley) 3/21/94"; +static char sccsid[] = "@(#)primes.c 8.5 (Berkeley) 5/10/95"; #else -static char rcsid[] = "$NetBSD: primes.c,v 1.5 1995/04/24 12:24:47 cgd Exp $"; +__RCSID("$NetBSD: primes.c,v 1.22 2018/02/03 15:40:29 christos Exp $"); #endif #endif /* not lint */ /* * primes - generate a table of primes between two values * - * By: Landon Curt Noll chongo@toad.com, ...!{sun,tolsoft}!hoptoad!chongo - * - * chongo /\oo/\ + * By Landon Curt Noll, http://www.isthe.com/chongo/index.html /\oo/\ * * usage: - * primes [start [stop]] + * primes [-dh] [start [stop]] * * Print primes >= start and < stop. If stop is omitted, - * the value 4294967295 (2^32-1) is assumed. If start is + * the value SPSPMAX is assumed. If start is * omitted, start is read from standard input. + * -d: print difference to previous prime, e.g. 3 (1) + * -h: print primes in hexadecimal * * validation check: there are 664579 primes between 0 and 10^7 */ @@ -70,11 +66,13 @@ static char rcsid[] = "$NetBSD: primes.c,v 1.5 1995/04/24 12:24:47 cgd Exp $"; #include #include #include +#include #include #include -#include #include #include +#include +#include #include "primes.h" @@ -83,45 +81,35 @@ static char rcsid[] = "$NetBSD: primes.c,v 1.5 1995/04/24 12:24:47 cgd Exp $"; * * We only sieve the odd numbers. The base of our sieve windows are always * odd. If the base of table is 1, table[i] represents 2*i-1. After the - * sieve, table[i] == 1 if and only iff 2*i-1 is prime. + * sieve, table[i] == 1 if and only if 2*i-1 is prime. * * We make TABSIZE large to reduce the overhead of inner loop setup. */ -char table[TABSIZE]; /* Eratosthenes sieve of odd numbers */ +static char table[TABSIZE]; /* Eratosthenes sieve of odd numbers */ -/* - * prime[i] is the (i-1)th prime. - * - * We are able to sieve 2^32-1 because this byte table yields all primes - * up to 65537 and 65537^2 > 2^32-1. - */ -extern ubig prime[]; -extern ubig *pr_limit; /* largest prime in the prime array */ +static int dflag, hflag; -/* - * To avoid excessive sieves for small factors, we use the table below to - * setup our sieve blocks. Each element represents a odd number starting - * with 1. All non-zero elements are factors of 3, 5, 7, 11 and 13. - */ -extern char pattern[]; -extern int pattern_size; /* length of pattern array */ +static void primes(uint64_t, uint64_t); +static uint64_t read_num_buf(void); +static void usage(void) __dead; -void primes __P((ubig, ubig)); -ubig read_num_buf __P((void)); -void usage __P((void)); int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { - ubig start; /* where to start generating */ - ubig stop; /* don't generate at or above this value */ + uint64_t start; /* where to start generating */ + uint64_t stop; /* don't generate at or above this value */ int ch; char *p; - while ((ch = getopt(argc, argv, "")) != EOF) + while ((ch = getopt(argc, argv, "dh")) != -1) switch (ch) { + case 'd': + dflag++; + break; + case 'h': + hflag++; + break; case '?': default: usage(); @@ -130,10 +118,10 @@ main(argc, argv) argv += optind; start = 0; - stop = BIG; + stop = (uint64_t)(-1); /* - * Convert low and high args. Strtoul(3) sets errno to + * Convert low and high args. Strtoumax(3) sets errno to * ERANGE if the number is too large, but, if there's * a leading minus sign it returns the negation of the * result of the conversion, which we'd rather disallow. @@ -145,14 +133,14 @@ main(argc, argv) errx(1, "negative numbers aren't permitted."); errno = 0; - start = strtoul(argv[0], &p, 10); + start = strtoumax(argv[0], &p, 0); if (errno) err(1, "%s", argv[0]); if (*p != '\0') errx(1, "%s: illegal numeric format.", argv[0]); errno = 0; - stop = strtoul(argv[1], &p, 10); + stop = strtoumax(argv[1], &p, 0); if (errno) err(1, "%s", argv[1]); if (*p != '\0') @@ -164,7 +152,7 @@ main(argc, argv) errx(1, "negative numbers aren't permitted."); errno = 0; - start = strtoul(argv[0], &p, 10); + start = strtoumax(argv[0], &p, 0); if (errno) err(1, "%s", argv[0]); if (*p != '\0') @@ -180,18 +168,18 @@ main(argc, argv) if (start > stop) errx(1, "start value must be less than stop value."); primes(start, stop); - exit(0); + return (0); } /* * read_num_buf -- - * This routine returns a number n, where 0 <= n && n <= BIG. + * This routine returns a number n, where 0 <= n && n <= ULONG_MAX. */ -ubig -read_num_buf() +static uint64_t +read_num_buf(void) { - ubig val; - char *p, buf[100]; /* > max number of digits. */ + uint64_t val; + char *p, buf[LINE_MAX]; /* > max number of digits. */ for (;;) { if (fgets(buf, sizeof(buf), stdin) == NULL) { @@ -199,13 +187,13 @@ read_num_buf() err(1, "stdin"); exit(0); } - for (p = buf; isblank(*p); ++p); + for (p = buf; isblank((unsigned char)*p); ++p); if (*p == '\n' || *p == '\0') continue; if (*p == '-') errx(1, "negative numbers aren't permitted."); errno = 0; - val = strtoul(buf, &p, 10); + val = strtoumax(buf, &p, 0); if (errno) err(1, "%s", buf); if (*p != '\n') @@ -217,27 +205,27 @@ read_num_buf() /* * primes - sieve and print primes from start up to and but not including stop */ -void -primes(start, stop) - ubig start; /* where to start generating */ - ubig stop; /* don't generate at or above this value */ +static void +primes(uint64_t start, uint64_t stop) { - register char *q; /* sieve spot */ - register ubig factor; /* index and factor */ - register char *tab_lim; /* the limit to sieve on the table */ - register ubig *p; /* prime table pointer */ - register ubig fact_lim; /* highest prime for current block */ + char *q; /* sieve spot */ + uint64_t factor; /* index and factor */ + char *tab_lim; /* the limit to sieve on the table */ + const uint64_t *p; /* prime table pointer */ + uint64_t fact_lim; /* highest prime for current block */ + uint64_t mod; /* temp storage for mod */ + uint64_t prev = 0; /* * A number of systems can not convert double values into unsigned * longs when the values are larger than the largest signed value. - * We don't have this problem, so we can go all the way to BIG. + * We don't have this problem, so we can go all the way to ULONG_MAX. */ if (start < 3) { - start = (ubig)2; + start = 2; } if (stop < 3) { - stop = (ubig)2; + stop = 2; } if (stop <= start) { return; @@ -261,8 +249,13 @@ primes(start, stop) for (p = &prime[0], factor = prime[0]; factor < stop && p <= pr_limit; factor = *(++p)) { if (factor >= start) { - printf("%u\n", factor); + printf(hflag ? "%" PRIx64 : "%" PRIu64, factor); + if (dflag) { + printf(" (%" PRIu64 ")", factor - prev); + } + putchar('\n'); } + prev = factor; } /* return early if we are done */ if (p <= pr_limit) { @@ -296,43 +289,52 @@ primes(start, stop) /* note highest useful factor and sieve spot */ if (stop-start > TABSIZE+TABSIZE) { tab_lim = &table[TABSIZE]; /* sieve it all */ - fact_lim = (int)sqrt( - (double)(start)+TABSIZE+TABSIZE+1.0); + fact_lim = sqrt(start+1.0+TABSIZE+TABSIZE); } else { tab_lim = &table[(stop-start)/2]; /* partial sieve */ - fact_lim = (int)sqrt((double)(stop)+1.0); + fact_lim = sqrt(stop+1.0); } /* sieve for factors >= 17 */ factor = 17; /* 17 is first prime to use */ p = &prime[7]; /* 19 is next prime, pi(19)=7 */ do { /* determine the factor's initial sieve point */ - q = (char *)(start%factor); /* temp storage for mod */ - if ((long)q & 0x1) { - q = &table[(factor-(long)q)/2]; + mod = start%factor; + if (mod & 0x1) { + q = &table[(factor-mod)/2]; } else { - q = &table[q ? factor-((long)q/2) : 0]; + q = &table[mod ? factor-(mod/2) : 0]; } - /* sive for our current factor */ + /* sieve for our current factor */ for ( ; q < tab_lim; q += factor) { *q = '\0'; /* sieve out a spot */ } - } while ((factor=(ubig)(*(p++))) <= fact_lim); + factor = *p++; + } while (factor <= fact_lim); /* * print generated primes */ for (q = table; q < tab_lim; ++q, start+=2) { if (*q) { - printf("%u\n", start); + if (start > SIEVEMAX) { + if (!isprime(start)) + continue; + } + printf(hflag ? "%" PRIx64 : "%" PRIu64, start); + if (dflag && (prev || (start <= *pr_limit))) { + printf(" (%" PRIu64 ")", start - prev); + } + putchar('\n'); + prev = start; } } } } -void -usage() +static void +usage(void) { - (void)fprintf(stderr, "usage: primes [start [stop]]\n"); + (void)fprintf(stderr, "usage: primes [-dh] [start [stop]]\n"); exit(1); }