2 files changed, 35 insertions, 0 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));
+}