X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=2dc8b7d9e8e59457fd4bfee6b850af028414d9c9;hb=31246eff241f4593a33501f8c33b6eadca1d7664;hp=3e97432cb2c825cbcf56d7fb6c1510bc8e825eb7;hpb=10de861d3a9908e75b6f94283cc67b3f1b4d93ab;p=model-checker.git

diff --git a/common.h b/common.h
index 3e97432..2dc8b7d 100644
--- a/common.h
+++ b/common.h
@@ -1,11 +1,12 @@
+/** @file common.h
+ *  @brief General purpose macros.
+ */
+
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
 #include <stdio.h>
-#include <stdlib.h>
-#include "mymemory.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)
@@ -21,12 +22,15 @@
 do { \
 	if (!(expr)) { \
 		fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \
-		exit(1); \
+		print_trace(); \
+		model_print_summary(); \
+		exit(EXIT_FAILURE); \
 	} \
 } while (0);
 
+#define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
-#define userMalloc(size)	malloc(size)
-#define userFree(ptr)		free(ptr)
+void print_trace(void);
+void model_print_summary(void);
 
 #endif /* __COMMON_H__ */