Fixed bug breaking our consolidation of future values...

[model-checker.git] / common.h

diff --git a/common.h b/common.h
index 81facf69c634e855b71d71ffa8cf1eddca11f822..003dc805e180e5cc2c790329ec042ef66d6d120f 100644 (file)
--- 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)
@@ -17,16 +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__)
 
-#define userMalloc(size)       malloc(size)
-#define userFree(ptr)          free(ptr)
-
+void print_trace(void);
+void model_print_summary(void);
 #endif /* __COMMON_H__ */