X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMain.c;h=434f79156b668079f7e07abe30e68f115816fa21;hb=0981e24e9980b8b26e6f20fc56bebc1c7416cc4f;hp=5a1ab109277582848c4e0599159bc946e4c6a3a0;hpb=a91cc8496bf4ea7fe1e3ad9d97836152f3939ffa;p=ghc-hetmet.git

diff --git a/rts/Main.c b/rts/Main.c
index 5a1ab10..434f791 100644
--- a/rts/Main.c
+++ b/rts/Main.c
@@ -12,11 +12,13 @@
 #include "Rts.h"
 #include "RtsAPI.h"
 #include "SchedAPI.h"
-#include "Schedule.h"
 #include "RtsFlags.h"
 #include "RtsUtils.h"
 #include "Prelude.h"
 #include "Task.h"
+#if defined(mingw32_HOST_OS)
+#include "win32/seh_excn.h"
+#endif
 #include <stdlib.h>
 
 #ifdef DEBUG
@@ -39,17 +41,20 @@
 
 extern void __stginit_ZCMain(void);
 
+static int progargc;
+static char **progargv;
+
 /* Hack: we assume that we're building a batch-mode system unless 
  * INTERPRETER is set
  */
 #ifndef INTERPRETER /* Hack */
-int main(int argc, char *argv[])
+static void real_main(void)
 {
     int exit_status;
     SchedulerStatus status;
     /* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
 
-    startupHaskell(argc,argv,__stginit_ZCMain);
+    startupHaskell(progargc,progargv,__stginit_ZCMain);
 
     /* kick off the computation by creating the main thread with a pointer
        to mainIO_closure representing the computation of the overall program;
@@ -102,7 +107,7 @@ int main(int argc, char *argv[])
 
     /* ToDo: want to start with a larger stack size */
     { 
-	void *cap = rts_lock();
+	Capability *cap = rts_lock();
 	cap = rts_evalLazyIO(cap,(HaskellObj)(void *)mainIO_closure, NULL);
 	status = rts_getSchedStatus(cap);
 	taskTimeStamp(myTask());
@@ -134,6 +139,21 @@ int main(int argc, char *argv[])
       barf("main thread completed with invalid status");
     }
     shutdownHaskellAndExit(exit_status);
-    return 0; /* never reached, keep gcc -Wall happy */
+}
+int main(int argc, char *argv[])
+{
+    /* We do this dance with argc and argv as otherwise the SEH exception
+       stuff (the BEGIN/END CATCH below) on Windows gets confused */
+    progargc = argc;
+    progargv = argv;
+
+#if defined(mingw32_HOST_OS)
+    BEGIN_CATCH
+#endif
+    real_main();
+#if defined(mingw32_HOST_OS)
+    END_CATCH
+#endif
+    return 0; /* not reached, but keeps gcc -Wall happy */
 }
 # endif /* BATCH_MODE */