X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FStgMiscClosures.cmm;h=0a4dbdc56174c93ada918446937cf7e1c3539bd7;hb=2fc88e736892981b8b2b46661ac11f14dc351bc8;hp=e532e51a53f0cb58b2aa606662441ce7c533d2a1;hpb=9ff76535edb25ab7434284adddb5c64708ecb547;p=ghc-hetmet.git diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm index e532e51..0a4dbdc 100644 --- a/rts/StgMiscClosures.cmm +++ b/rts/StgMiscClosures.cmm @@ -12,6 +12,14 @@ #include "Cmm.h" +#ifdef __PIC__ +import pthread_mutex_lock; +import base_GHCziBase_Czh_static_info; +import base_GHCziBase_Izh_static_info; +#endif +import EnterCriticalSection; +import LeaveCriticalSection; + /* ---------------------------------------------------------------------------- Support for the bytecode interpreter. ------------------------------------------------------------------------- */ @@ -57,9 +65,7 @@ stg_interp_constr_entry haven't got a good story about that yet. */ -INFO_TABLE_RET( stg_ctoi_R1p, - 0/*size*/, 0/*bitmap*/, /* special layout! */ - RET_BCO) +INFO_TABLE_RET( stg_ctoi_R1p, RET_BCO) { Sp_adj(-2); Sp(1) = R1; @@ -70,9 +76,7 @@ INFO_TABLE_RET( stg_ctoi_R1p, /* * 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; @@ -83,9 +87,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; @@ -96,9 +98,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; @@ -109,9 +109,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; @@ -122,9 +120,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; @@ -135,9 +131,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; @@ -149,9 +143,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; @@ -183,7 +175,7 @@ INFO_TABLE_FUN( stg_BCO, 4, 0, BCO, "BCO", "BCO", ARG_BCO ) 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); } @@ -199,7 +191,7 @@ INFO_TABLE(stg_IND_direct,1,0,IND,"IND","IND") 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); } @@ -236,7 +228,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(); @@ -249,7 +241,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); } @@ -278,7 +270,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); @@ -314,7 +306,7 @@ INFO_TABLE(stg_BLACKHOLE,0,1,BLACKHOLE,"BLACKHOLE","BLACKHOLE") LDV_ENTER(R1); #if defined(THREADED_RTS) - foreign "C" ACQUIRE_LOCK(sched_mutex "ptr"); + ACQUIRE_LOCK(sched_mutex "ptr"); // released in stg_block_blackhole_finally #endif @@ -353,13 +345,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) */ @@ -379,7 +371,7 @@ INFO_TABLE(stg_CAF_BLACKHOLE,0,1,CAF_BLACKHOLE,"CAF_BLACKHOLE","CAF_BLACKHOLE") #endif #if defined(THREADED_RTS) - foreign "C" ACQUIRE_LOCK(sched_mutex "ptr"); + ACQUIRE_LOCK(sched_mutex "ptr"); // released in stg_block_blackhole_finally #endif @@ -396,10 +388,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 /* ---------------------------------------------------------------------------- @@ -410,7 +402,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 @@ -419,7 +411,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 @@ -427,7 +419,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 @@ -438,7 +430,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 @@ -447,7 +439,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 @@ -457,7 +449,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); @@ -466,7 +458,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 @@ -475,45 +467,45 @@ INFO_TABLE(stg_STABLE_NAME,0,1,STABLE_NAME,"STABLE_NAME","STABLE_NAME") and entry code for each type. ------------------------------------------------------------------------- */ -INFO_TABLE(stg_FULL_MVAR,3,0,MVAR,"MVAR","MVAR") -{ foreign "C" barf("FULL_MVAR object entered!"); } +INFO_TABLE(stg_MVAR_CLEAN,3,0,MVAR_CLEAN,"MVAR","MVAR") +{ foreign "C" barf("MVAR object entered!") never returns; } -INFO_TABLE(stg_EMPTY_MVAR,3,0,MVAR,"MVAR","MVAR") -{ foreign "C" barf("EMPTY_MVAR object entered!"); } +INFO_TABLE(stg_MVAR_DIRTY,3,0,MVAR_DIRTY,"MVAR","MVAR") +{ foreign "C" barf("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!"); } +{ 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!"); } +{ foreign "C" barf("ATOMIC_INVARIANT object entered!") never returns; } 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!"); } +{ 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_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!"); } +{ 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!"); } +{ 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); @@ -531,7 +523,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); @@ -540,12 +532,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 @@ -563,28 +555,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 @@ -608,17 +600,16 @@ 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 base_GHCziBase_Czh_static #define Int_hash_static_info base_GHCziBase_Izh_static