aboutsummaryrefslogtreecommitdiffstats
path: root/test/monniaux/bitsliced-tea
diff options
context:
space:
mode:
authorDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2020-04-20 14:06:21 +0200
committerDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2020-04-20 14:06:21 +0200
commit168393089024b5f926836cb813fddf14e6b6e4d4 (patch)
tree5d018198dc26be847544f162b87ad3dcecbab479 /test/monniaux/bitsliced-tea
parent633b72565b022f159526338b5bbb9fcac86dfd2b (diff)
parentb3431b1d9ee5121883d307cff0b62b7e53369891 (diff)
downloadcompcert-kvx-168393089024b5f926836cb813fddf14e6b6e4d4.tar.gz
compcert-kvx-168393089024b5f926836cb813fddf14e6b6e4d4.zip
Merge remote-tracking branch 'origin/mppa-work' into mppa-fast-div
(unfinished)
Diffstat (limited to 'test/monniaux/bitsliced-tea')
-rw-r--r--test/monniaux/bitsliced-tea/Makefile3
-rw-r--r--test/monniaux/bitsliced-tea/bstea.h11
-rw-r--r--test/monniaux/bitsliced-tea/make.proto4
3 files changed, 4 insertions, 14 deletions
diff --git a/test/monniaux/bitsliced-tea/Makefile b/test/monniaux/bitsliced-tea/Makefile
new file mode 100644
index 00000000..02b35381
--- /dev/null
+++ b/test/monniaux/bitsliced-tea/Makefile
@@ -0,0 +1,3 @@
+TARGET=bitsliced-tea
+
+include ../rules.mk
diff --git a/test/monniaux/bitsliced-tea/bstea.h b/test/monniaux/bitsliced-tea/bstea.h
index 9ca4f776..15607464 100644
--- a/test/monniaux/bitsliced-tea/bstea.h
+++ b/test/monniaux/bitsliced-tea/bstea.h
@@ -5,17 +5,8 @@
#include <limits.h>
#include "bstea_wordsize.h"
-#include "../ternary.h"
-/*
+
#define TERNARY(x, v1, v0) ((x) ? (v1) : (v0))
-*/
-#if __BSTEA_WORDSIZE==64
-#define TERNARY(x, v1, v0) TERNARY64(x, v1, v0)
-#elif __BSTEA_WORDSIZE==32
-#define TERNARY(x, v1, v0) TERNARY32(x, v1, v0)
-#else
-#error What is the bit size !?
-#endif
#define TEA_ROUNDS 32
diff --git a/test/monniaux/bitsliced-tea/make.proto b/test/monniaux/bitsliced-tea/make.proto
deleted file mode 100644
index 6cdc0814..00000000
--- a/test/monniaux/bitsliced-tea/make.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-objdeps: [{name: bstea_run, compiler: gcc}]
-target: bstea
-name: bitsliced-tea
-measures: [cycles]