Changeset 1157 for trunk

Timestamp:

Feb 4, 2004, 9:55:41 PM (22 years ago)

Author:

bird

Message:

Added logging facilities.

Location:

trunk/src/emx

Files:

• Makefile (modified) (1 diff, 1 prop)
• common.smak (modified) (1 diff, 1 prop)
• include/emx/libclog.h (added)
• src/lib/app/app.smak (modified) (1 diff, 1 prop)
• src/lib/startup/exit.c (modified) (2 diffs, 1 prop)
• src/lib/startup/startup.c (modified) (4 diffs, 1 prop)
• src/lib/sys/libclog.c (added)

trunk/src/emx/Makefile

@@ -105 +105 @@
 CFLAGS.omf  = -Zomf
 CFLAGS.prof = -pg
+CFLAGS.log  = -DDEBUG_LOGGING
 # The object files are put in subdirectory objectformat-targetkind,
 # we decompose object file name back and pick appropiate $CFLAGS
 CFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(CFLAGS.$x))
 # How to compile a .c file
-DO.COMPILE.c = $(CC) $(strip $(CFLAGS) $1) -o $@ $(srcdir)/$< -I$(dir $<)
-DO.COMPILE.s = $(call DO.COMPILE.c,-x assembler-with-cpp $1)
+DO.COMPILE.c = $(CC) -std=gnu99 $(strip $(CFLAGS) $1) -o $@ $(srcdir)/$< -I$(dir $<)
+# '-std=gnu99' doesn't work with '-x assembler-with-cpp', therefor no $(call DO.COMPILE.c).
+DO.COMPILE.s = $(CC) -x assembler-with-cpp $(strip $(CFLAGS) $1) -o $@ $(srcdir)/$< -I$(dir $<)
 
 # The linker

trunk/src/emx/common.smak

@@ -26 +26 @@
 .tmp += prof
 endif # neq ($(findstring prof,$(.TKIND)),)
+ifneq ($(findstring log,$(.TKIND)),)
+.tmp += log
+endif # neq ($(findstring log,$(.TKIND)),)
 .TKIND := $(.tmp)
 ifdef .TKVAR

trunk/src/emx/src/lib/app/app.smak

@@ -19 +19 @@
 LIBC.DLL.OBJS += $(.OBJS)
 
+.TKIND  := aout log
+.TARGET := libc_app_l.a
+include mklib.smak
+                                
 .TKIND  := aout prof
 .TARGET := libc_app_p.a

trunk/src/emx/src/lib/startup/exit.c

@@ -4 +4 @@
 #include <stdlib.h>
 #include <emx/startup.h>
+#include <emx/libclog.h>
 
 void (*_atexit_v[64])(void);
@@ -10 +11 @@
 void _STD(exit) (int ret)
 {
+  LIBCLOG_ENTER("ret=%d\n", ret);
   int i;
 
   for (i = _atexit_n-1; i >= 0; --i)
-    _atexit_v[i]();
+    {
+      LIBCLOG_MSG("calling _atexit[%d] %p\n", i, _atexit_v[i]);
+      _atexit_v[i]();
+    }
   _CRT_term ();
+  LIBCLOG_MSG("calling _exit\n");
   _exit (ret);
 }

trunk/src/emx/src/lib/startup/startup.c

@@ -9 +9 @@
 #include <emx/syscalls.h>
 #include <emx/startup.h>
+#include <emx/libclog.h>
 
 extern int __crtinit1__;
@@ -18 +19 @@
 int _CRT_init (void)
 {
+  LIBCLOG_ENTER("\n");
   static int startup_flag;
 
@@ -23 +25 @@
      _DLL_InitTerm() and by the application program's startup code). */
   if (startup_flag)
-    return 0;
+    LIBCLOG_RETURN_INT(0);
   startup_flag = 1;
 
@@ -36 +38 @@
   errno = 0;
 
-  return 0;
+  LIBCLOG_RETURN_INT(0);
 }