X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=81b26728d917c0af8c1b26e9d0fa2d28cccb8a5a;hb=1a6c97a90dcb078ef64ca95d058837a575b34239;hp=0db1cfe15f722dd8bd487aa98cdb3d16b7cfb79f;hpb=6d7624344faab763eb30f3a6424f51538b7292a5;p=model-checker.git

diff --git a/common.h b/common.h
index 0db1cfe..81b2672 100644
--- a/common.h
+++ b/common.h
@@ -6,16 +6,11 @@
 #define __COMMON_H__
 
 #include <stdio.h>
-
-/*
-#ifndef CONFIG_DEBUG
-#define CONFIG_DEBUG
-#endif
-*/
+#include "config.h"
 
 #ifdef CONFIG_DEBUG
 #define DEBUG(fmt, ...) do { printf("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
-#define DBG() DEBUG("\n");
+#define DBG() DEBUG("\n")
 #define DBG_ENABLED() (1)
 #else
 #define DEBUG(fmt, ...)
@@ -23,12 +18,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__); \
+		print_trace(); \
+		model_print_summary(); \
+		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);
+void model_print_summary(void);
 #endif /* __COMMON_H__ */