X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=1071135892ac11508c52459eee99e8d8da3ab254;hb=5178739a27add5e59a1213c9ac90e73397c1a23d;hp=003dc805e180e5cc2c790329ec042ef66d6d120f;hpb=9cadc8ddfd0b4597daab0bceb6a80cdac4cfffb4;p=model-checker.git

diff --git a/common.h b/common.h
index 003dc80..1071135 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, ...)
@@ -20,6 +24,7 @@
 
 void assert_hook(void);
 
+#ifdef CONFIG_ASSERT
 #define ASSERT(expr) \
 do { \
 	if (!(expr)) { \
@@ -29,7 +34,11 @@ do { \
 		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__)