Since we have now builtin search paths, we need to be able to forget them,

[cc65] / samples / sieve.c

diff --git a/samples/sieve.c b/samples/sieve.c
index cb6783c935ad4e997fdb76c928301b7c439a1451..7294954dccf7f52bf7245076676067fc888f667c 100644 (file)
--- a/samples/sieve.c
+++ b/samples/sieve.c
@@ -18,8 +18,8 @@
 
 
 
-#define COUNT          8192            /* Up to what number? */
-#define SQRT_COUNT     91              /* Sqrt of COUNT */
+#define COUNT          16384           /* Up to what number? */
+#define SQRT_COUNT     128             /* Sqrt of COUNT */
 
 static unsigned char Sieve[COUNT];
 
@@ -35,10 +35,20 @@ static unsigned char Sieve[COUNT];
 
 
 
+static char ReadUpperKey (void)
+/* Read a key from console, convert to upper case and return */
+{
+    return toupper (cgetc ());
+}
+
+
+
 int main (void)
 {
     /* Clock variable */
     clock_t Ticks;
+    unsigned Sec;
+    unsigned Milli;
 
     /* This is an example where register variables make sense */
     register unsigned char* S;
@@ -58,7 +68,8 @@ int main (void)
     while (I < SQRT_COUNT) {
        if (Sieve[I] == 0) {
            /* Prime number - mark multiples */
-           S = &Sieve[J = I*2];
+            J = I*2;
+           S = &Sieve[J];
                    while (J < COUNT) {
                *S = 1;
                S += I;
@@ -70,19 +81,29 @@ int main (void)
 
     /* Calculate the time used */
     Ticks = clock() - Ticks;
+    Sec = (unsigned) (Ticks / CLOCKS_PER_SEC);
+    Milli = ((Ticks % CLOCKS_PER_SEC) * 1000) / CLOCKS_PER_SEC;
 
     /* Print the time used */
-    printf ("Time used: %lu ticks\n", Ticks);
-    printf ("Press Q to quit, any other key for list\n");
+    printf ("Time used: %u.%03u seconds\n", Sec, Milli);
+    printf ("Q to quit, any other key for list\n");
 
     /* Wait for a key and print the list if not 'Q' */
-    if (toupper (cgetc()) != 'Q') {
+    if (ReadUpperKey () != 'Q') {
        /* Print the result */
+        J = 0;
        for (I = 2; I < COUNT; ++I) {
            if (Sieve[I] == 0) {
-               printf ("%4d\n", I);
+               printf ("%4d\n", I);
+                if (++J == 23) {
+                    printf ("Q to quit, any other key continues\n");
+                    if (ReadUpperKey () == 'Q') {
+                        break;
+                    }
+                    J = 0;
+                }
            }
-           if (kbhit() && toupper (cgetc()) == 'Q') {
+                   if (kbhit() && ReadUpperKey == 'Q') {
                break;
            }
        }