projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-11-05 09:01:10 by simonpj]
[ghc-hetmet.git]
/
ghc
/
rts
/
StgStartup.hc
diff --git
a/ghc/rts/StgStartup.hc
b/ghc/rts/StgStartup.hc
index
5949c86
..
660bf35
100644
(file)
--- a/
ghc/rts/StgStartup.hc
+++ b/
ghc/rts/StgStartup.hc
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: StgStartup.hc,v 1.13 2000/04/26 13:50:27 simonmar Exp $
+ * $Id: StgStartup.hc,v 1.19 2002/07/16 14:56:09 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-7,6
+7,7
@@
*
* ---------------------------------------------------------------------------*/
*
* ---------------------------------------------------------------------------*/
+#include "Stg.h"
#include "Rts.h"
#include "StgRun.h" /* StgReturn */
#include "StgStartup.h"
#include "Rts.h"
#include "StgRun.h" /* StgReturn */
#include "StgStartup.h"
@@
-44,8
+45,8
@@
EXTFUN(stg_stop_thread_entry);
EXTFUN(stg_stop_thread_entry);
-#ifdef PROFILING
-#define STOP_THREAD_BITMAP 1
+#if defined(PROFILING)
+#define STOP_THREAD_BITMAP 3
#else
#define STOP_THREAD_BITMAP 0
#endif
#else
#define STOP_THREAD_BITMAP 0
#endif
@@
-132,14
+133,8
@@
STGFUN(stg_enterStackTop)
/* -----------------------------------------------------------------------------
Special STG entry points for module registration.
/* -----------------------------------------------------------------------------
Special STG entry points for module registration.
-
- This stuff is problematic for Hugs, because it introduces a
- dependency between the RTS and the program (ie. __init_PrelMain). So
- we currently disable module initialisation for Hugs.
-------------------------------------------------------------------------- */
-------------------------------------------------------------------------- */
-#ifndef INTERPRETER
-
extern F_ *init_stack;
STGFUN(stg_init_ret)
extern F_ *init_stack;
STGFUN(stg_init_ret)
@@
-151,7
+146,7
@@
STGFUN(stg_init_ret)
/* On entry to stg_init:
* init_stack[0] = &stg_init_ret;
/* On entry to stg_init:
* init_stack[0] = &stg_init_ret;
- * init_stack[1] = __init_Something;
+ * init_stack[1] = __stginit_Something;
*/
STGFUN(stg_init)
{
*/
STGFUN(stg_init)
{
@@
-160,10
+155,3
@@
STGFUN(stg_init)
JMP_(POP_INIT_STACK());
FE_
}
JMP_(POP_INIT_STACK());
FE_
}
-
-/* PrelGHC doesn't really exist... */
-
-START_MOD_INIT(__init_PrelGHC);
-END_MOD_INIT();
-
-#endif /* !INTERPRETER */