X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRtsAPI.h;h=f554b96061c7143ef8f649fbe90e6977f726531a;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=97a976b64735e3f5bdec3476db051787a69ebf80;hpb=d40db6036f51faa71b1b689adffe8b318f27e052;p=ghc-hetmet.git diff --git a/ghc/includes/RtsAPI.h b/ghc/includes/RtsAPI.h index 97a976b..f554b96 100644 --- a/ghc/includes/RtsAPI.h +++ b/ghc/includes/RtsAPI.h @@ -1,7 +1,6 @@ /* ---------------------------------------------------------------------------- - * $Id: RtsAPI.h,v 1.34 2003/02/06 09:56:07 simonmar Exp $ * - * (c) The GHC Team, 1998-1999 + * (c) The GHC Team, 1998-2004 * * API for invoking Haskell functions via the RTS * @@ -113,17 +112,14 @@ rts_eval_ ( HaskellObj p, unsigned int stack_size, /*out*/HaskellObj *ret ); SchedulerStatus rts_evalIO ( HaskellObj p, /*out*/HaskellObj *ret ); -#if defined(COMPILING_RTS_MAIN) -/* Used by the RTS' main() only */ -SchedulerStatus -rts_mainEvalIO ( HaskellObj p, /*out*/HaskellObj *ret ); -#endif - SchedulerStatus rts_evalStableIO ( HsStablePtr s, /*out*/HsStablePtr *ret ); SchedulerStatus -rts_evalLazyIO ( HaskellObj p, unsigned int stack_size, /*out*/HaskellObj *ret ); +rts_evalLazyIO ( HaskellObj p, /*out*/HaskellObj *ret ); + +SchedulerStatus +rts_evalLazyIO_ ( HaskellObj p, unsigned int stack_size, /*out*/HaskellObj *ret ); void rts_checkSchedStatus ( char* site, SchedulerStatus rc); @@ -134,10 +130,10 @@ rts_checkSchedStatus ( char* site, SchedulerStatus rc); These are used by foreign export and foreign import "wrapper" stubs. ----------------------------------------------------------------------- */ -extern StgClosure GHCziTopHandler_runIO_closure; -extern StgClosure GHCziTopHandler_runNonIO_closure; -#define runIO_closure (&GHCziTopHandler_runIO_closure) -#define runNonIO_closure (&GHCziTopHandler_runNonIO_closure) +extern StgWord GHCziTopHandler_runIO_closure[]; +extern StgWord GHCziTopHandler_runNonIO_closure[]; +#define runIO_closure GHCziTopHandler_runIO_closure +#define runNonIO_closure GHCziTopHandler_runNonIO_closure /* ------------------------------------------------------------------------ */