X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=62c16f45250e55a693864fd17759b9673d0220d6;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=656ea3798dde73d08b168fdfe54f5d4c72dcc04d;hpb=70c3b7833efcbe08999f135201119f107259026a;p=model-checker.git

diff --git a/common.h b/common.h
index 656ea37..62c16f4 100644
--- a/common.h
+++ b/common.h
@@ -1,17 +1,20 @@
+/** @file common.h
+ *  @brief General purpose macros.
+ */
+
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
 #include <stdio.h>
+#include "config.h"
 
-/*
-#ifndef CONFIG_DEBUG
-#define CONFIG_DEBUG
-#endif
-*/
+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, ...)
@@ -19,12 +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__); \
-		exit(1); \
+		/* print_trace(); // Trace printing may cause dynamic memory allocation */ \
+		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);
 #endif /* __COMMON_H__ */