X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FStgMiscClosures.cmm;h=9e1eaf929fbd41ea37830b1ef9a32b01676e02dc;hb=0d88de0b114a391712bc117d42928b49fba4d66a;hp=70d08aeb0e49468924f2837c2602688319406ebb;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm index 70d08ae..9e1eaf9 100644 --- a/rts/StgMiscClosures.cmm +++ b/rts/StgMiscClosures.cmm @@ -12,6 +12,12 @@ #include "Cmm.h" +#ifdef __PIC__ +import pthread_mutex_lock; +import base_GHCziBase_Czh_static_info; +import base_GHCziBase_Izh_static_info; +#endif + /* ---------------------------------------------------------------------------- Support for the bytecode interpreter. ------------------------------------------------------------------------- */ @@ -23,15 +29,6 @@ stg_interp_constr_entry jump %ENTRY_CODE(Sp(0)); } -stg_interp_constr1_entry { jump %RET_VEC(Sp(0),0); } -stg_interp_constr2_entry { jump %RET_VEC(Sp(0),1); } -stg_interp_constr3_entry { jump %RET_VEC(Sp(0),2); } -stg_interp_constr4_entry { jump %RET_VEC(Sp(0),3); } -stg_interp_constr5_entry { jump %RET_VEC(Sp(0),4); } -stg_interp_constr6_entry { jump %RET_VEC(Sp(0),5); } -stg_interp_constr7_entry { jump %RET_VEC(Sp(0),6); } -stg_interp_constr8_entry { jump %RET_VEC(Sp(0),7); } - /* Some info tables to be used when compiled code returns a value to the interpreter, i.e. the interpreter pushes one of these onto the stack before entering a value. What the code does is to @@ -66,17 +63,7 @@ stg_interp_constr8_entry { jump %RET_VEC(Sp(0),7); } haven't got a good story about that yet. */ -INFO_TABLE_RET( stg_ctoi_R1p, - 0/*size*/, 0/*bitmap*/, /* special layout! */ - RET_BCO, - RET_LBL(stg_ctoi_R1p), - RET_LBL(stg_ctoi_R1p), - RET_LBL(stg_ctoi_R1p), - RET_LBL(stg_ctoi_R1p), - RET_LBL(stg_ctoi_R1p), - RET_LBL(stg_ctoi_R1p), - RET_LBL(stg_ctoi_R1p), - RET_LBL(stg_ctoi_R1p)) +INFO_TABLE_RET( stg_ctoi_R1p, RET_BCO) { Sp_adj(-2); Sp(1) = R1; @@ -84,16 +71,10 @@ INFO_TABLE_RET( stg_ctoi_R1p, jump stg_yield_to_interpreter; } -#if MAX_VECTORED_RTN != 8 -#error MAX_VECTORED_RTN has changed: please modify stg_ctoi_R1p too. -#endif - /* * When the returned value is a pointer, but unlifted, in R1 ... */ -INFO_TABLE_RET( stg_ctoi_R1unpt, - 0/*size*/, 0/*bitmap*/, /* special layout! */ - RET_BCO ) +INFO_TABLE_RET( stg_ctoi_R1unpt, RET_BCO ) { Sp_adj(-2); Sp(1) = R1; @@ -104,9 +85,7 @@ INFO_TABLE_RET( stg_ctoi_R1unpt, /* * When the returned value is a non-pointer in R1 ... */ -INFO_TABLE_RET( stg_ctoi_R1n, - 0/*size*/, 0/*bitmap*/, /* special layout! */ - RET_BCO ) +INFO_TABLE_RET( stg_ctoi_R1n, RET_BCO ) { Sp_adj(-2); Sp(1) = R1; @@ -117,9 +96,7 @@ INFO_TABLE_RET( stg_ctoi_R1n, /* * When the returned value is in F1 */ -INFO_TABLE_RET( stg_ctoi_F1, - 0/*size*/, 0/*bitmap*/, /* special layout! */ - RET_BCO ) +INFO_TABLE_RET( stg_ctoi_F1, RET_BCO ) { Sp_adj(-2); F_[Sp + WDS(1)] = F1; @@ -130,9 +107,7 @@ INFO_TABLE_RET( stg_ctoi_F1, /* * When the returned value is in D1 */ -INFO_TABLE_RET( stg_ctoi_D1, - 0/*size*/, 0/*bitmap*/, /* special layout! */ - RET_BCO ) +INFO_TABLE_RET( stg_ctoi_D1, RET_BCO ) { Sp_adj(-1) - SIZEOF_DOUBLE; D_[Sp + WDS(1)] = D1; @@ -143,9 +118,7 @@ INFO_TABLE_RET( stg_ctoi_D1, /* * When the returned value is in L1 */ -INFO_TABLE_RET( stg_ctoi_L1, - 0/*size*/, 0/*bitmap*/, /* special layout! */ - RET_BCO ) +INFO_TABLE_RET( stg_ctoi_L1, RET_BCO ) { Sp_adj(-1) - 8; L_[Sp + WDS(1)] = L1; @@ -156,9 +129,7 @@ INFO_TABLE_RET( stg_ctoi_L1, /* * When the returned value is a void */ -INFO_TABLE_RET( stg_ctoi_V, - 0/*size*/, 0/*bitmap*/, /* special layout! */ - RET_BCO ) +INFO_TABLE_RET( stg_ctoi_V, RET_BCO ) { Sp_adj(-1); Sp(0) = stg_gc_void_info; @@ -170,9 +141,7 @@ INFO_TABLE_RET( stg_ctoi_V, * should apply the BCO on the stack to its arguments, also on the * stack. */ -INFO_TABLE_RET( stg_apply_interp, - 0/*size*/, 0/*bitmap*/, /* special layout! */ - RET_BCO ) +INFO_TABLE_RET( stg_apply_interp, RET_BCO ) { /* Just in case we end up in here... (we shouldn't) */ jump stg_yield_to_interpreter; @@ -194,44 +163,33 @@ INFO_TABLE_FUN( stg_BCO, 4, 0, BCO, "BCO", "BCO", ARG_BCO ) /* ---------------------------------------------------------------------------- Info tables for indirections. - SPECIALISED INDIRECTIONS: we have a specialised indirection for each - kind of return (direct, vectored 0-7), so that we can avoid entering - the object when we know what kind of return it will do. The update - code (Updates.hc) updates objects with the appropriate kind of + SPECIALISED INDIRECTIONS: we have a specialised indirection for direct returns, + so that we can avoid entering + the object when we know it points directly to a value. The update + code (Updates.cmm) updates objects with the appropriate kind of indirection. We only do this for young-gen indirections. ------------------------------------------------------------------------- */ INFO_TABLE(stg_IND,1,0,IND,"IND","IND") { TICK_ENT_DYN_IND(); /* tick */ - R1 = StgInd_indirectee(R1); + R1 = UNTAG(StgInd_indirectee(R1)); TICK_ENT_VIA_NODE(); jump %GET_ENTRY(R1); } -#define IND_SPEC(label,ret) \ -INFO_TABLE(label,1,0,IND,"IND","IND") \ -{ \ - TICK_ENT_DYN_IND(); /* tick */ \ - R1 = StgInd_indirectee(R1); \ - TICK_ENT_VIA_NODE(); \ - jump ret; \ +INFO_TABLE(stg_IND_direct,1,0,IND,"IND","IND") +{ + TICK_ENT_DYN_IND(); /* tick */ + R1 = StgInd_indirectee(R1); + TICK_ENT_VIA_NODE(); + jump %ENTRY_CODE(Sp(0)); } -IND_SPEC(stg_IND_direct, %ENTRY_CODE(Sp(0))) -IND_SPEC(stg_IND_0, %RET_VEC(Sp(0),0)) -IND_SPEC(stg_IND_1, %RET_VEC(Sp(0),1)) -IND_SPEC(stg_IND_2, %RET_VEC(Sp(0),2)) -IND_SPEC(stg_IND_3, %RET_VEC(Sp(0),3)) -IND_SPEC(stg_IND_4, %RET_VEC(Sp(0),4)) -IND_SPEC(stg_IND_5, %RET_VEC(Sp(0),5)) -IND_SPEC(stg_IND_6, %RET_VEC(Sp(0),6)) -IND_SPEC(stg_IND_7, %RET_VEC(Sp(0),7)) - INFO_TABLE(stg_IND_STATIC,1,0,IND_STATIC,"IND_STATIC","IND_STATIC") { TICK_ENT_STATIC_IND(); /* tick */ - R1 = StgInd_indirectee(R1); + R1 = UNTAG(StgInd_indirectee(R1)); TICK_ENT_VIA_NODE(); jump %GET_ENTRY(R1); } @@ -268,7 +226,7 @@ INFO_TABLE(stg_IND_PERM,1,0,IND_PERM,"IND_PERM","IND_PERM") StgHeader_info(R1) = stg_IND_info; #endif /* TICKY_TICKY */ - R1 = StgInd_indirectee(R1); + R1 = UNTAG(StgInd_indirectee(R1)); #if defined(TICKY_TICKY) && !defined(PROFILING) TICK_ENT_VIA_NODE(); @@ -281,7 +239,7 @@ INFO_TABLE(stg_IND_PERM,1,0,IND_PERM,"IND_PERM","IND_PERM") INFO_TABLE(stg_IND_OLDGEN,1,0,IND_OLDGEN,"IND_OLDGEN","IND_OLDGEN") { TICK_ENT_STATIC_IND(); /* tick */ - R1 = StgInd_indirectee(R1); + R1 = UNTAG(StgInd_indirectee(R1)); TICK_ENT_VIA_NODE(); jump %GET_ENTRY(R1); } @@ -294,7 +252,7 @@ INFO_TABLE(stg_IND_OLDGEN_PERM,1,0,IND_OLDGEN_PERM,"IND_OLDGEN_PERM","IND_OLDGEN #if defined(TICKY_TICKY) && !defined(PROFILING) /* TICKY_TICKY && !PROFILING means PERM_IND *replaces* an IND, rather than being extra */ - TICK_ENT_PERM_IND(R1); /* tick */ + TICK_ENT_PERM_IND(); /* tick */ #endif LDV_ENTER(R1); @@ -310,7 +268,7 @@ INFO_TABLE(stg_IND_OLDGEN_PERM,1,0,IND_OLDGEN_PERM,"IND_OLDGEN_PERM","IND_OLDGEN StgHeader_info(R1) = stg_IND_OLDGEN_info; #endif /* TICKY_TICKY */ - R1 = StgInd_indirectee(R1); + R1 = UNTAG(StgInd_indirectee(R1)); TICK_ENT_VIA_NODE(); jump %GET_ENTRY(R1); @@ -385,13 +343,13 @@ INFO_TABLE(stg_RBH,1,1,RBH,"RBH","RBH") } INFO_TABLE(stg_RBH_Save_0,0,2,CONSTR,"RBH_Save_0","RBH_Save_0") -{ foreign "C" barf("RBH_Save_0 object entered!"); } +{ foreign "C" barf("RBH_Save_0 object entered!") never returns; } INFO_TABLE(stg_RBH_Save_1,1,1,CONSTR,"RBH_Save_1","RBH_Save_1"); -{ foreign "C" barf("RBH_Save_1 object entered!"); } +{ foreign "C" barf("RBH_Save_1 object entered!") never returns; } INFO_TABLE(stg_RBH_Save_2,2,0,CONSTR,"RBH_Save_2","RBH_Save_2"); -{ foreign "C" barf("RBH_Save_2 object entered!"); } +{ foreign "C" barf("RBH_Save_2 object entered!") never returns; } #endif /* defined(PAR) || defined(GRAN) */ @@ -428,10 +386,10 @@ INFO_TABLE(stg_CAF_BLACKHOLE,0,1,CAF_BLACKHOLE,"CAF_BLACKHOLE","CAF_BLACKHOLE") #ifdef EAGER_BLACKHOLING INFO_TABLE(stg_SE_BLACKHOLE,0,1,SE_BLACKHOLE,"SE_BLACKHOLE","SE_BLACKHOLE") -{ foreign "C" barf("SE_BLACKHOLE object entered!"); } +{ foreign "C" barf("SE_BLACKHOLE object entered!") never returns; } INFO_TABLE(stg_SE_CAF_BLACKHOLE,0,1,SE_CAF_BLACKHOLE,"SE_CAF_BLACKHOLE","SE_CAF_BLACKHOLE") -{ foreign "C" barf("SE_CAF_BLACKHOLE object entered!"); } +{ foreign "C" barf("SE_CAF_BLACKHOLE object entered!") never returns; } #endif /* ---------------------------------------------------------------------------- @@ -442,7 +400,7 @@ INFO_TABLE(stg_SE_CAF_BLACKHOLE,0,1,SE_CAF_BLACKHOLE,"SE_CAF_BLACKHOLE","SE_CAF_ ------------------------------------------------------------------------- */ INFO_TABLE(stg_WHITEHOLE, 0,0, BLACKHOLE, "WHITEHOLE", "WHITEHOLE") -{ foreign "C" barf("WHITEHOLE object entered!"); } +{ foreign "C" barf("WHITEHOLE object entered!") never returns; } /* ---------------------------------------------------------------------------- Some static info tables for things that don't get entered, and @@ -451,7 +409,7 @@ INFO_TABLE(stg_WHITEHOLE, 0,0, BLACKHOLE, "WHITEHOLE", "WHITEHOLE") ------------------------------------------------------------------------- */ INFO_TABLE(stg_TSO, 0,0,TSO, "TSO", "TSO") -{ foreign "C" barf("TSO object entered!"); } +{ foreign "C" barf("TSO object entered!") never returns; } /* ---------------------------------------------------------------------------- Evacuees are left behind by the garbage collector. Any attempt to enter @@ -459,7 +417,7 @@ INFO_TABLE(stg_TSO, 0,0,TSO, "TSO", "TSO") ------------------------------------------------------------------------- */ INFO_TABLE(stg_EVACUATED,1,0,EVACUATED,"EVACUATED","EVACUATED") -{ foreign "C" barf("EVACUATED object entered!"); } +{ foreign "C" barf("EVACUATED object entered!") never returns; } /* ---------------------------------------------------------------------------- Weak pointers @@ -470,7 +428,7 @@ INFO_TABLE(stg_EVACUATED,1,0,EVACUATED,"EVACUATED","EVACUATED") ------------------------------------------------------------------------- */ INFO_TABLE(stg_WEAK,0,4,WEAK,"WEAK","WEAK") -{ foreign "C" barf("WEAK object entered!"); } +{ foreign "C" barf("WEAK object entered!") never returns; } /* * It's important when turning an existing WEAK into a DEAD_WEAK @@ -479,7 +437,7 @@ INFO_TABLE(stg_WEAK,0,4,WEAK,"WEAK","WEAK") * DEAD_WEAK 4 non-pointer fields, the same as WEAK. */ INFO_TABLE_CONSTR(stg_DEAD_WEAK,0,4,0,CONSTR,"DEAD_WEAK","DEAD_WEAK") -{ foreign "C" barf("DEAD_WEAK object entered!"); } +{ foreign "C" barf("DEAD_WEAK object entered!") never returns; } /* ---------------------------------------------------------------------------- NO_FINALIZER @@ -489,7 +447,7 @@ INFO_TABLE_CONSTR(stg_DEAD_WEAK,0,4,0,CONSTR,"DEAD_WEAK","DEAD_WEAK") ------------------------------------------------------------------------- */ INFO_TABLE_CONSTR(stg_NO_FINALIZER,0,0,0,CONSTR_NOCAF_STATIC,"NO_FINALIZER","NO_FINALIZER") -{ foreign "C" barf("NO_FINALIZER object entered!"); } +{ foreign "C" barf("NO_FINALIZER object entered!") never returns; } CLOSURE(stg_NO_FINALIZER_closure,stg_NO_FINALIZER); @@ -498,7 +456,7 @@ CLOSURE(stg_NO_FINALIZER_closure,stg_NO_FINALIZER); ------------------------------------------------------------------------- */ INFO_TABLE(stg_STABLE_NAME,0,1,STABLE_NAME,"STABLE_NAME","STABLE_NAME") -{ foreign "C" barf("STABLE_NAME object entered!"); } +{ foreign "C" barf("STABLE_NAME object entered!") never returns; } /* ---------------------------------------------------------------------------- MVars @@ -508,37 +466,48 @@ INFO_TABLE(stg_STABLE_NAME,0,1,STABLE_NAME,"STABLE_NAME","STABLE_NAME") ------------------------------------------------------------------------- */ INFO_TABLE(stg_FULL_MVAR,3,0,MVAR,"MVAR","MVAR") -{ foreign "C" barf("FULL_MVAR object entered!"); } +{ foreign "C" barf("FULL_MVAR object entered!") never returns; } INFO_TABLE(stg_EMPTY_MVAR,3,0,MVAR,"MVAR","MVAR") -{ foreign "C" barf("EMPTY_MVAR object entered!"); } +{ foreign "C" barf("EMPTY_MVAR object entered!") never returns; } /* ----------------------------------------------------------------------------- STM -------------------------------------------------------------------------- */ INFO_TABLE(stg_TVAR, 0, 0, TVAR, "TVAR", "TVAR") -{ foreign "C" barf("TVAR object entered!"); } +{ foreign "C" barf("TVAR object entered!") never returns; } + +INFO_TABLE(stg_TVAR_WATCH_QUEUE, 0, 0, TVAR_WATCH_QUEUE, "TVAR_WATCH_QUEUE", "TVAR_WATCH_QUEUE") +{ foreign "C" barf("TVAR_WATCH_QUEUE object entered!") never returns; } + +INFO_TABLE(stg_ATOMIC_INVARIANT, 0, 0, ATOMIC_INVARIANT, "ATOMIC_INVARIANT", "ATOMIC_INVARIANT") +{ foreign "C" barf("ATOMIC_INVARIANT object entered!") never returns; } -INFO_TABLE(stg_TVAR_WAIT_QUEUE, 0, 0, TVAR_WAIT_QUEUE, "TVAR_WAIT_QUEUE", "TVAR_WAIT_QUEUE") -{ foreign "C" barf("TVAR_WAIT_QUEUE object entered!"); } +INFO_TABLE(stg_INVARIANT_CHECK_QUEUE, 0, 0, INVARIANT_CHECK_QUEUE, "INVARIANT_CHECK_QUEUE", "INVARIANT_CHECK_QUEUE") +{ foreign "C" barf("INVARIANT_CHECK_QUEUE object entered!") never returns; } INFO_TABLE(stg_TREC_CHUNK, 0, 0, TREC_CHUNK, "TREC_CHUNK", "TREC_CHUNK") -{ foreign "C" barf("TREC_CHUNK object entered!"); } +{ foreign "C" barf("TREC_CHUNK object entered!") never returns; } INFO_TABLE(stg_TREC_HEADER, 0, 0, TREC_HEADER, "TREC_HEADER", "TREC_HEADER") -{ foreign "C" barf("TREC_HEADER object entered!"); } +{ foreign "C" barf("TREC_HEADER object entered!") never returns; } -INFO_TABLE_CONSTR(stg_END_STM_WAIT_QUEUE,0,0,0,CONSTR_NOCAF_STATIC,"END_STM_WAIT_QUEUE","END_STM_WAIT_QUEUE") -{ foreign "C" barf("END_STM_WAIT_QUEUE object entered!"); } +INFO_TABLE_CONSTR(stg_END_STM_WATCH_QUEUE,0,0,0,CONSTR_NOCAF_STATIC,"END_STM_WATCH_QUEUE","END_STM_WATCH_QUEUE") +{ foreign "C" barf("END_STM_WATCH_QUEUE object entered!") never returns; } + +INFO_TABLE_CONSTR(stg_END_INVARIANT_CHECK_QUEUE,0,0,0,CONSTR_NOCAF_STATIC,"END_INVARIANT_CHECK_QUEUE","END_INVARIANT_CHECK_QUEUE") +{ foreign "C" barf("END_INVARIANT_CHECK_QUEUE object entered!") never returns; } INFO_TABLE_CONSTR(stg_END_STM_CHUNK_LIST,0,0,0,CONSTR_NOCAF_STATIC,"END_STM_CHUNK_LIST","END_STM_CHUNK_LIST") -{ foreign "C" barf("END_STM_CHUNK_LIST object entered!"); } +{ foreign "C" barf("END_STM_CHUNK_LIST object entered!") never returns; } INFO_TABLE_CONSTR(stg_NO_TREC,0,0,0,CONSTR_NOCAF_STATIC,"NO_TREC","NO_TREC") -{ foreign "C" barf("NO_TREC object entered!"); } +{ foreign "C" barf("NO_TREC object entered!") never returns; } + +CLOSURE(stg_END_STM_WATCH_QUEUE_closure,stg_END_STM_WATCH_QUEUE); -CLOSURE(stg_END_STM_WAIT_QUEUE_closure,stg_END_STM_WAIT_QUEUE); +CLOSURE(stg_END_INVARIANT_CHECK_QUEUE_closure,stg_END_INVARIANT_CHECK_QUEUE); CLOSURE(stg_END_STM_CHUNK_LIST_closure,stg_END_STM_CHUNK_LIST); @@ -552,7 +521,7 @@ CLOSURE(stg_NO_TREC_closure,stg_NO_TREC); ------------------------------------------------------------------------- */ INFO_TABLE_CONSTR(stg_END_TSO_QUEUE,0,0,0,CONSTR_NOCAF_STATIC,"END_TSO_QUEUE","END_TSO_QUEUE") -{ foreign "C" barf("END_TSO_QUEUE object entered!"); } +{ foreign "C" barf("END_TSO_QUEUE object entered!") never returns; } CLOSURE(stg_END_TSO_QUEUE_closure,stg_END_TSO_QUEUE); @@ -561,12 +530,12 @@ CLOSURE(stg_END_TSO_QUEUE_closure,stg_END_TSO_QUEUE); ------------------------------------------------------------------------- */ INFO_TABLE_CONSTR(stg_END_EXCEPTION_LIST,0,0,0,CONSTR_NOCAF_STATIC,"END_EXCEPTION_LIST","END_EXCEPTION_LIST") -{ foreign "C" barf("END_EXCEPTION_LIST object entered!"); } +{ foreign "C" barf("END_EXCEPTION_LIST object entered!") never returns; } CLOSURE(stg_END_EXCEPTION_LIST_closure,stg_END_EXCEPTION_LIST); INFO_TABLE(stg_EXCEPTION_CONS,1,1,CONSTR,"EXCEPTION_CONS","EXCEPTION_CONS") -{ foreign "C" barf("EXCEPTION_CONS object entered!"); } +{ foreign "C" barf("EXCEPTION_CONS object entered!") never returns; } /* ---------------------------------------------------------------------------- Arrays @@ -584,28 +553,28 @@ INFO_TABLE(stg_EXCEPTION_CONS,1,1,CONSTR,"EXCEPTION_CONS","EXCEPTION_CONS") ------------------------------------------------------------------------- */ INFO_TABLE(stg_ARR_WORDS, 0, 0, ARR_WORDS, "ARR_WORDS", "ARR_WORDS") -{ foreign "C" barf("ARR_WORDS object entered!"); } +{ foreign "C" barf("ARR_WORDS object entered!") never returns; } INFO_TABLE(stg_MUT_ARR_PTRS_CLEAN, 0, 0, MUT_ARR_PTRS_CLEAN, "MUT_ARR_PTRS_CLEAN", "MUT_ARR_PTRS_CLEAN") -{ foreign "C" barf("MUT_ARR_PTRS_CLEAN object entered!"); } +{ foreign "C" barf("MUT_ARR_PTRS_CLEAN object entered!") never returns; } INFO_TABLE(stg_MUT_ARR_PTRS_DIRTY, 0, 0, MUT_ARR_PTRS_DIRTY, "MUT_ARR_PTRS_DIRTY", "MUT_ARR_PTRS_DIRTY") -{ foreign "C" barf("MUT_ARR_PTRS_DIRTY object entered!"); } +{ foreign "C" barf("MUT_ARR_PTRS_DIRTY object entered!") never returns; } INFO_TABLE(stg_MUT_ARR_PTRS_FROZEN, 0, 0, MUT_ARR_PTRS_FROZEN, "MUT_ARR_PTRS_FROZEN", "MUT_ARR_PTRS_FROZEN") -{ foreign "C" barf("MUT_ARR_PTRS_FROZEN object entered!"); } +{ foreign "C" barf("MUT_ARR_PTRS_FROZEN object entered!") never returns; } INFO_TABLE(stg_MUT_ARR_PTRS_FROZEN0, 0, 0, MUT_ARR_PTRS_FROZEN0, "MUT_ARR_PTRS_FROZEN0", "MUT_ARR_PTRS_FROZEN0") -{ foreign "C" barf("MUT_ARR_PTRS_FROZEN0 object entered!"); } +{ foreign "C" barf("MUT_ARR_PTRS_FROZEN0 object entered!") never returns; } /* ---------------------------------------------------------------------------- Mutable Variables ------------------------------------------------------------------------- */ INFO_TABLE(stg_MUT_VAR_CLEAN, 1, 0, MUT_VAR_CLEAN, "MUT_VAR_CLEAN", "MUT_VAR_CLEAN") -{ foreign "C" barf("MUT_VAR_CLEAN object entered!"); } +{ foreign "C" barf("MUT_VAR_CLEAN object entered!") never returns; } INFO_TABLE(stg_MUT_VAR_DIRTY, 1, 0, MUT_VAR_DIRTY, "MUT_VAR_DIRTY", "MUT_VAR_DIRTY") -{ foreign "C" barf("MUT_VAR_DIRTY object entered!"); } +{ foreign "C" barf("MUT_VAR_DIRTY object entered!") never returns; } /* ---------------------------------------------------------------------------- Dummy return closure @@ -629,20 +598,19 @@ CLOSURE(stg_dummy_ret_closure,stg_dummy_ret); replace them with references to the static objects. ------------------------------------------------------------------------- */ -#if defined(ENABLE_WIN32_DLL_SUPPORT) +#if defined(__PIC__) && defined(mingw32_TARGET_OS) /* * When sticking the RTS in a DLL, we delay populating the * Charlike and Intlike tables until load-time, which is only * when we've got the real addresses to the C# and I# closures. * */ -static INFO_TBL_CONST StgInfoTable czh_static_info; -static INFO_TBL_CONST StgInfoTable izh_static_info; -#define Char_hash_static_info czh_static_info -#define Int_hash_static_info izh_static_info +#warning Is this correct? _imp is a pointer! +#define Char_hash_static_info _imp__base_GHCziBase_Czh_static +#define Int_hash_static_info _imp__base_GHCziBase_Izh_static #else -#define Char_hash_static_info GHCziBase_Czh_static -#define Int_hash_static_info GHCziBase_Izh_static +#define Char_hash_static_info base_GHCziBase_Czh_static +#define Int_hash_static_info base_GHCziBase_Izh_static #endif