X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgTypes.h;h=e864d812fd2e8a2b0555a9065e1218643b28d962;hb=6e5df3a4551b8d8b83e936b3f7b52edfc778ca8a;hp=e6b87f99480c2f6e0db7072d304721b5c806372e;hpb=6f0e4c4d40697af1e63d0feb01b6a1accd128ef8;p=ghc-hetmet.git

diff --git a/ghc/includes/StgTypes.h b/ghc/includes/StgTypes.h
index e6b87f9..e864d81 100644
--- a/ghc/includes/StgTypes.h
+++ b/ghc/includes/StgTypes.h
@@ -1,29 +1,43 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgTypes.h,v 1.12 2000/06/12 11:04:12 simonmar Exp $
+ * $Id: StgTypes.h,v 1.18 2001/10/03 13:57:42 simonmar Exp $
  *
- * (c) The GHC Team, 1998-1999
+ * (c) The GHC Team, 1998-2000
+ *
+ * Various C datatypes used in the run-time system.  This is the
+ * lowest-level include file, after config.h and Derived.h.
+ *
+ * This module should define types *only*, all beginning with "Stg".
  *
- * Various C datatypes used in the run-time system.
-
  * Specifically:
 
 	StgInt8,  16, 32, 64
 	StgWord8, 16, 32, 64
 	StgChar, StgFloat, StgDouble
 
-	***** All the same size: *****
+	***** All the same size (i.e. sizeof(void *)): *****
 	StgPtr			Basic pointer type
 	StgWord			Unit of heap allocation
 	StgInt			Signed version of StgWord
 	StgAddr			Generic address type
 	
- * WARNING: Keep this file and HsFFI.h in synch!
+	StgBool, StgVoid, StgClosurePtr, StgPtr, StgOffset, 
+	StgTSOPtr, StgForeignPtr, StgStackOffset, StgStackPtr,
+	StgCode, StgArray, StgByteArray, StgStablePtr, StgFunPtr,
+	StgUnion.
+
+ * WARNING: Keep this file, MachDeps.h, and HsFFI.h in synch!
+ *
+ * NOTE: assumes #include "config.h"
+ * 
+ * Works with or without _POSIX_SOURCE.
  *
  * ---------------------------------------------------------------------------*/
 
 #ifndef STGTYPES_H
 #define STGTYPES_H
 
+#include "Derived.h"
+
 /*
  * First, platform-dependent definitions of size-specific integers.
  * Assume for now that the int type is 32 bits.
@@ -45,27 +59,20 @@ typedef unsigned int             StgWord32;
 #error GHC untested on this architecture: sizeof(unsigned int) != 4
 #endif
 
-/* This #define controls whether we need to support long longs on a particular
- * platform. 
- *
- * ToDo: find a proper home for (derived) configuration information like this.
- */
-#if HAVE_LONG_LONG && SIZEOF_VOID_P < 8
-#define SUPPORT_LONG_LONGS
-#endif
-
 #ifdef SUPPORT_LONG_LONGS
 /* assume long long is 64 bits */
-typedef unsigned long long int StgWord64;
 typedef signed long long int   StgInt64;
+typedef unsigned long long int StgWord64;
 #elif SIZEOF_LONG == 8
 typedef signed   long          StgInt64;
 typedef unsigned long          StgWord64;
+#elif defined(__MSVC__)
+typedef __int64                StgInt64;
+typedef unsigned __int64       StgWord64;
 #else
 #error GHC untested on this architecture: sizeof(void *) < 8 and no long longs.
 #endif
 
-
 /*
  * Define the standard word size we'll use on this machine: make it
  * big enough to hold a pointer.
@@ -83,30 +90,24 @@ typedef StgWord32          StgWord;
 #endif
 #endif
 
+#define W_MASK  (sizeof(W_)-1)
+
 typedef void*              StgAddr;
 
 /*
  * Other commonly-used STG datatypes.
  */
 
-typedef StgWord8           StgChar;
+typedef StgWord32          StgChar;
 typedef int                StgBool;
-/*
- * If a double fits in an StgWord, don't bother using floats.
- */
 
-#if SIZEOF_DOUBLE == SIZEOF_VOID_P
-typedef double		   StgFloat;
-typedef double		   StgDouble;
-#define FLOATS_AS_DOUBLES  1
-#else
 typedef float		   StgFloat;
 typedef double		   StgDouble;
-#endif
                            
 typedef void               StgVoid;
                            
-typedef struct StgClosure_* StgClosurePtr;
+typedef struct StgClosure_ StgClosure;
+typedef StgClosure*        StgClosurePtr;
 typedef StgWord*           StgPtr;           /* pointer into closure       */
 typedef StgWord            StgOffset;        /* byte offset within closure */
                            
@@ -119,27 +120,12 @@ typedef StgInt             StgStackOffset;   /* offset in words! */
 typedef StgWord*           StgStackPtr;
 
 typedef StgWord8 	   StgCode;  	    /* close enough */
-typedef StgCode*	   StgCodePtr;	
 
 typedef StgPtr*            StgArray;        /* the goods of an Array# */
 typedef char*		   StgByteArray;    /* the goods of a ByteArray# */
 
-typedef StgInt64	       LI_;
-typedef StgWord64	       LW_;
-
-/* Stable Pointers:  A stable pointer is represented as an index into
- * the stable pointer table in the low 24 bits with a weight in the
- * upper 8 bits.
- * SUP: StgStablePtr used to be a synonym for StgWord, but stable pointers
- * are guaranteed to be void* on the C-side, so we have to do some occasional
- * casting. Size is not a matter, because StgWord is always the same size as
- * a void*.
- */
 typedef void*		   StgStablePtr;
 
-#define STABLEPTR_WEIGHT_MASK   ((StgWord)0xff << ((sizeof(StgWord)-1) * BITS_PER_BYTE))
-#define STABLEPTR_WEIGHT_SHIFT  (BITS_IN(StgWord) - 8)
-
 /*
   Types for the generated C functions
   take no arguments
@@ -160,7 +146,8 @@ typedef StgFunPtr StgFun(void);
 typedef union {
     StgWord        w;
     StgAddr        a;
-    StgWord        c;
+    StgChar        c;
+    StgInt8        i8;
     StgFloat       f;
     StgInt         i;
     StgPtr         p;
@@ -170,32 +157,4 @@ typedef union {
     StgTSOPtr      t;
 } StgUnion;
 
-/*
- * Shorthand forms
- */
-
-typedef StgChar		C_;
-typedef StgWord		W_;
-typedef StgWord*	P_;
-typedef P_*		PP_;
-typedef StgInt		I_;
-typedef StgAddr	        A_;
-typedef const StgWord*  D_;
-typedef StgFunPtr       F_;
-typedef StgByteArray    B_;
-typedef StgClosurePtr   L_;
-
-/*
- * We often want to know the size of something in units of an
- * StgWord... (rounded up, of course!)
- */
-
-#define sizeofW(t) ((sizeof(t)+sizeof(W_)-1)/sizeof(W_))
-
-/* 
- * It's nice to be able to grep for casts
- */
-
-#define stgCast(ty,e) ((ty)(e))
-
 #endif /* STGTYPES_H */