diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-03-27 09:47:32 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-03-27 09:47:32 +0100 |
| commit | 86d7e48d92d602e2349032883b7b753bbea81a3c (patch) | |
| tree | 11f2faa378e1f4f308462e0365b236c73398ef5d /test/monniaux/bitsliced-aes | |
| parent | 3c47d54d4cf89f4e29854ac5ef51d8b4c1ca086b (diff) | |
| download | compcert-kvx-86d7e48d92d602e2349032883b7b753bbea81a3c.tar.gz compcert-kvx-86d7e48d92d602e2349032883b7b753bbea81a3c.zip | |
improvements on cmoved etc.
Diffstat (limited to 'test/monniaux/bitsliced-aes')
| -rw-r--r-- | test/monniaux/bitsliced-aes/bs.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/test/monniaux/bitsliced-aes/bs.c b/test/monniaux/bitsliced-aes/bs.c index 6c68e496..1fc046d1 100644 --- a/test/monniaux/bitsliced-aes/bs.c +++ b/test/monniaux/bitsliced-aes/bs.c @@ -19,8 +19,13 @@ static inline word_t compcert_ternary(word_t x, word_t v0, word_t v1) { /* with function call to ternary #define TERNARY0(cmp,v1) compcert_ternary(cmp, 0, v1) */ - +/* #define TERNARY0(x, v1) ((unsigned long) ((long) (-(((long) (x))!=0)) & (v1))) +#define TERNARY(x, v0, v1) \ + (((long) (-(((long) (x))==0)) & ((long) (v0))) | \ + ((long) (-(((long) (x))!=0)) & ((long) (v1)))) +*/ +#define TERNARY(x, v0, v1) compcert_ternary((x), (v0), (v1)) #if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) ||\ defined(__amd64__) || defined(__amd32__)|| defined(__amd16__) @@ -415,7 +420,9 @@ void bs_transpose_dst(word_t * transpose, word_t * blocks) for(j=0; j < WORD_SIZE; j++) { // TODO make const time - *(transptr++) |= TERNARY0((w & bitmask), bitpos); + word_t old = *transptr; + /* *(transptr++) = old | TERNARY0((w & bitmask), bitpos); */ + *(transptr++) = TERNARY(w & bitmask, old, old|bitpos); bitmask <<= 1; } #else @@ -514,8 +521,8 @@ void bs_transpose_rev(word_t * blocks) word_t bitmask = ONE; for(j=0; j < WORD_SIZE; j++) { - word_t bit = TERNARY0(w & bitmask, bitpos); - *transptr |= bit; + word_t old = *transptr; + *transptr = TERNARY(w & bitmask, old, old | bitpos); transptr += WORDS_PER_BLOCK; bitmask <<= 1; } |