X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMain.c;h=7721438646fcd663ce064a102234c94634fe69eb;hb=6d194f48d7313fa8daa004b7b3e3a55ffa52f4a9;hp=a651eaa3a902602f2529d59920111abb463c9c09;hpb=aa698b4b602c576ba9fa3e1d3cd8523e9c2b1f99;p=ghc-hetmet.git

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index a651eaa..7721438 100644
--- a/ghc/rts/Main.c
+++ b/ghc/rts/Main.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.39 2003/07/10 08:02:29 simonpj Exp $
  *
  * (c) The GHC Team 1998-2000
  *
@@ -23,10 +22,6 @@
 # include "Printer.h"   /* for printing        */
 #endif
 
-#ifdef INTERPRETER
-# include "Assembler.h"
-#endif
-
 #ifdef PAR
 # include "Parallel.h"
 # include "ParallelRts.h"
@@ -82,14 +77,14 @@ int main(int argc, char *argv[])
 
     if (IAmMainThread == rtsTrue) {
       IF_PAR_DEBUG(verbose,
-		   fprintf(stderr, "==== [%x] Main Thread Started ...\n", mytid));
+		   debugBelch("==== [%x] Main Thread Started ...\n", mytid));
 
       /* ToDo: Dump event for the main thread */
       status = rts_mainLazyIO((HaskellObj)mainIO_closure, NULL);
     } else {
       /* Just to show we're alive */
       IF_PAR_DEBUG(verbose,
-		   fprintf(stderr, "== [%x] Non-Main PE enters scheduler via taskStart() without work ...\n",
+		   debugBelch("== [%x] Non-Main PE enters scheduler via taskStart() without work ...\n",
 			   mytid));
      
       /* all non-main threads enter the scheduler without work */
@@ -105,18 +100,20 @@ 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 */
 
     /* check the status of the entire Haskell computation */
     switch (status) {
     case Killed:
-      prog_belch("main thread exited (uncaught exception)");
+      errorBelch("main thread exited (uncaught exception)");
       exit_status = EXIT_KILLED;
       break;
     case Interrupted:
-      prog_belch("interrupted");
+      errorBelch("interrupted");
       exit_status = EXIT_INTERRUPTED;
       break;
     case Success:
@@ -124,7 +121,7 @@ int main(int argc, char *argv[])
       break;
 #if defined(PAR)
     case NoStatus:
-      prog_belch("main thread PE killed; probably due to failure of another PE; check /tmp/pvml...");
+      errorBelch("main thread PE killed; probably due to failure of another PE; check /tmp/pvml...");
       exit_status = EXIT_KILLED;
       break;
 #endif