Consolidate and turn off all the debug logging for now.

icculus · Oct 14, 2016 · 68aa18c · 68aa18c
1 parent 0349122
commit 68aa18c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/lx_loader.c b/lx_loader.c
@@ -441,7 +441,7 @@ static __attribute__((noreturn)) void runLxModule(LxModule *lxmod, const int arg
     stack -= sizeof (LxTIB) + sizeof (LxTIB2);  // skip the TIB data.
 
     // ...and you pass it the pointer to argv0. This is (at least as far as the docs suggest) appended to the environment table.
-    printf("jumping into LX land...! eip=0x%X esp=0x%X\n", (uint) lxmod->eip, (uint) lxmod->esp); fflush(stdout);
+    //fprintf(stderr, "jumping into LX land...! eip=0x%X esp=0x%X\n", (uint) lxmod->eip, (uint) lxmod->esp); fflush(stderr);
 
     __asm__ __volatile__ (
         "movl %%esi,%%esp  \n\t"  // use the OS/2 process's stack.
@@ -479,7 +479,7 @@ static void runLxLibraryInitOrTerm(LxModule *lxmod, const int isTermination)
     uint8 *stack = (uint8 *) ((size_t) GLoaderState->main_module->esp);
     stack -= sizeof (LxTIB) + sizeof (LxTIB2);  // skip the TIB data.
 
-    printf("jumping into LX land to %s library...! eip=0x%X esp=0x%X\n", isTermination ? "terminate" : "initialize", (uint) lxmod->eip, (uint) GLoaderState->main_module->esp); fflush(stdout);
+    //fprintf(stderr, "jumping into LX land to %s library...! eip=0x%X esp=0x%X\n", isTermination ? "terminate" : "initialize", (uint) lxmod->eip, (uint) GLoaderState->main_module->esp); fflush(stderr);
 
     __asm__ __volatile__ (
         "pushal            \n\t"  // save all the current registers.
@@ -512,7 +512,7 @@ static void runLxLibraryInitOrTerm(LxModule *lxmod, const int isTermination)
     );
 
     // !!! FIXME: this entry point returns a result...do we abort if it reports error?
-    printf("...survived time in LX land!\n"); fflush(stdout);
+    //fprintf(stderr, "...survived time in LX land!\n"); fflush(stderr);
 } // runLxLibraryInitOrTerm
 
 static inline void runLxLibraryInit(LxModule *lxmod) { runLxLibraryInitOrTerm(lxmod, 0); }
@@ -869,7 +869,7 @@ static LxModule *loadLxModule(const char *fname, uint8 *exe, uint32 exelen, int
         void *mmapaddr = mmap(base, vsize, PROT_READ|PROT_WRITE, mmapflags, -1, 0);
         // we'll mprotect() these pages to the proper permissions later.
 
-        printf("mmap(%p, %u, RW-, ANON|PRIVATE%s, -1, 0) == %p\n", base, (uint) vsize, isDLL ? "" : "|FIXED", mmapaddr);
+        //fprintf(stderr, "mmap(%p, %u, RW-, ANON|PRIVATE%s, -1, 0) == %p\n", base, (uint) vsize, isDLL ? "" : "|FIXED", mmapaddr);
 
         if (mmapaddr == ((void *) MAP_FAILED)) {
             fprintf(stderr, "mmap(%p, %u, RW-, ANON|PRIVATE%s, -1, 0) failed (%d): %s\n",
@@ -1117,7 +1117,7 @@ static LxModule *loadLxModule(const char *fname, uint8 *exe, uint32 exelen, int
 
 static LxModule *loadLxModuleByPathInternal(const char *fname, const int dependency_tree_depth)
 {
-    const char *what = NULL;
+    const char *what = NULL; (void) what;
     uint8 *module = NULL;
     uint32 modulelen = 0;
     FILE *io = NULL;
@@ -1141,7 +1141,7 @@ static LxModule *loadLxModuleByPathInternal(const char *fname, const int depende
     return retval;
 
 loadmod_failed:
-    fprintf(stderr, "%s failure on '%s: %s'\n", what, fname, strerror(errno));
+    //fprintf(stderr, "%s failure on '%s: %s'\n", what, fname, strerror(errno));
     if (io)
         fclose(io);
     free(module);
@@ -1189,7 +1189,7 @@ static LxModule *loadNativeModule(const char *fname, const char *modname)
     retval->num_exports = num_exports;
     retval->initialized = 1;
 
-    printf("Loaded native module '%s' (%u exports).\n", fname, (uint) num_exports);
+    //fprintf(stderr, "Loaded native module '%s' (%u exports).\n", fname, (uint) num_exports);
 
     return retval;
 

diff --git a/lx_loader.h b/lx_loader.h
@@ -30,7 +30,7 @@ typedef unsigned int uint;
     } while (0)
 #endif
 
-#if 1
+#if 0
 #ifndef STUBBED
 #define STUBBED(x) _STUBBED(x, "STUBBED")
 #endif

diff --git a/native/doscalls.c b/native/doscalls.c
@@ -958,7 +958,7 @@ APIRET DosOpen(PSZ pszFileName, PHFILE pHf, PULONG pulAction, ULONG cbFile, ULON
         return err;
     } // if
 
-    if (strcmp(pszFileName, unixpath) != 0) { fprintf(stderr, "DosOpen: converted '%s' to '%s'\n", pszFileName, unixpath); }
+    //if (strcmp(pszFileName, unixpath) != 0) { fprintf(stderr, "DosOpen: converted '%s' to '%s'\n", pszFileName, unixpath); }
 
     int fd = open(unixpath, flags, mode);
 

diff --git a/native/os2native.h b/native/os2native.h
@@ -11,8 +11,8 @@
 #include "os2errors.h"
 #include "../lx_loader.h"
 
-#if 1
-#define TRACE_NATIVE(...) do { printf("2INE TRACE: "); printf(__VA_ARGS__); printf(";\n"); } while (0)
+#if 0
+#define TRACE_NATIVE(...) do { fprintf(stderr, "2INE TRACE [%lu]: ", (unsigned long) pthread_self()); fprintf(stderr, __VA_ARGS__); fprintf(stderr, ";\n"); } while (0)
 #else
 #define TRACE_NATIVE(...) do {} while (0)
 #endif