X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgTypes.h;h=ac2f78e27c0da63935185ed059f5a1b654449005;hb=0372ac231bd18e993a2533f784805046876d5527;hp=ae9eec5334559fb1aae579434f4bca9e8510c7fd;hpb=423d477bfecd490de1449c59325c8776f91d7aac;p=ghc-hetmet.git diff --git a/ghc/includes/StgTypes.h b/ghc/includes/StgTypes.h index ae9eec5..ac2f78e 100644 --- a/ghc/includes/StgTypes.h +++ b/ghc/includes/StgTypes.h @@ -48,7 +48,6 @@ typedef unsigned char StgWord8; typedef signed short StgInt16; typedef unsigned short StgWord16; - #if SIZEOF_UNSIGNED_INT == 4 typedef signed int StgInt32; typedef unsigned int StgWord32; @@ -83,11 +82,13 @@ typedef unsigned __int64 StgWord64; #if SIZEOF_VOID_P == 8 typedef StgInt64 StgInt; typedef StgWord64 StgWord; +typedef StgInt32 StgHalfInt; typedef StgWord32 StgHalfWord; #else #if SIZEOF_VOID_P == 4 typedef StgInt32 StgInt; typedef StgWord32 StgWord; +typedef StgInt16 StgHalfInt; typedef StgWord16 StgHalfWord; #else #error GHC untested on this architecture: sizeof(void *) != 4 or 8 @@ -113,6 +114,7 @@ typedef void StgVoid; typedef struct StgClosure_ StgClosure; typedef StgClosure* StgClosurePtr; typedef StgWord* StgPtr; /* pointer into closure */ +typedef StgWord volatile* StgVolatilePtr; /* pointer to volatile word */ typedef StgWord StgOffset; /* byte offset within closure */ typedef struct StgTSO_* StgTSOPtr;