Commit 6a268ef463853fc695d5ee7cebaef70a60ca84ca
2017-10-15T12:01:52
Merge branch 'fix/54' into develop This closes #54
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
diff --git a/demo/timing.c b/demo/timing.c
index 2488eb4..9846565 100644
--- a/demo/timing.c
+++ b/demo/timing.c
@@ -1,7 +1,7 @@
#include <tommath.h>
#include <time.h>
#include <unistd.h>
-#include <stdint.h>
+#include <inttypes.h>
uint64_t _tt;
@@ -122,7 +122,7 @@ int main(void)
sleep(1);
CLK_PER_SEC = TIMFUNC() - CLK_PER_SEC;
- printf("CLK_PER_SEC == %llu\n", CLK_PER_SEC);
+ printf("CLK_PER_SEC == %" PRIu64 "\n", CLK_PER_SEC);
log = FOPEN("logs/add.log", "w");
for (cnt = 8; cnt <= 128; cnt += 8) {
SLEEP;
@@ -137,9 +137,9 @@ int main(void)
if (tt > gg)
tt = gg;
} while (++rr < 100000);
- printf("Adding\t\t%4d-bit => %9llu/sec, %9llu cycles\n",
+ printf("Adding\t\t%4d-bit => %9" PRIu64 "/sec, %9" PRIu64 " cycles\n",
mp_count_bits(&a), CLK_PER_SEC / tt, tt);
- FPRINTF(log, "%d %9llu\n", cnt * DIGIT_BIT, tt);
+ FPRINTF(log, "%d %9" PRIu64 "\n", cnt * DIGIT_BIT, tt);
FFLUSH(log);
}
FCLOSE(log);
@@ -159,9 +159,9 @@ int main(void)
tt = gg;
} while (++rr < 100000);
- printf("Subtracting\t\t%4d-bit => %9llu/sec, %9llu cycles\n",
+ printf("Subtracting\t\t%4d-bit => %9" PRIu64 "/sec, %9" PRIu64 " cycles\n",
mp_count_bits(&a), CLK_PER_SEC / tt, tt);
- FPRINTF(log, "%d %9llu\n", cnt * DIGIT_BIT, tt);
+ FPRINTF(log, "%d %9" PRIu64 "\n", cnt * DIGIT_BIT, tt);
FFLUSH(log);
}
FCLOSE(log);
@@ -194,9 +194,9 @@ int main(void)
if (tt > gg)
tt = gg;
} while (++rr < 100);
- printf("Multiplying\t%4d-bit => %9llu/sec, %9llu cycles\n",
+ printf("Multiplying\t%4d-bit => %9" PRIu64 "/sec, %9" PRIu64 " cycles\n",
mp_count_bits(&a), CLK_PER_SEC / tt, tt);
- FPRINTF(log, "%d %9llu\n", mp_count_bits(&a), tt);
+ FPRINTF(log, "%d %9" PRIu64 "\n", mp_count_bits(&a), tt);
FFLUSH(log);
}
FCLOSE(log);
@@ -214,9 +214,9 @@ int main(void)
if (tt > gg)
tt = gg;
} while (++rr < 100);
- printf("Squaring\t%4d-bit => %9llu/sec, %9llu cycles\n",
+ printf("Squaring\t%4d-bit => %9" PRIu64 "/sec, %9" PRIu64 " cycles\n",
mp_count_bits(&a), CLK_PER_SEC / tt, tt);
- FPRINTF(log, "%d %9llu\n", mp_count_bits(&a), tt);
+ FPRINTF(log, "%d %9" PRIu64 "\n", mp_count_bits(&a), tt);
FFLUSH(log);
}
FCLOSE(log);
@@ -290,10 +290,10 @@ int main(void)
draw(&d);
exit(0);
}
- printf("Exponentiating\t%4d-bit => %9llu/sec, %9llu cycles\n",
+ printf("Exponentiating\t%4d-bit => %9" PRIu64 "/sec, %9" PRIu64 " cycles\n",
mp_count_bits(&a), CLK_PER_SEC / tt, tt);
FPRINTF(n < 4 ? logd : (n < 9) ? logc : (n < 16) ? logb : log,
- "%d %9llu\n", mp_count_bits(&a), tt);
+ "%d %9" PRIu64 "\n", mp_count_bits(&a), tt);
}
}
FCLOSE(log);
@@ -326,9 +326,9 @@ int main(void)
printf("Failed to invert\n");
return 0;
}
- printf("Inverting mod\t%4d-bit => %9llu/sec, %9llu cycles\n",
+ printf("Inverting mod\t%4d-bit => %9" PRIu64 "/sec, %9" PRIu64 " cycles\n",
mp_count_bits(&a), CLK_PER_SEC / tt, tt);
- FPRINTF(log, "%d %9llu\n", cnt * DIGIT_BIT, tt);
+ FPRINTF(log, "%d %9" PRIu64 "\n", cnt * DIGIT_BIT, tt);
}
FCLOSE(log);