X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=common.h;h=003dc805e180e5cc2c790329ec042ef66d6d120f;hb=7ba211ec7d1cacbaa3ef2027f1a0f534888f1708;hp=bb66c3a7f5d9cab70b680a8f2f42b89c7c468547;hpb=be86dd6ef8bd6194f13b0babaa03fd45d39ff767;p=model-checker.git

diff --git a/common.h b/common.h
index bb66c3a..003dc80 100644
--- a/common.h
+++ b/common.h
@@ -1,10 +1,12 @@
+/** @file common.h
+ *  @brief General purpose macros.
+ */
+
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
 #include <stdio.h>
-#include <stdlib.h>
-
-//#define CONFIG_DEBUG
+#include "config.h"
 
 #ifdef CONFIG_DEBUG
 #define DEBUG(fmt, ...) do { printf("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
@@ -16,19 +18,21 @@
 #define DBG_ENABLED() (0)
 #endif
 
+void assert_hook(void);
+
 #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);
 
+#define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
-void * myMalloc(size_t size);
-void myFree(void *ptr);
-
-#define userMalloc(size)	malloc(size)
-#define userFree(ptr)		free(ptr)
-
+void print_trace(void);
+void model_print_summary(void);
 #endif /* __COMMON_H__ */