X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=common.h;h=367dc6b2b00098b9380e400bea68e69771f91e8c;hp=2dc8b7d9e8e59457fd4bfee6b850af028414d9c9;hb=c108b7d5709061ced258f5106ac67ada91242fc3;hpb=bd893aac350f125dc990f0ccd32b8e3cf133e2fb

diff --git a/common.h b/common.h
index 2dc8b7d9..367dc6b2 100644
--- a/common.h
+++ b/common.h
@@ -8,9 +8,13 @@
 #include <stdio.h>
 #include "config.h"
 
+extern int model_out;
+
+#define model_print(fmt, ...) do { dprintf(model_out, fmt, ##__VA_ARGS__); } while (0)
+
 #ifdef CONFIG_DEBUG
-#define DEBUG(fmt, ...) do { printf("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
-#define DBG() DEBUG("\n");
+#define DEBUG(fmt, ...) do { model_print("*** %15s:%-4d %25s() *** " fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); } while (0)
+#define DBG() DEBUG("\n")
 #define DBG_ENABLED() (1)
 #else
 #define DEBUG(fmt, ...)
@@ -18,19 +22,24 @@
 #define DBG_ENABLED() (0)
 #endif
 
+void assert_hook(void);
+
+#ifdef CONFIG_ASSERT
 #define ASSERT(expr) \
 do { \
 	if (!(expr)) { \
 		fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \
 		print_trace(); \
-		model_print_summary(); \
+		assert_hook();				 \
 		exit(EXIT_FAILURE); \
 	} \
-} while (0);
+} while (0)
+#else
+#define ASSERT(expr) \
+	do { } while (0)
+#endif /* CONFIG_ASSERT */
 
 #define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
 void print_trace(void);
-void model_print_summary(void);
-
 #endif /* __COMMON_H__ */