}
#endif
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(_WIN32)
int main ( int argc, char **argv );
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPSTR lpCmdLine, int nCmdShow) {
}
#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();
}
// Main entry point; catch any exceptions that have made it this far.
int main ( int argc, char **argv )
{
-#if _MSC_VER
+#if defined(_MSC_VER) || defined(_WIN32)
// Don't show blocking "no disk in drive" error messages on Windows 7,
// silently return errors to application instead.
// See Microsoft MSDN #ms680621: "GUI apps should specify SEM_NOOPENFILEERRORBOX"
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])) {
// 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)
if (std::strlen(t.getOrigin()) != 0)
cerr << " (received from " << t.getOrigin() << ')' << endl;
+ } catch (const std::exception &e ) {
+ cerr << "Fatal error (std::exception): " << e.what() << endl;
+
} catch (const std::string &s) {
- cerr << "Fatal error: " << s << endl;
+ cerr << "Fatal error (std::string): " << s << endl;
} catch (const char *s) {
- cerr << "Fatal error: " << s << endl;
+ cerr << "Fatal error (const char*): " << s << endl;
} catch (...) {
cerr << "Unknown exception in the main loop. Aborting..." << endl;
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;
}