X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fbootstrap.cxx;h=2aef4c2c0896efe6f021ef54c021468a27c2f639;hb=d127f7709f7ac64fbbc537131bfd02bb29bc1ebe;hp=73fb6fd5e162f3a67862a8b88feafdd94c447986;hpb=3579a4404abd7e0e026a2373ace55410855ffe80;p=flightgear.git

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 73fb6fd5e..2aef4c2c0 100644
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -129,33 +129,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 }
 #endif
 
-#if defined( sgi )
-#include <sys/fpu.h>
-#include <sys/sysmp.h>
-#include <unistd.h>
-
-/*
- *  set the special "flush zero" bit (FS, bit 24) in the Control Status
- *  Register of the FPU of R4k and beyond so that the result of any
- *  underflowing operation will be clamped to zero, and no exception of
- *  any kind will be generated on the CPU.  This has no effect on an
- *  R3000.
- */
-void flush_fpe(void)
-{
-    union fpc_csr f;
-    f.fc_word = get_fpc_csr();
-    f.fc_struct.flush = 1;
-    set_fpc_csr(f.fc_word);
-}
-#endif
-
 static void fg_terminate() {
     cerr << endl <<
-            "Uncaught Exception: you should see a meaningful error message\n"
-            "here, but your GLUT (or SDL) library was apparently compiled\n"
-            "and/or linked without exception support. Please complain to\n"
-            "its provider!"
+            "Uncaught Exception: missing exception handler on some thread"
             << endl << endl;
     abort();
 }
@@ -201,30 +177,12 @@ int main ( int argc, char **argv )
     initFPE();
 #endif
 
-#if defined(sgi)
-    flush_fpe();
-
-    // Bind all non-rendering threads to CPU1
-    // This will reduce the jitter caused by them to an absolute minimum,
-    // but it will only work with superuser authority.
-    if ( geteuid() == 0 )
-    {
-       sysmp(MP_CLOCK, 0);		// bind the timer only to CPU0
-       sysmp(MP_ISOLATE, 1 );		// Isolate CPU1
-       sysmp(MP_NONPREEMPTIVE, 1 );	// disable process time slicing on CPU1
-    }
-#endif
-
     // Enable floating-point exceptions for Windows
 #if defined( _MSC_VER ) && defined( DEBUG )
     // Christian, we should document what this does
     _control87( _EM_INEXACT, _MCW_EM );
 #endif
 
-#if defined( HAVE_BC5PLUS )
-    _control87(MCW_EM, MCW_EM);  /* defined in float.h */
-#endif
-  
     bool fgviewer = false;
     for (int i = 0; i < argc; ++i) {
         if (!strcmp("--fgviewer", argv[i])) {
@@ -236,6 +194,11 @@ int main ( int argc, char **argv )
     // FIXME: add other, more specific
     // exceptions.
     try {
+        // http://code.google.com/p/flightgear-bugs/issues/detail?id=1231
+        // ensure sglog is inited before atexit() is registered, so logging
+        // is possible inside fgExitCleanup
+        sglog();
+        
         std::set_terminate(fg_terminate);
         atexit(fgExitCleanup);
         if (fgviewer)
@@ -277,6 +240,8 @@ void fgExitCleanup() {
     if (_bootstrap_OSInit != 0)
         fgSetMouseCursor(MOUSE_CURSOR_POINTER);
 
+    // on the common exit path globals is already deleted, and NULL,
+    // so this only happens on error paths.
     delete globals;
 }