X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=c861285a8ab12c3c73720e357679ec84d4bc8269;hb=92db01802459e4913d32683c27e8b5cea2d9c2b2;hp=50410ea7e0a1bce920a2bb3ce3b968d602f929de;hpb=e00292b5adf2b85eb1c6e2399159b5c28fde48eb;p=c11tester.git

diff --git a/common.h b/common.h
index 50410ea7..c861285a 100644
--- a/common.h
+++ b/common.h
@@ -8,8 +8,12 @@
 #include <stdio.h>
 #include "config.h"
 
+extern FILE *model_out;
+
+#define model_print(fmt, ...) do { fprintf(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 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
@@ -20,6 +24,7 @@
 
 void assert_hook(void);
 
+#ifdef CONFIG_ASSERT
 #define ASSERT(expr) \
 do { \
 	if (!(expr)) { \
@@ -30,6 +35,10 @@ do { \
 		exit(EXIT_FAILURE); \
 	} \
 } while (0)
+#else
+#define ASSERT(expr) \
+	do { } while (0)
+#endif /* CONFIG_ASSERT */
 
 #define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)