projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak the build-dependencies rule, and add comments for it
[ghc-hetmet.git]
/
includes
/
HsFFI.h
diff --git
a/includes/HsFFI.h
b/includes/HsFFI.h
index
9fce2a4
..
dceabab
100644
(file)
--- a/
includes/HsFFI.h
+++ b/
includes/HsFFI.h
@@
-18,8
+18,7
@@
extern "C" {
/* get types from GHC's runtime system */
#include "ghcconfig.h"
/* get types from GHC's runtime system */
#include "ghcconfig.h"
-#include "RtsConfig.h"
-#include "StgTypes.h"
+#include "stg/Types.h"
/* get limits for integral types */
#ifdef HAVE_STDINT_H
/* get limits for integral types */
#ifdef HAVE_STDINT_H
@@
-84,10
+83,7
@@
typedef StgDouble HsDouble;
typedef StgInt HsBool;
typedef void* HsPtr; /* this should better match StgAddr */
typedef void (*HsFunPtr)(void); /* this should better match StgAddr */
typedef StgInt HsBool;
typedef void* HsPtr; /* this should better match StgAddr */
typedef void (*HsFunPtr)(void); /* this should better match StgAddr */
-typedef void* HsForeignPtr; /* ... and this StgForeignPtr */
typedef void* HsStablePtr;
typedef void* HsStablePtr;
-typedef void* HsAddr; /* DEPRECATED */
-typedef void* HsForeignObj; /* DEPRECATED */
/* this should correspond to the type of StgChar in StgTypes.h */
#define HS_CHAR_MIN 0
/* this should correspond to the type of StgChar in StgTypes.h */
#define HS_CHAR_MIN 0
@@
-104,9
+100,11
@@
typedef void* HsForeignObj; /* DEPRECATED */
#if SIZEOF_VOID_P == 8
#define HS_INT_MIN __INT64_MIN
#define HS_INT_MAX __INT64_MAX
#if SIZEOF_VOID_P == 8
#define HS_INT_MIN __INT64_MIN
#define HS_INT_MAX __INT64_MAX
+#define HS_WORD_MAX __UINT64_MAX
#elif SIZEOF_VOID_P == 4
#define HS_INT_MIN __INT32_MIN
#define HS_INT_MAX __INT32_MAX
#elif SIZEOF_VOID_P == 4
#define HS_INT_MIN __INT32_MIN
#define HS_INT_MAX __INT32_MAX
+#define HS_WORD_MAX __UINT32_MAX
#else
#error GHC untested on this architecture: sizeof(void *) != 4 or 8
#endif
#else
#error GHC untested on this architecture: sizeof(void *) != 4 or 8
#endif
@@
-158,10
+156,6
@@
extern void hs_perform_gc (void);
extern void hs_free_stable_ptr (HsStablePtr sp);
extern void hs_free_fun_ptr (HsFunPtr fp);
extern void hs_free_stable_ptr (HsStablePtr sp);
extern void hs_free_fun_ptr (HsFunPtr fp);
-extern int hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr);
-extern void hs_hpc_tick(int globIx);
-extern void hs_hpc_throw(void);
-
/* -------------------------------------------------------------------------- */
#ifdef __cplusplus
/* -------------------------------------------------------------------------- */
#ifdef __cplusplus