diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-05-30 00:27:52 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-05-30 00:27:52 +0200 |
| commit | cea008aa07715cf7abbc88f7573050f5a05f58d7 (patch) | |
| tree | 93ab765c8e1e242dd97eaace9b0bb0487e6ac4d2 /test/monniaux/bitsliced-aes | |
| parent | b557706f77ca4cf0721dfb4d911207a2fae12411 (diff) | |
| parent | 26428dbaa2f3fec4b8fd121fc6e53a22a5cc5c5d (diff) | |
| download | compcert-kvx-cea008aa07715cf7abbc88f7573050f5a05f58d7.tar.gz compcert-kvx-cea008aa07715cf7abbc88f7573050f5a05f58d7.zip | |
Merge remote-tracking branch 'origin/mppa-msub' into mppa-work
Conflicts:
mppa_k1c/ExtValues.v
Diffstat (limited to 'test/monniaux/bitsliced-aes')
| -rw-r--r-- | test/monniaux/bitsliced-aes/bs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/monniaux/bitsliced-aes/bs.c b/test/monniaux/bitsliced-aes/bs.c index 083a8fc5..3132e1d9 100644 --- a/test/monniaux/bitsliced-aes/bs.c +++ b/test/monniaux/bitsliced-aes/bs.c @@ -3,7 +3,11 @@ #include "bs.h" #include "../ternary.h" +/* TEMPORARY */ +#define TERNARY(x, v0, v1) ((x) ? (v0) : (v1)) +/* #define TERNARY(x, v0, v1) TERNARY64(x, v1, v0) +*/ #if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) ||\ defined(__amd64__) || defined(__amd32__)|| defined(__amd16__) |