minor loging changes

diff --git a/jit/typecheck.c b/jit/typecheck.c
index d04563d30869bf72dfb620967ae01cabc8220153..98bd6cc445ed77e23e6226a9a03ed5a218960594 100644 (file)
--- a/jit/typecheck.c
+++ b/jit/typecheck.c
@@ -26,7 +26,7 @@
 
    Authors: Edwin Steiner
 
-   $Id: typecheck.c 699 2003-12-07 14:45:12Z edwin $
+   $Id: typecheck.c 701 2003-12-07 16:26:58Z edwin $
 
 */
 
@@ -69,14 +69,14 @@ bool typecheckverbose = false;
 #define LOG2(str,a,b)      DOLOG(dolog(str,a,b))
 #define LOG3(str,a,b,c)    DOLOG(dolog(str,a,b,c))
 #define LOGIF(cond,str)    DOLOG(do {if (cond) log_text(str);} while(0))
-#define LOGINFO(info)      DOLOG(do {typeinfo_print_short(stdout,info);printf("\n");} while(0))
-#define LOGFLUSH           DOLOG(fflush(stdout))
-#define LOGNL              DOLOG(printf("\n"))
-#define LOGSTR(str)        DOLOG(printf(str))
-#define LOGSTR1(str,a)     DOLOG(printf(str,a))
-#define LOGSTR2(str,a,b)   DOLOG(printf(str,a,b))
-#define LOGSTR3(str,a,b,c) DOLOG(printf(str,a,b,c))
-#define LOGSTRu(utf)       DOLOG(utf_display(utf))
+#define LOGINFO(info)      DOLOG(do {typeinfo_print_short(get_logfile(),info);log_plain("\n");} while(0))
+#define LOGFLUSH           DOLOG(fflush(get_logfile()))
+#define LOGNL              DOLOG(log_plain("\n"))
+#define LOGSTR(str)        DOLOG(dolog_plain(str))
+#define LOGSTR1(str,a)     DOLOG(dolog_plain(str,a))
+#define LOGSTR2(str,a,b)   DOLOG(dolog_plain(str,a,b))
+#define LOGSTR3(str,a,b,c) DOLOG(dolog_plain(str,a,b,c))
+#define LOGSTRu(utf)       DOLOG(log_plain_utf(utf))
 #else
 #define LOG(str)
 #define LOG1(str,a)
@@ -95,8 +95,8 @@ bool typecheckverbose = false;
 
 #ifdef TYPECHECK_VERBOSE_IMPORTANT
 #define LOGimp(str)     DOLOG(log_text(str))
-#define LOGimpSTR(str)  DOLOG(printf(str))
-#define LOGimpSTRu(utf) DOLOG(utf_display(utf))
+#define LOGimpSTR(str)  DOLOG(dolog_plain(str))
+#define LOGimpSTRu(utf) DOLOG(log_plain_utf(utf))
 #else
 #define LOGimp(str)
 #define LOGimpSTR(str)
@@ -686,7 +686,7 @@ typecheck()
 #ifdef TYPECHECK_VERBOSE
                 if (typecheckverbose) {
                     if (subroutine) {LOGSTR1("subroutine L%03d\n",subroutine->target->debug_nr);LOGFLUSH;}
-                    typeinfo_print_block(stdout,curstack,vtype,vinfo,(jsrchain) ? touched : NULL);
+                    typeinfo_print_block(get_logfile(),curstack,vtype,vinfo,(jsrchain) ? touched : NULL);
                     LOGNL; LOGFLUSH;
                 }
 #endif
@@ -1204,7 +1204,7 @@ typecheck()
                           /* XXX check if subroutine changed types? */
 
                           LOGSTR("subroutine touches:");
-                          DOLOG(typeinfo_print_locals(stdout,subroutine->sbr_vtype,subroutine->sbr_vinfo,
+                          DOLOG(typeinfo_print_locals(get_logfile(),subroutine->sbr_vtype,subroutine->sbr_vinfo,
                                                       subroutine->sbr_touched,maxlocals));
                           LOGNL; LOGFLUSH;
 
@@ -1551,7 +1551,7 @@ typecheck()
 
                 LOG("instructions done");
                 LOGSTR("RESULT=> ");
-                DOLOG(typeinfo_print_block(stdout,curstack,vtype,vinfo,(jsrchain) ? touched : NULL));
+                DOLOG(typeinfo_print_block(get_logfile(),curstack,vtype,vinfo,(jsrchain) ? touched : NULL));
                 LOGNL; LOGFLUSH;
                 
                 /* propagate stack and variables to the following block */

diff --git a/src/vm/jit/verify/typecheck.c b/src/vm/jit/verify/typecheck.c
index d04563d30869bf72dfb620967ae01cabc8220153..98bd6cc445ed77e23e6226a9a03ed5a218960594 100644 (file)
--- a/src/vm/jit/verify/typecheck.c
+++ b/src/vm/jit/verify/typecheck.c
@@ -26,7 +26,7 @@
 
    Authors: Edwin Steiner
 
-   $Id: typecheck.c 699 2003-12-07 14:45:12Z edwin $
+   $Id: typecheck.c 701 2003-12-07 16:26:58Z edwin $
 
 */
 
@@ -69,14 +69,14 @@ bool typecheckverbose = false;
 #define LOG2(str,a,b)      DOLOG(dolog(str,a,b))
 #define LOG3(str,a,b,c)    DOLOG(dolog(str,a,b,c))
 #define LOGIF(cond,str)    DOLOG(do {if (cond) log_text(str);} while(0))
-#define LOGINFO(info)      DOLOG(do {typeinfo_print_short(stdout,info);printf("\n");} while(0))
-#define LOGFLUSH           DOLOG(fflush(stdout))
-#define LOGNL              DOLOG(printf("\n"))
-#define LOGSTR(str)        DOLOG(printf(str))
-#define LOGSTR1(str,a)     DOLOG(printf(str,a))
-#define LOGSTR2(str,a,b)   DOLOG(printf(str,a,b))
-#define LOGSTR3(str,a,b,c) DOLOG(printf(str,a,b,c))
-#define LOGSTRu(utf)       DOLOG(utf_display(utf))
+#define LOGINFO(info)      DOLOG(do {typeinfo_print_short(get_logfile(),info);log_plain("\n");} while(0))
+#define LOGFLUSH           DOLOG(fflush(get_logfile()))
+#define LOGNL              DOLOG(log_plain("\n"))
+#define LOGSTR(str)        DOLOG(dolog_plain(str))
+#define LOGSTR1(str,a)     DOLOG(dolog_plain(str,a))
+#define LOGSTR2(str,a,b)   DOLOG(dolog_plain(str,a,b))
+#define LOGSTR3(str,a,b,c) DOLOG(dolog_plain(str,a,b,c))
+#define LOGSTRu(utf)       DOLOG(log_plain_utf(utf))
 #else
 #define LOG(str)
 #define LOG1(str,a)
@@ -95,8 +95,8 @@ bool typecheckverbose = false;
 
 #ifdef TYPECHECK_VERBOSE_IMPORTANT
 #define LOGimp(str)     DOLOG(log_text(str))
-#define LOGimpSTR(str)  DOLOG(printf(str))
-#define LOGimpSTRu(utf) DOLOG(utf_display(utf))
+#define LOGimpSTR(str)  DOLOG(dolog_plain(str))
+#define LOGimpSTRu(utf) DOLOG(log_plain_utf(utf))
 #else
 #define LOGimp(str)
 #define LOGimpSTR(str)
@@ -686,7 +686,7 @@ typecheck()
 #ifdef TYPECHECK_VERBOSE
                 if (typecheckverbose) {
                     if (subroutine) {LOGSTR1("subroutine L%03d\n",subroutine->target->debug_nr);LOGFLUSH;}
-                    typeinfo_print_block(stdout,curstack,vtype,vinfo,(jsrchain) ? touched : NULL);
+                    typeinfo_print_block(get_logfile(),curstack,vtype,vinfo,(jsrchain) ? touched : NULL);
                     LOGNL; LOGFLUSH;
                 }
 #endif
@@ -1204,7 +1204,7 @@ typecheck()
                           /* XXX check if subroutine changed types? */
 
                           LOGSTR("subroutine touches:");
-                          DOLOG(typeinfo_print_locals(stdout,subroutine->sbr_vtype,subroutine->sbr_vinfo,
+                          DOLOG(typeinfo_print_locals(get_logfile(),subroutine->sbr_vtype,subroutine->sbr_vinfo,
                                                       subroutine->sbr_touched,maxlocals));
                           LOGNL; LOGFLUSH;
 
@@ -1551,7 +1551,7 @@ typecheck()
 
                 LOG("instructions done");
                 LOGSTR("RESULT=> ");
-                DOLOG(typeinfo_print_block(stdout,curstack,vtype,vinfo,(jsrchain) ? touched : NULL));
+                DOLOG(typeinfo_print_block(get_logfile(),curstack,vtype,vinfo,(jsrchain) ? touched : NULL));
                 LOGNL; LOGFLUSH;
                 
                 /* propagate stack and variables to the following block */

diff --git a/toolbox/loging.c b/toolbox/loging.c
index ade18a2128801e6203409c61e64c656a6949ae0b..fcb3cdc1a5d040f000da34a0dc1a09183e193969 100644 (file)
--- a/toolbox/loging.c
+++ b/toolbox/loging.c
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: loging.c 700 2003-12-07 15:54:28Z edwin $
+   $Id: loging.c 701 2003-12-07 16:26:58Z edwin $
 
 */
 
@@ -127,6 +127,14 @@ void log_plain(char *text)
 }
 
 
+/****************** Function: get_logfile *******************************/
+
+FILE *get_logfile()
+{
+       return (logfile) ? logfile : stdout;
+}
+
+
 /********************* Function: log_cputime ****************************/
 
 void log_cputime()

diff --git a/toolbox/loging.h b/toolbox/loging.h
index a6910f201cd2cee9dd1b15cfa9b764e2a23a534c..326d8205da3f4970efbeada419baf7feceda7980 100644 (file)
--- a/toolbox/loging.h
+++ b/toolbox/loging.h
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: loging.h 700 2003-12-07 15:54:28Z edwin $
+   $Id: loging.h 701 2003-12-07 16:26:58Z edwin $
 
 */
 
@@ -52,6 +52,8 @@ void dolog_plain(char *txt, ...); /* same as dolog without "LOG: " and newline *
 void error(char *txt, ...);
 void panic(char *txt);
 
+FILE *get_logfile(); /* return the current logfile */
+
 long int getcputime();
 
 #endif /* _LOGGING_H */