X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fincludes%2FRtsAPI.h;h=35a8df03575bb6974a365cd59190d7fe072c4a55;hb=09c44c1e42d9784c0b35e9699a46c777fa2e550f;hp=c9c24f9f6a54b7edc53d4eb5f08d0b5e505a888e;hpb=21462c00b3241f15de3b145ac92ee5b266b5733a;p=ghc-hetmet.git

diff --git a/ghc/includes/RtsAPI.h b/ghc/includes/RtsAPI.h
index c9c24f9..35a8df0 100644
--- a/ghc/includes/RtsAPI.h
+++ b/ghc/includes/RtsAPI.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: RtsAPI.h,v 1.4 1999/03/02 19:44:15 sof Exp $
+ * $Id: RtsAPI.h,v 1.15 2000/06/27 09:18:04 sewardj Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -10,15 +10,40 @@
 #ifndef RTSAPI_H
 #define RTSAPI_H
 
-#include "SchedAPI.h"  /* for SchedulerStatus */
+/*
+ * Running the scheduler
+ */
+typedef enum {
+    NoStatus,    /* not finished yet */
+    Success,	 /* completed successfully */
+    Killed,	 /* uncaught exception */
+    Interrupted, /* stopped in response to a call to interruptStgRts */
+    Deadlock	 /* no threads to run, but main thread hasn't finished */
+} SchedulerStatus;
 
 typedef StgClosure *HaskellObj;
 
+
+/* Make this compilable with Visual C++.  We can't just use StgInt64 here,
+   because this file should be compilable without reference to the rest
+   of the RTS machinery.
+*/
+#if defined(__MSVC__)
+typedef __int64            int64;
+typedef unsigned __int64   nat64;
+#else
+typedef long long          int64;
+typedef unsigned long long nat64;
+#endif
+
 /* ----------------------------------------------------------------------------
    Starting up and shutting down the Haskell RTS.
    ------------------------------------------------------------------------- */
-extern void startupHaskell  ( int argc, char *argv[] );
-extern void shutdownHaskell ( void );
+extern void startupHaskell         ( int argc, char *argv[], void *init_root );
+extern void shutdownHaskell        ( void );
+extern void shutdownHaskellAndExit ( int exitCode );
+extern void setProgArgv            ( int argc, char *argv[] );
+extern void getProgArgv            ( int *argc, char **argv[] );
 
 /* ----------------------------------------------------------------------------
    Building Haskell objects from C datatypes.
@@ -28,12 +53,12 @@ HaskellObj   rts_mkInt        ( int i );
 HaskellObj   rts_mkInt8       ( int i );
 HaskellObj   rts_mkInt16      ( int i );
 HaskellObj   rts_mkInt32      ( int i );
-HaskellObj   rts_mkInt64      ( long long i );
 HaskellObj   rts_mkWord       ( unsigned int w );
 HaskellObj   rts_mkWord8      ( unsigned int w );
 HaskellObj   rts_mkWord16     ( unsigned int w );
 HaskellObj   rts_mkWord32     ( unsigned int w );
-HaskellObj   rts_mkWord64     ( unsigned long long w );
+HaskellObj   rts_mkInt64      ( int64 i );
+HaskellObj   rts_mkWord64     ( nat64 w );
 HaskellObj   rts_mkFloat      ( float f );
 HaskellObj   rts_mkDouble     ( double f );
 HaskellObj   rts_mkStablePtr  ( StgStablePtr s );
@@ -72,7 +97,12 @@ SchedulerStatus
 rts_evalIO ( HaskellObj p, /*out*/HaskellObj *ret );
 
 SchedulerStatus 
-rts_evalIO_ ( HaskellObj p, unsigned int stack_size, /*out*/HaskellObj *ret );
+rts_evalLazyIO ( HaskellObj p, unsigned int stack_size, /*out*/HaskellObj *ret );
+
+#if defined(PAR) || defined(SMP)
+SchedulerStatus
+rts_evalNothing(unsigned int stack_size);
+#endif
 
 void
 rts_checkSchedStatus ( char* site, SchedulerStatus rc);