projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-07-10 08:02:29 by simonpj]
[ghc-hetmet.git]
/
ghc
/
rts
/
Main.c
diff --git
a/ghc/rts/Main.c
b/ghc/rts/Main.c
index
a8ca10c
..
a651eaa
100644
(file)
--- a/
ghc/rts/Main.c
+++ b/
ghc/rts/Main.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.32 2002/01/22 13:54:22 simonmar Exp $
+ * $Id: Main.c,v 1.39 2003/07/10 08:02:29 simonpj Exp $
*
* (c) The GHC Team 1998-2000
*
*
* (c) The GHC Team 1998-2000
*
@@
-13,9
+13,11
@@
#include "Rts.h"
#include "RtsAPI.h"
#include "SchedAPI.h"
#include "Rts.h"
#include "RtsAPI.h"
#include "SchedAPI.h"
+#include "Schedule.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
#include "Prelude.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
#include "Prelude.h"
+#include <stdlib.h>
#ifdef DEBUG
# include "Printer.h" /* for printing */
#ifdef DEBUG
# include "Printer.h" /* for printing */
@@
-39,7
+41,7
@@
# include <windows.h>
#endif
# include <windows.h>
#endif
-extern void __stginit_PrelMain(void);
+extern void __stginit_ZCMain(void);
/* Hack: we assume that we're building a batch-mode system unless
* INTERPRETER is set
/* 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! */
SchedulerStatus status;
/* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
- startupHaskell(argc,argv,__stginit_PrelMain);
+ 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;
/* 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 */
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,
} 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 */
# 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 */
# 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 */
# endif /* !PAR && !GRAN */