[project @ 2003-02-12 23:38:23 by wolfgang]

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

diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c
index def63a5..fc7bf81 100644 (file)
--- a/ghc/rts/RtsStartup.c
+++ b/ghc/rts/RtsStartup.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsStartup.c,v 1.68 2003/01/28 16:30:06 simonmar Exp $
+ * $Id: RtsStartup.c,v 1.70 2003/01/30 10:19:07 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2002
  *
@@ -140,10 +140,6 @@ hs_init(int *argc, char **argv[])
     initProfiling1();
 #endif
 
-#if defined(PROFILING) || defined(DEBUG)
-    initProfiling2();
-#endif
-
     /* start the virtual timer 'subsystem'. */
     startVirtTimer(TICK_MILLISECS);
 
@@ -177,9 +173,9 @@ startupHaskell(int argc, char *argv[], void (*init_root)(void))
 
 
 /* -----------------------------------------------------------------------------
-   Getting the program's arguments.
+   Getting/Setting the program's arguments.
 
-   This is used by System.Environment.getArgs.
+   These are used by System.Environment.
    -------------------------------------------------------------------------- */
 
 void
@@ -189,6 +185,18 @@ getProgArgv(int *argc, char **argv[])
     *argv = prog_argv;
 }
 
+void
+setProgArgv(int argc, char *argv[])
+{
+   /* Usually this is done by startupHaskell, so we don't need to call this. 
+      However, sometimes Hugs wants to change the arguments which Haskell
+      getArgs >>= ... will be fed.  So you can do that by calling here
+      _after_ calling startupHaskell.
+   */
+   prog_argc = argc;
+   prog_argv = argv;
+}
+
 /* -----------------------------------------------------------------------------
    Per-module initialisation
 
@@ -246,6 +254,12 @@ hs_add_root(void (*init_root)(void))
     StgRun((StgFunPtr)stg_init, &cap.r);
 
     freeGroup(bd);
+
+#if defined(PROFILING) || defined(DEBUG)
+    // This must be done after module initialisation.
+    // ToDo: make this work in the presence of multiple hs_add_root()s.
+    initProfiling2();
+#endif
 }
 
 /* -----------------------------------------------------------------------------