X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=common.h;h=67ef78634923118c9055961b5fc73c32470ce57b;hp=81b26728d917c0af8c1b26e9d0fa2d28cccb8a5a;hb=67fd0674445ff7f815fd37e704779df42f1714d7;hpb=79f51bf7df7ed2c8095b0c2d7f730db6ccb9394a

diff --git a/common.h b/common.h
index 81b26728..67ef7863 100644
--- a/common.h
+++ b/common.h
@@ -6,10 +6,29 @@
 #define __COMMON_H__
 
 #include <stdio.h>
+#include <unistd.h>
 #include "config.h"
+#include "printf.h"
+
+extern int model_out;
+extern int switch_alloc;
+
+#define model_print(fmt, ...) do { \
+    switch_alloc = 1;		   \
+    char mprintbuf[256];						\
+    int printbuflen=snprintf_(mprintbuf, 256, fmt, ## __VA_ARGS__);	\
+    int lenleft = printbuflen < 256 ?printbuflen:256;			\
+    int totalwritten = 0;\
+    while(lenleft) {							\
+      int byteswritten=write(model_out, &mprintbuf[totalwritten], lenleft);\
+      lenleft-=byteswritten;						\
+      totalwritten+=byteswritten;					\
+    }									\
+    switch_alloc = 0;							\
+  } while (0)
 
 #ifdef CONFIG_DEBUG
-#define DEBUG(fmt, ...) do { printf("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
+#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
@@ -22,22 +41,20 @@ 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)
+	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 */
+#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__ */