From: panne Date: Sat, 21 Aug 2004 12:47:17 +0000 (+0000) Subject: [project @ 2004-08-21 12:47:17 by panne] X-Git-Tag: Initial_conversion_from_CVS_complete~1704 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=c320276c4b23db92bc06e608292e8dd214f771e1 [project @ 2004-08-21 12:47:17 by panne] Moved createAdjustor and freeHaskellFunctionPtr to a header visible in *.hc code. The whole header layout is a little bit baroque, IMHO... --- diff --git a/ghc/includes/Rts.h b/ghc/includes/Rts.h index 8d42730..96840bc 100644 --- a/ghc/includes/Rts.h +++ b/ghc/includes/Rts.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Rts.h,v 1.24 2004/08/13 13:09:27 simonmar Exp $ + * $Id: Rts.h,v 1.25 2004/08/21 12:47:17 panne Exp $ * * (c) The GHC Team, 1998-1999 * @@ -173,13 +173,7 @@ extern void __decodeFloat (MP_INT *man, I_ *_exp, StgFloat flt); #include "DNInvoke.h" #endif -/* Creating and destroying an adjustor thunk and initialising the whole - adjustor thunk machinery. I cannot make myself create a separate .h file - for these three (sof.) - -*/ -extern void* createAdjustor(int cconv, StgStablePtr hptr, StgFunPtr wptr); -extern void freeHaskellFunctionPtr(void* ptr); +/* Initialising the whole adjustor thunk machinery. */ extern rtsBool initAdjustor(void); extern void stg_exit(int n) GNU_ATTRIBUTE(__noreturn__); diff --git a/ghc/includes/RtsExternal.h b/ghc/includes/RtsExternal.h index da4f02e..d8d810b 100644 --- a/ghc/includes/RtsExternal.h +++ b/ghc/includes/RtsExternal.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsExternal.h,v 1.2 2004/08/13 13:09:29 simonmar Exp $ + * $Id: RtsExternal.h,v 1.3 2004/08/21 12:47:17 panne Exp $ * * (c) The GHC Team, 1998-2004 * @@ -53,6 +53,10 @@ extern StgInt isFloatNegativeZero(StgFloat f); extern StgInt suspendThread ( StgRegTable * ); extern StgRegTable * resumeThread ( StgInt ); +/* Creating and destroying an adjustor thunk */ +extern void* createAdjustor(int cconv, StgStablePtr hptr, StgFunPtr wptr); +extern void freeHaskellFunctionPtr(void* ptr); + /* ----------------------------------------------------------------------------- Storage manager stuff exported -------------------------------------------------------------------------- */