X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMain.c;h=aa10c44eb8835060b306e493ccddf0b252493fd1;hb=d28ba8c800901bea01f70c4719278c2a364cf9fc;hp=def9e5521a6bea753ca555b33c8da9e8d162c908;hpb=e66018084e22615311828b7a221d5df25cdf09ea;p=ghc-hetmet.git diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c index def9e55..aa10c44 100644 --- a/ghc/rts/Main.c +++ b/ghc/rts/Main.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Main.c,v 1.33 2002/02/05 15:42:04 simonpj Exp $ + * $Id: Main.c,v 1.38 2003/06/23 10:35:23 simonpj Exp $ * * (c) The GHC Team 1998-2000 * @@ -13,9 +13,11 @@ #include "Rts.h" #include "RtsAPI.h" #include "SchedAPI.h" +#include "Schedule.h" #include "RtsFlags.h" #include "RtsUtils.h" #include "Prelude.h" +#include #ifdef DEBUG # include "Printer.h" /* for printing */ @@ -39,7 +41,7 @@ # include #endif -extern void __stginit_Main(void); +extern void __stginit_zdMain(void); /* Hack: we assume that we're building a batch-mode system unless * INTERPRETER is set @@ -51,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_zdMain); /* kick off the computation by creating the main thread with a pointer to mainIO_closure representing the computation of the overall program; @@ -83,7 +85,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "==== [%x] Main Thread Started ...\n", mytid)); /* ToDo: Dump event for the main thread */ - status = rts_evalIO((HaskellObj)mainIO_closure, NULL); + status = rts_mainLazyIO((HaskellObj)mainIO_closure, NULL); } else { /* Just to show we're alive */ IF_PAR_DEBUG(verbose, @@ -98,12 +100,12 @@ int main(int argc, char *argv[]) # elif defined(GRAN) /* ToDo: Dump event for the main thread */ - status = rts_evalIO(mainIO_closure, NULL); + status = rts_mainLazyIO(mainIO_closure, NULL); # else /* !PAR && !GRAN */ /* ToDo: want to start with a larger stack size */ - status = rts_evalIO((HaskellObj)mainIO_closure, NULL); + status = rts_mainLazyIO((HaskellObj)mainIO_closure, NULL); # endif /* !PAR && !GRAN */