-#define PSI_CALC_OP(var) res->var = PSI_CALC(v1->var, v2->var)
-#define PSI_CALC_OP2(vres, var1, var2) res->vres = PSI_CALC(v1->var1, v2->var2)
+#define PRIfval "f"
+#define PRIdval "lf"
+
+#define PSI_CALC_OP(var) do { \
+ const char *fmt = "calc: %" PRI##var ", %" PRI##var ": %" PRI##var "\n"; \
+ res->var = PSI_CALC(v1->var, v2->var); \
+ /*fprintf(stderr, fmt, v1->var, v2->var, res->var);*/ \
+} while (0)
+#define PSI_CALC_OP2(vres, var1, var2) do { \
+ const char *fmt = "calc: %" PRI##var1 ", %" PRI##var2 ": %" PRI##vres "\n"; \
+ res->vres = PSI_CALC(v1->var1, v2->var2); \
+ /*fprintf(stderr, fmt, v1->var1, v2->var2, res->vres);*/ \
+} while(0)