Merge branch 'mppa-work' into mppa_k1c

4 files changed, 57 insertions, 1 deletions

diff --git a/test/monniaux/bitfields/bitfields.c b/test/monniaux/bitfields/bitfields.c
index 868d7483..16ad5a61 100644
--- a/test/monniaux/bitfields/bitfields.c
+++ b/test/monniaux/bitfields/bitfields.c
@@ -4,8 +4,18 @@ struct fields {
   unsigned f0 : 3;
   unsigned f1 : 5;
   signed f2 : 3;
+  unsigned toto1: 16;
+  unsigned toto2: 16;
 };
 
+unsigned get_toto1(struct fields x) {
+  return x.toto1;
+}
+
+unsigned get_toto2(struct fields x) {
+  return x.toto2;
+}
+
 int get_f1(struct fields x) {
   return x.f1;
 }
@@ -14,7 +24,13 @@ int get_f2(struct fields x) {
   return x.f2;
 }
 
+void set_f1(struct fields *x, unsigned v) {
+  x->f1 = v;
+}
+
 int main() {
   struct fields x = {1, 2, -1};
   printf("%d %d\n", get_f1(x), get_f2(x));
+  set_f1(&x, 4);
+  printf("%d %d\n", get_f1(x), get_f2(x));
 }
diff --git a/test/monniaux/bitfields/bitfields_long.c b/test/monniaux/bitfields/bitfields_long.c
new file mode 100644
index 00000000..93bba8d0
--- /dev/null
+++ b/test/monniaux/bitfields/bitfields_long.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include <stdint.h>
+
+#define GET_FIELD_L(x, stop, start) (((x) << (63-(stop))) >> (63-(stop)+(start)))
+#define FIELD_MASK(stop, start) ((1ULL<<(stop)) - (1ULL<<(start)) + (1ULL<<(stop)))
+
+#define SET_FIELD_L(x, stop, start, y) (((x) & ~FIELD_MASK(stop, start)) | ((y << start) & FIELD_MASK(stop, start)))
+
+uint64_t get_f2(uint64_t x) {
+  return GET_FIELD_L(x, 47, 16);
+}
+
+uint64_t set_f2(uint64_t x, uint64_t y) {
+  return SET_FIELD_L(x, 47, 16, y);
+}
+
+int main() {
+  printf("%lx %lx\n", FIELD_MASK(47, 16), set_f2(0x12345678ABCD1234ULL, 0x11112222ULL));
+}
diff --git a/test/monniaux/ocaml/config/Makefile b/test/monniaux/ocaml/config/Makefile
index 8fa72626..26b14670 100644
--- a/test/monniaux/ocaml/config/Makefile
+++ b/test/monniaux/ocaml/config/Makefile
@@ -22,7 +22,7 @@ X11_LINK=-lX11
 LIBBFD_LINK=
 LIBBFD_INCLUDE=
 # DM CC=k1-mbr-gcc
-CC=/home/monniaux/work/Kalray/CompCert/ccomp
+CC=/home/monniaux/work/Kalray/mppa-xsaddr/ccomp
 CPP=$(CC) -E
 CFLAGS=-O -Wall -fall
 # DM CFLAGS=-O3 -Wall
diff --git a/test/monniaux/regalloc/bigspill.c b/test/monniaux/regalloc/bigspill.c
new file mode 100644
index 00000000..6191e018
--- /dev/null
+++ b/test/monniaux/regalloc/bigspill.c
@@ -0,0 +1,21 @@
+extern void callee(void);
+
+void bigspill(int *t) {
+  int t0 = t[0];
+  int t1 = t[1];
+  int t2 = t[2];
+  int t3 = t[3];
+  int t4 = t[4];
+  int t5 = t[5];
+  int t6 = t[6];
+  int t7 = t[7];
+  callee();
+  t[0] = t0;
+  t[1] = t1;
+  t[2] = t2;
+  t[3] = t3;
+  t[4] = t4;
+  t[5] = t5;
+  t[6] = t6;
+  t[7] = t7;
+}