X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsAPI.c;h=4f7e783595700daf2c87408f6f3ea260c68935eb;hb=e17270158bebe11ee953e3d91abf82dcd16a2203;hp=529135e5dc2809341bfed933e9bf9e30ad55d1f4;hpb=0c039fb92a48ad87a314b902efbba3bc40539e02;p=ghc-hetmet.git diff --git a/ghc/rts/RtsAPI.c b/ghc/rts/RtsAPI.c index 529135e..4f7e783 100644 --- a/ghc/rts/RtsAPI.c +++ b/ghc/rts/RtsAPI.c @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: RtsAPI.c,v 1.42 2003/02/06 10:04:57 simonmar Exp $ + * $Id: RtsAPI.c,v 1.44 2003/05/23 08:28:48 simonmar Exp $ * * (c) The GHC Team, 1998-2001 * @@ -179,7 +179,6 @@ rts_mkFunPtr (HsFunPtr a) return p; } -#ifdef COMPILER /* GHC has em, Hugs doesn't */ HaskellObj rts_mkBool (HsBool b) { @@ -195,7 +194,6 @@ rts_mkString (char *s) { return rts_apply((StgClosure *)unpackCString_closure, rts_mkPtr(s)); } -#endif /* COMPILER */ HaskellObj rts_apply (HaskellObj f, HaskellObj arg) @@ -366,7 +364,6 @@ rts_getFunPtr (HaskellObj p) return (void *)(p->payload[0]); } -#ifdef COMPILER /* GHC has em, Hugs doesn't */ HsBool rts_getBool (HaskellObj p) { @@ -378,7 +375,6 @@ rts_getBool (HaskellObj p) barf("rts_getBool: not a Bool"); } } -#endif /* COMPILER */ /* ---------------------------------------------------------------------------- Evaluating Haskell expressions @@ -415,16 +411,16 @@ rts_evalIO (HaskellObj p, /*out*/HaskellObj *ret) } /* - * Identical to rts_evalIO(), but won't create a new task/OS thread + * Identical to rts_evalLazyIO(), but won't create a new task/OS thread * to evaluate the Haskell thread. Used by main() only. Hack. */ SchedulerStatus -rts_mainEvalIO(HaskellObj p, /*out*/HaskellObj *ret) +rts_mainLazyIO(HaskellObj p, /*out*/HaskellObj *ret) { StgTSO* tso; - tso = createStrictIOThread(RtsFlags.GcFlags.initialStkSize, p); + tso = createIOThread(RtsFlags.GcFlags.initialStkSize, p); scheduleThread(tso); return waitThread(tso, ret); }