Some renaming to avoid spurious warnings on some old GCC versions.

This commit is contained in:
Thomas Pornin 2017-08-14 14:15:13 +02:00
parent ceb6ded7b9
commit 79eec9d9e3
5 changed files with 26 additions and 16 deletions

View file

@ -423,17 +423,17 @@ mul_f256(uint32_t *d, const uint32_t *a, const uint32_t *b)
} }
for (i = 17; i >= 9; i --) { for (i = 17; i >= 9; i --) {
uint64_t x; uint64_t y;
x = s[i]; y = s[i];
s[i - 1] += ARSHW(x, 2); s[i - 1] += ARSHW(y, 2);
s[i - 2] += (x << 28) & 0x3FFFFFFF; s[i - 2] += (y << 28) & 0x3FFFFFFF;
s[i - 2] -= ARSHW(x, 4); s[i - 2] -= ARSHW(y, 4);
s[i - 3] -= (x << 26) & 0x3FFFFFFF; s[i - 3] -= (y << 26) & 0x3FFFFFFF;
s[i - 5] -= ARSHW(x, 10); s[i - 5] -= ARSHW(y, 10);
s[i - 6] -= (x << 20) & 0x3FFFFFFF; s[i - 6] -= (y << 20) & 0x3FFFFFFF;
s[i - 8] += ARSHW(x, 16); s[i - 8] += ARSHW(y, 16);
s[i - 9] += (x << 14) & 0x3FFFFFFF; s[i - 9] += (y << 14) & 0x3FFFFFFF;
} }
/* /*

View file

@ -134,11 +134,11 @@ br_i15_modpow_opt(uint16_t *x,
br_i15_zero(t2, m[0]); br_i15_zero(t2, m[0]);
base = t2 + mwlen; base = t2 + mwlen;
for (u = 1; u < ((uint32_t)1 << k); u ++) { for (u = 1; u < ((uint32_t)1 << k); u ++) {
uint32_t m; uint32_t mask;
m = -EQ(u, bits); mask = -EQ(u, bits);
for (v = 1; v < mwlen; v ++) { for (v = 1; v < mwlen; v ++) {
t2[v] |= m & base[v]; t2[v] |= mask & base[v];
} }
base += mwlen; base += mwlen;
} }

View file

@ -134,11 +134,11 @@ br_i31_modpow_opt(uint32_t *x,
br_i31_zero(t2, m[0]); br_i31_zero(t2, m[0]);
base = t2 + mwlen; base = t2 + mwlen;
for (u = 1; u < ((uint32_t)1 << k); u ++) { for (u = 1; u < ((uint32_t)1 << k); u ++) {
uint32_t m; uint32_t mask;
m = -EQ(u, bits); mask = -EQ(u, bits);
for (v = 1; v < mwlen; v ++) { for (v = 1; v < mwlen; v ++) {
t2[v] |= m & base[v]; t2[v] |= mask & base[v];
} }
base += mwlen; base += mwlen;
} }

View file

@ -222,8 +222,13 @@ void br_x509_minimal_run(void *t0ctx);
#include <windows.h> #include <windows.h>
#endif #endif
/*
* The T0 compiler will produce these prototypes declarations in the
* header.
*
void br_x509_minimal_init_main(void *ctx); void br_x509_minimal_init_main(void *ctx);
void br_x509_minimal_run(void *ctx); void br_x509_minimal_run(void *ctx);
*/
/* see bearssl_x509.h */ /* see bearssl_x509.h */
void void

View file

@ -171,8 +171,13 @@ preamble {
#include <windows.h> #include <windows.h>
#endif #endif
/*
* The T0 compiler will produce these prototypes declarations in the
* header.
*
void br_x509_minimal_init_main(void *ctx); void br_x509_minimal_init_main(void *ctx);
void br_x509_minimal_run(void *ctx); void br_x509_minimal_run(void *ctx);
*/
/* see bearssl_x509.h */ /* see bearssl_x509.h */
void void