X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStgMiscClosures.hc;fp=ghc%2Frts%2FStgMiscClosures.hc;h=7dcae9fef6abca8ecb6d72c2ed3c90045e592c5d;hb=bcea125324625d548f4705c29a9d9c57b7a9dc13;hp=38f66c66cda5a158254cb698d222b3cf69d5e9be;hpb=4a7c2629f1dd058ed4c9b6b6b37758b22a9fd6e4;p=ghc-hetmet.git diff --git a/ghc/rts/StgMiscClosures.hc b/ghc/rts/StgMiscClosures.hc index 38f66c6..7dcae9f 100644 --- a/ghc/rts/StgMiscClosures.hc +++ b/ghc/rts/StgMiscClosures.hc @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: StgMiscClosures.hc,v 1.77 2002/07/18 06:05:30 sof Exp $ + * $Id: StgMiscClosures.hc,v 1.78 2002/09/17 12:32:40 simonmar Exp $ * * (c) The GHC Team, 1998-2000 * @@ -36,14 +36,13 @@ Template for the entry code of non-enterable closures. */ -#define NON_ENTERABLE_ENTRY_CODE(type) \ -STGFUN(stg_##type##_entry) \ -{ \ - FB_ \ - DUMP_ERRMSG(#type " object entered!\n"); \ - STGCALL1(shutdownHaskellAndExit, EXIT_FAILURE); \ - return NULL; \ - FE_ \ +#define NON_ENTERABLE_ENTRY_CODE(type) \ +STGFUN(stg_##type##_entry) \ +{ \ + FB_ \ + barf(#type " object entered!\n"); \ + return NULL; \ + FE_ \ } @@ -629,7 +628,7 @@ STGFUN(stg_SE_BLACKHOLE_entry) FE_ } -INFO_TABLE(SE_CAF_BLACKHOLE_info, SE_CAF_BLACKHOLE_entry,0,2,SE_CAF_BLACKHOLE,,EF_,"CAF_BLACKHOLE","CAF_BLACKHOLE"); +INFO_TABLE(stg_SE_CAF_BLACKHOLE_info, SE_CAF_BLACKHOLE_entry,0,2,SE_CAF_BLACKHOLE,,EF_,"CAF_BLACKHOLE","CAF_BLACKHOLE"); STGFUN(stg_SE_CAF_BLACKHOLE_entry) { FB_