X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=1b2b673f1fd3c81b8e342fbfa68205163b216135;hb=89ecd60fab0d93d6df6aa35e663ab67db860fa1d;hp=0db1cfe15f722dd8bd487aa98cdb3d16b7cfb79f;hpb=cf7518cb8c2d9cd3033ca7540ea9dc448b21912a;p=c11tester.git

diff --git a/common.h b/common.h
index 0db1cfe1..1b2b673f 100644
--- a/common.h
+++ b/common.h
@@ -6,16 +6,16 @@
 #define __COMMON_H__
 
 #include <stdio.h>
+#include "config.h"
 
-/*
-#ifndef CONFIG_DEBUG
-#define CONFIG_DEBUG
-#endif
-*/
+extern int model_out;
+extern int switch_alloc;
+
+#define model_print(fmt, ...) do { switch_alloc = 1; dprintf(model_out, fmt, ## __VA_ARGS__); switch_alloc = 0; } 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, ...)
@@ -23,12 +23,24 @@
 #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(EXIT_FAILURE); \
-	} \
-} while (0);
-
-#endif /* __COMMON_H__ */
+	do { \
+		if (!(expr)) { \
+			fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \
+			/* print_trace(); // Trace printing may cause dynamic memory allocation */ \
+			assert_hook();                           \
+			exit(EXIT_FAILURE); \
+		} \
+	} while (0)
+#else
+#define ASSERT(expr) \
+	do { } while (0)
+#endif/* CONFIG_ASSERT */
+
+#define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
+
+void print_trace(void);
+#endif/* __COMMON_H__ */