X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=common.h;h=c861285a8ab12c3c73720e357679ec84d4bc8269;hp=3476f5379b721c167e9eec939c902c17aa175cc7;hb=6c69f716484f7a5acee72e0f02813fb98f4ac2ad;hpb=f60dc971069e7d4ceade8a1be52b4d42b69828df

diff --git a/common.h b/common.h
index 3476f53..c861285 100644
--- a/common.h
+++ b/common.h
@@ -1,13 +1,20 @@
+/** @file common.h
+ *  @brief General purpose macros.
+ */
+
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
 #include <stdio.h>
+#include "config.h"
+
+extern FILE *model_out;
 
-//#define CONFIG_DEBUG
+#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 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, ...)
@@ -15,19 +22,26 @@
 #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(); \
+		model_print_summary(); \
+		assert_hook();				 \
+		exit(EXIT_FAILURE); \
 	} \
-} while (0);
-
-
-void * myMalloc(size_t size);
-void myFree(void *ptr);
+} while (0)
+#else
+#define ASSERT(expr) \
+	do { } while (0)
+#endif /* CONFIG_ASSERT */
 
-#define userMalloc(size)	malloc(size)
-#define userFree(ptr)		free(ptr)
+#define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
+void print_trace(void);
+void model_print_summary(void);
 #endif /* __COMMON_H__ */