X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=2ac396bedc54f13363d0b491359b2c5440dd8c7d;hb=HEAD;hp=2dc8b7d9e8e59457fd4bfee6b850af028414d9c9;hpb=3262ae1f816dea735cab52d6940523f52ca80fe1;p=c11tester.git

diff --git a/common.h b/common.h
index 2dc8b7d9..2ac396be 100644
--- a/common.h
+++ b/common.h
@@ -6,11 +6,27 @@
 #define __COMMON_H__
 
 #include <stdio.h>
+#include <unistd.h>
 #include "config.h"
+#include "printf.h"
+
+extern int model_out;
+
+#define model_print(fmt, ...) do { \
+		char mprintbuf[2048];                                                \
+		int printbuflen=snprintf_(mprintbuf, 2048, fmt, ## __VA_ARGS__);     \
+		int lenleft = printbuflen < 2048 ? printbuflen : 2048;                   \
+		int totalwritten = 0; \
+		while(lenleft) {                                                    \
+			int byteswritten=write(model_out, &mprintbuf[totalwritten], lenleft); \
+			lenleft-=byteswritten;                                            \
+			totalwritten+=byteswritten;                                       \
+		}                                                                   \
+} 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, ...)
@@ -18,19 +34,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__); \
-		print_trace(); \
-		model_print_summary(); \
-		exit(EXIT_FAILURE); \
-	} \
-} while (0);
+	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);
-void model_print_summary(void);
-
-#endif /* __COMMON_H__ */
+#endif	/* __COMMON_H__ */