2.1 --- a/tests/dstest_align.cc Thu Dec 01 17:55:12 2022 +0100
2.2 +++ b/tests/dstest_align.cc Fri Dec 02 00:48:55 2022 +0100
2.3 @@ -2,6 +2,7 @@
2.4 #include <stdint.h>
2.5 #include <systypes/format.h>
2.6
2.7 +#define FMTsize "%" pFMTsize "d"
2.8 #define FMT32x "%" pFMT32 "x"
2.9 #define FMT64x "%" pFMT64 "x"
2.10 #define OFFSET(obj, mem) ((char *) &(obj)->mem - (char *) obj)
2.11 @@ -38,21 +39,21 @@
2.12 struct A *ma = (struct A *) m;
2.13 struct A *ma1 = (struct A *) (m + 1);
2.14
2.15 - printf("a.a @ offset %d = " FMT32x "\n", OFFSET(&a, a), a.a);
2.16 - printf("a.b @ offset %d = " FMT64x "\n", OFFSET(&a, b), a.b);
2.17 - printf("a.c @ offset %d = " FMT64x "\n\n", OFFSET(&a, c), a.c);
2.18 - printf("b.a @ offset %d = " FMT32x "\n", OFFSET(&b, a), b.a);
2.19 - printf("b.b @ offset %d = " FMT64x "\n", OFFSET(&b, b), b.b);
2.20 - printf("b.c @ offset %d = " FMT64x "\n\n", OFFSET(&b, c), b.c);
2.21 - printf("c.a @ offset %d = " FMT32x "\n", OFFSET(&c, a), c.a);
2.22 - printf("c.b @ offset %d = " FMT32x "\n", OFFSET(&c, b), c.b);
2.23 - printf("c.c @ offset %d = " FMT64x "\n\n", OFFSET(&c, c), c.c);
2.24 - printf("ma.a @ offset %d = " FMT32x "\n", OFFSET(ma, a), ma->a);
2.25 - printf("ma.b @ offset %d = " FMT64x "\n", OFFSET(ma, b), ma->b);
2.26 - printf("ma.c @ offset %d = " FMT64x "\n\n", OFFSET(ma, c), ma->c);
2.27 - printf("ma1.a @ offset %d = " FMT32x "\n", OFFSET(ma1, a), ma1->a);
2.28 - printf("ma1.b @ offset %d = " FMT64x "\n", OFFSET(ma1, b), ma1->b);
2.29 - printf("ma1.c @ offset %d = " FMT64x "\n\n", OFFSET(ma1, c), ma1->c);
2.30 + printf("a.a @ offset " FMTsize " = " FMT32x "\n", OFFSET(&a, a), a.a);
2.31 + printf("a.b @ offset " FMTsize " = " FMT64x "\n", OFFSET(&a, b), a.b);
2.32 + printf("a.c @ offset " FMTsize " = " FMT64x "\n\n", OFFSET(&a, c), a.c);
2.33 + printf("b.a @ offset " FMTsize " = " FMT32x "\n", OFFSET(&b, a), b.a);
2.34 + printf("b.b @ offset " FMTsize " = " FMT64x "\n", OFFSET(&b, b), b.b);
2.35 + printf("b.c @ offset " FMTsize " = " FMT64x "\n\n", OFFSET(&b, c), b.c);
2.36 + printf("c.a @ offset " FMTsize " = " FMT32x "\n", OFFSET(&c, a), c.a);
2.37 + printf("c.b @ offset " FMTsize " = " FMT32x "\n", OFFSET(&c, b), c.b);
2.38 + printf("c.c @ offset " FMTsize " = " FMT64x "\n\n", OFFSET(&c, c), c.c);
2.39 + printf("ma.a @ offset " FMTsize " = " FMT32x "\n", OFFSET(ma, a), ma->a);
2.40 + printf("ma.b @ offset " FMTsize " = " FMT64x "\n", OFFSET(ma, b), ma->b);
2.41 + printf("ma.c @ offset " FMTsize " = " FMT64x "\n\n", OFFSET(ma, c), ma->c);
2.42 + printf("ma1.a @ offset " FMTsize " = " FMT32x "\n", OFFSET(ma1, a), ma1->a);
2.43 + printf("ma1.b @ offset " FMTsize " = " FMT64x "\n", OFFSET(ma1, b), ma1->b);
2.44 + printf("ma1.c @ offset " FMTsize " = " FMT64x "\n\n", OFFSET(ma1, c), ma1->c);
2.45
2.46 return 0;
2.47 }