[project @ 2003-09-26 13:32:14 by panne]

[ghc-hetmet.git] / ghc / rts / Main.c

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index ad6924f..6029921 100644 (file)
--- a/ghc/rts/Main.c
+++ b/ghc/rts/Main.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.36 2003/03/17 14:47:47 simonmar Exp $
+ * $Id: Main.c,v 1.40 2003/09/21 22:20:55 wolfgang Exp $
  *
  * (c) The GHC Team 1998-2000
  *
@@ -13,6 +13,7 @@
 #include "Rts.h"
 #include "RtsAPI.h"
 #include "SchedAPI.h"
+#include "Schedule.h"
 #include "RtsFlags.h"
 #include "RtsUtils.h"
 #include "Prelude.h"
@@ -40,7 +41,7 @@
 # include <windows.h>
 #endif
 
-extern void __stginit_Main(void);
+extern void __stginit_ZCMain(void);
 
 /* Hack: we assume that we're building a batch-mode system unless 
  * INTERPRETER is set
@@ -52,7 +53,7 @@ int main(int argc, char *argv[])
     SchedulerStatus status;
     /* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
 
-    startupHaskell(argc,argv,__stginit_Main);
+    startupHaskell(argc,argv,__stginit_ZCMain);
 
     /* kick off the computation by creating the main thread with a pointer
        to mainIO_closure representing the computation of the overall program;
@@ -104,7 +105,9 @@ int main(int argc, char *argv[])
 #  else /* !PAR && !GRAN */
 
     /* ToDo: want to start with a larger stack size */
-    status = rts_mainLazyIO((HaskellObj)mainIO_closure, NULL);
+    rts_lock();
+    status = rts_evalLazyIO((HaskellObj)mainIO_closure, NULL);
+    rts_unlock();
 
 #  endif /* !PAR && !GRAN */