X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FPrimOps.cmm;h=785a462bf38252a8ad1abe4793b9ae7730956bbd;hb=666d13694a9aca0a2dad5ae3f26f02ae3f0161e0;hp=9f69d16fe03b8e0a3849983f3cd86621d3251d21;hpb=ea22f57fe6b77cde3c3ec040f1246bf0e8ecef36;p=ghc-hetmet.git diff --git a/ghc/rts/PrimOps.cmm b/ghc/rts/PrimOps.cmm index 9f69d16..785a462 100644 --- a/ghc/rts/PrimOps.cmm +++ b/ghc/rts/PrimOps.cmm @@ -49,7 +49,7 @@ newByteArrayzh_fast n = R1; payload_words = ROUNDUP_BYTES_TO_WDS(n); words = BYTES_TO_WDS(SIZEOF_StgArrWords) + payload_words; - "ptr" p = foreign "C" allocate(words); + "ptr" p = foreign "C" allocateLocal(BaseReg "ptr",words) []; TICK_ALLOC_PRIM(SIZEOF_StgArrWords,WDS(payload_words),0); SET_HDR(p, stg_ARR_WORDS_info, W_[CCCS]); StgArrWords_words(p) = payload_words; @@ -73,7 +73,7 @@ newPinnedByteArrayzh_fast words = words + 1; } - "ptr" p = foreign "C" allocatePinned(words); + "ptr" p = foreign "C" allocatePinned(words) []; TICK_ALLOC_PRIM(SIZEOF_StgArrWords,WDS(payload_words),0); // Again, if the ArrWords header isn't a multiple of 8 bytes, we @@ -97,7 +97,7 @@ newArrayzh_fast MAYBE_GC(R2_PTR,newArrayzh_fast); words = BYTES_TO_WDS(SIZEOF_StgMutArrPtrs) + n; - "ptr" arr = foreign "C" allocate(words); + "ptr" arr = foreign "C" allocateLocal(BaseReg "ptr",words) []; TICK_ALLOC_PRIM(SIZEOF_StgMutArrPtrs, WDS(n), 0); SET_HDR(arr, stg_MUT_ARR_PTRS_info, W_[CCCS]); @@ -118,8 +118,6 @@ newArrayzh_fast unsafeThawArrayzh_fast { - SET_INFO(R1,stg_MUT_ARR_PTRS_info); - // SUBTLETY TO DO WITH THE OLD GEN MUTABLE LIST // // A MUT_ARR_PTRS lives on the mutable list, but a MUT_ARR_PTRS_FROZEN @@ -127,15 +125,21 @@ unsafeThawArrayzh_fast // it on the mutable list for the GC to remove (removing something from // the mutable list is not easy, because the mut_list is only singly-linked). // + // So that we can tell whether a MUT_ARR_PTRS_FROZEN is on the mutable list, + // when we freeze it we set the info ptr to be MUT_ARR_PTRS_FROZEN0 to indicate + // that it is still on the mutable list. + // So, when we thaw a MUT_ARR_PTRS_FROZEN, we must cope with two cases: // either it is on a mut_list, or it isn't. We adopt the convention that - // the mut_link field is NULL if it isn't on a mut_list, and the GC - // maintains this invariant. + // the closure type is MUT_ARR_PTRS_FROZEN0 if it is on the mutable list, + // and MUT_ARR_PTRS_FROZEN otherwise. // - if (StgMutClosure_mut_link(R1) == NULL) { - foreign "C" recordMutable(R1 "ptr"); + if (%INFO_TYPE(%GET_STD_INFO(R1)) != HALF_W_(MUT_ARR_PTRS_FROZEN0)) { + foreign "C" recordMutableLock(R1 "ptr") [R1]; } + SET_INFO(R1,stg_MUT_ARR_PTRS_info); + RET_P(R1); } @@ -179,18 +183,18 @@ atomicModifyMutVarzh_fast */ #if MIN_UPD_SIZE > 1 -#define THUNK_1_SIZE (SIZEOF_StgHeader + WDS(MIN_UPD_SIZE)) +#define THUNK_1_SIZE (SIZEOF_StgThunkHeader + WDS(MIN_UPD_SIZE)) #define TICK_ALLOC_THUNK_1() TICK_ALLOC_UP_THK(WDS(1),WDS(MIN_UPD_SIZE-1)) #else -#define THUNK_1_SIZE (SIZEOF_StgHeader + WDS(1)) +#define THUNK_1_SIZE (SIZEOF_StgThunkHeader + WDS(1)) #define TICK_ALLOC_THUNK_1() TICK_ALLOC_UP_THK(WDS(1),0) #endif #if MIN_UPD_SIZE > 2 -#define THUNK_2_SIZE (SIZEOF_StgHeader + WDS(MIN_UPD_SIZE)) +#define THUNK_2_SIZE (SIZEOF_StgThunkHeader + WDS(MIN_UPD_SIZE)) #define TICK_ALLOC_THUNK_2() TICK_ALLOC_UP_THK(WDS(2),WDS(MIN_UPD_SIZE-2)) #else -#define THUNK_2_SIZE (SIZEOF_StgHeader + WDS(2)) +#define THUNK_2_SIZE (SIZEOF_StgThunkHeader + WDS(2)) #define TICK_ALLOC_THUNK_2() TICK_ALLOC_UP_THK(WDS(2),0) #endif @@ -198,6 +202,10 @@ atomicModifyMutVarzh_fast HP_CHK_GEN_TICKY(SIZE, R1_PTR & R2_PTR, atomicModifyMutVarzh_fast); +#if defined(SMP) + foreign "C" ACQUIRE_LOCK(sm_mutex "ptr"); +#endif + x = StgMutVar_var(R1); TICK_ALLOC_THUNK_2(); @@ -205,15 +213,15 @@ atomicModifyMutVarzh_fast z = Hp - THUNK_2_SIZE + WDS(1); SET_HDR(z, stg_ap_2_upd_info, W_[CCCS]); LDV_RECORD_CREATE(z); - StgClosure_payload(z,0) = R2; - StgClosure_payload(z,1) = x; + StgThunk_payload(z,0) = R2; + StgThunk_payload(z,1) = x; TICK_ALLOC_THUNK_1(); CCCS_ALLOC(THUNK_1_SIZE); y = z - THUNK_1_SIZE; SET_HDR(y, stg_sel_0_upd_info, W_[CCCS]); LDV_RECORD_CREATE(y); - StgClosure_payload(y,0) = z; + StgThunk_payload(y,0) = z; StgMutVar_var(R1) = y; @@ -222,29 +230,13 @@ atomicModifyMutVarzh_fast r = y - THUNK_1_SIZE; SET_HDR(r, stg_sel_1_upd_info, W_[CCCS]); LDV_RECORD_CREATE(r); - StgClosure_payload(r,0) = z; - - RET_P(r); -} - -/* ----------------------------------------------------------------------------- - Foreign Object Primitives - -------------------------------------------------------------------------- */ + StgThunk_payload(r,0) = z; -mkForeignObjzh_fast -{ - /* R1 = ptr to foreign object, - */ - W_ result; - - ALLOC_PRIM( SIZEOF_StgForeignObj, NO_PTRS, mkForeignObjzh_fast); - - result = Hp - SIZEOF_StgForeignObj + WDS(1); - SET_HDR(result,stg_FOREIGN_info,W_[CCCS]); - StgForeignObj_data(result) = R1; +#if defined(SMP) + foreign "C" RELEASE_LOCK(sm_mutex "ptr") []; +#endif - /* returns (# s#, ForeignObj# #) */ - RET_P(result); + RET_P(r); } /* ----------------------------------------------------------------------------- @@ -277,7 +269,7 @@ mkWeakzh_fast StgWeak_link(w) = W_[weak_ptr_list]; W_[weak_ptr_list] = w; - IF_DEBUG(weak, foreign "C" fprintf(stderr,stg_weak_msg,w)); + IF_DEBUG(weak, foreign "C" debugBelch(stg_weak_msg,w) []); RET_P(w); } @@ -515,6 +507,7 @@ word64ToIntegerzh_fast /* ToDo: this is shockingly inefficient */ +#ifndef SMP section "bss" { mp_tmp1: bits8 [SIZEOF_MP_INT]; @@ -526,98 +519,120 @@ section "bss" { } section "bss" { - result1: + mp_result1: bits8 [SIZEOF_MP_INT]; } section "bss" { - result2: + mp_result2: bits8 [SIZEOF_MP_INT]; } +#endif + +#ifdef SMP +#define FETCH_MP_TEMP(X) \ +W_ X; \ +X = BaseReg + (OFFSET_StgRegTable_r ## X); +#else +#define FETCH_MP_TEMP(X) /* Nothing */ +#endif -#define GMP_TAKE2_RET1(name,mp_fun) \ -name \ -{ \ - W_ s1, s2, d1, d2; \ - \ - /* call doYouWantToGC() */ \ - MAYBE_GC(R2_PTR & R4_PTR, name); \ - \ - s1 = R1; \ - d1 = R2; \ - s2 = R3; \ - d2 = R4; \ - \ - MP_INT__mp_alloc(mp_tmp1) = StgArrWords_words(d1); \ - MP_INT__mp_size(mp_tmp1) = (s1); \ - MP_INT__mp_d(mp_tmp1) = BYTE_ARR_CTS(d1); \ - MP_INT__mp_alloc(mp_tmp2) = StgArrWords_words(d2); \ - MP_INT__mp_size(mp_tmp2) = (s2); \ - MP_INT__mp_d(mp_tmp2) = BYTE_ARR_CTS(d2); \ - \ - foreign "C" mpz_init(result1); \ - \ - /* Perform the operation */ \ - foreign "C" mp_fun(result1,mp_tmp1,mp_tmp2); \ - \ - RET_NP(MP_INT__mp_size(result1), \ - MP_INT__mp_d(result1) - SIZEOF_StgArrWords); \ +#define GMP_TAKE2_RET1(name,mp_fun) \ +name \ +{ \ + CInt s1, s2; \ + W_ d1, d2; \ + FETCH_MP_TEMP(mp_tmp1); \ + FETCH_MP_TEMP(mp_tmp2); \ + FETCH_MP_TEMP(mp_result1) \ + FETCH_MP_TEMP(mp_result2); \ + \ + /* call doYouWantToGC() */ \ + MAYBE_GC(R2_PTR & R4_PTR, name); \ + \ + s1 = W_TO_INT(R1); \ + d1 = R2; \ + s2 = W_TO_INT(R3); \ + d2 = R4; \ + \ + MP_INT__mp_alloc(mp_tmp1) = W_TO_INT(StgArrWords_words(d1)); \ + MP_INT__mp_size(mp_tmp1) = (s1); \ + MP_INT__mp_d(mp_tmp1) = BYTE_ARR_CTS(d1); \ + MP_INT__mp_alloc(mp_tmp2) = W_TO_INT(StgArrWords_words(d2)); \ + MP_INT__mp_size(mp_tmp2) = (s2); \ + MP_INT__mp_d(mp_tmp2) = BYTE_ARR_CTS(d2); \ + \ + foreign "C" mpz_init(mp_result1 "ptr") []; \ + \ + /* Perform the operation */ \ + foreign "C" mp_fun(mp_result1 "ptr",mp_tmp1 "ptr",mp_tmp2 "ptr") []; \ + \ + RET_NP(TO_W_(MP_INT__mp_size(mp_result1)), \ + MP_INT__mp_d(mp_result1) - SIZEOF_StgArrWords); \ } -#define GMP_TAKE1_RET1(name,mp_fun) \ -name \ -{ \ - W_ s1, d1; \ - \ - /* call doYouWantToGC() */ \ - MAYBE_GC(R2_PTR, name); \ - \ - d1 = R2; \ - s1 = R1; \ - \ - MP_INT__mp_alloc(mp_tmp1) = StgArrWords_words(d1); \ - MP_INT__mp_size(mp_tmp1) = (s1); \ - MP_INT__mp_d(mp_tmp1) = BYTE_ARR_CTS(d1); \ - \ - foreign "C" mpz_init(result1); \ - \ - /* Perform the operation */ \ - foreign "C" mp_fun(result1,mp_tmp1); \ - \ - RET_NP(MP_INT__mp_size(result1), \ - MP_INT__mp_d(result1) - SIZEOF_StgArrWords); \ +#define GMP_TAKE1_RET1(name,mp_fun) \ +name \ +{ \ + CInt s1; \ + W_ d1; \ + FETCH_MP_TEMP(mp_tmp1); \ + FETCH_MP_TEMP(mp_result1) \ + \ + /* call doYouWantToGC() */ \ + MAYBE_GC(R2_PTR, name); \ + \ + d1 = R2; \ + s1 = W_TO_INT(R1); \ + \ + MP_INT__mp_alloc(mp_tmp1) = W_TO_INT(StgArrWords_words(d1)); \ + MP_INT__mp_size(mp_tmp1) = (s1); \ + MP_INT__mp_d(mp_tmp1) = BYTE_ARR_CTS(d1); \ + \ + foreign "C" mpz_init(mp_result1 "ptr") []; \ + \ + /* Perform the operation */ \ + foreign "C" mp_fun(mp_result1 "ptr",mp_tmp1 "ptr") []; \ + \ + RET_NP(TO_W_(MP_INT__mp_size(mp_result1)), \ + MP_INT__mp_d(mp_result1) - SIZEOF_StgArrWords); \ } -#define GMP_TAKE2_RET2(name,mp_fun) \ -name \ -{ \ - W_ s1, s2, d1, d2; \ - \ - /* call doYouWantToGC() */ \ - MAYBE_GC(R2_PTR & R4_PTR, name); \ - \ - s1 = R1; \ - d1 = R2; \ - s2 = R3; \ - d2 = R4; \ - \ - MP_INT__mp_alloc(mp_tmp1) = StgArrWords_words(d1); \ - MP_INT__mp_size(mp_tmp1) = (s1); \ - MP_INT__mp_d(mp_tmp1) = BYTE_ARR_CTS(d1); \ - MP_INT__mp_alloc(mp_tmp2) = StgArrWords_words(d2); \ - MP_INT__mp_size(mp_tmp2) = (s2); \ - MP_INT__mp_d(mp_tmp2) = BYTE_ARR_CTS(d2); \ - \ - foreign "C" mpz_init(result1); \ - foreign "C" mpz_init(result2); \ - \ - /* Perform the operation */ \ - foreign "C" mp_fun(result1,result2,mp_tmp1,mp_tmp2); \ - \ - RET_NPNP(MP_INT__mp_size(result1), \ - MP_INT__mp_d(result1) - SIZEOF_StgArrWords, \ - MP_INT__mp_size(result2), \ - MP_INT__mp_d(result2) - SIZEOF_StgArrWords); \ +#define GMP_TAKE2_RET2(name,mp_fun) \ +name \ +{ \ + CInt s1, s2; \ + W_ d1, d2; \ + FETCH_MP_TEMP(mp_tmp1); \ + FETCH_MP_TEMP(mp_tmp2); \ + FETCH_MP_TEMP(mp_result1) \ + FETCH_MP_TEMP(mp_result2) \ + \ + /* call doYouWantToGC() */ \ + MAYBE_GC(R2_PTR & R4_PTR, name); \ + \ + s1 = W_TO_INT(R1); \ + d1 = R2; \ + s2 = W_TO_INT(R3); \ + d2 = R4; \ + \ + MP_INT__mp_alloc(mp_tmp1) = W_TO_INT(StgArrWords_words(d1)); \ + MP_INT__mp_size(mp_tmp1) = (s1); \ + MP_INT__mp_d(mp_tmp1) = BYTE_ARR_CTS(d1); \ + MP_INT__mp_alloc(mp_tmp2) = W_TO_INT(StgArrWords_words(d2)); \ + MP_INT__mp_size(mp_tmp2) = (s2); \ + MP_INT__mp_d(mp_tmp2) = BYTE_ARR_CTS(d2); \ + \ + foreign "C" mpz_init(mp_result1 "ptr") []; \ + foreign "C" mpz_init(mp_result2 "ptr") []; \ + \ + /* Perform the operation */ \ + foreign "C" mp_fun(mp_result1 "ptr",mp_result2 "ptr",mp_tmp1 "ptr",mp_tmp2 "ptr") []; \ + \ + RET_NPNP(TO_W_(MP_INT__mp_size(mp_result1)), \ + MP_INT__mp_d(mp_result1) - SIZEOF_StgArrWords, \ + TO_W_(MP_INT__mp_size(mp_result2)), \ + MP_INT__mp_d(mp_result2) - SIZEOF_StgArrWords); \ } GMP_TAKE2_RET1(plusIntegerzh_fast, mpz_add) @@ -635,17 +650,20 @@ GMP_TAKE1_RET1(complementIntegerzh_fast, mpz_com) GMP_TAKE2_RET2(quotRemIntegerzh_fast, mpz_tdiv_qr) GMP_TAKE2_RET2(divModIntegerzh_fast, mpz_fdiv_qr) +#ifndef SMP section "bss" { - aa: W_; // NB. aa is really an mp_limb_t + mp_tmp_w: W_; // NB. mp_tmp_w is really an here mp_limb_t } +#endif gcdIntzh_fast { /* R1 = the first Int#; R2 = the second Int# */ W_ r; + FETCH_MP_TEMP(mp_tmp_w); - W_[aa] = R1; - r = foreign "C" mpn_gcd_1(aa, 1, R2); + W_[mp_tmp_w] = R1; + r = foreign "C" mpn_gcd_1(mp_tmp_w "ptr", 1, R2) []; R1 = r; /* Result parked in R1, return via info-pointer at TOS */ @@ -656,7 +674,7 @@ gcdIntzh_fast gcdIntegerIntzh_fast { /* R1 = s1; R2 = d1; R3 = the int */ - R1 = foreign "C" mpn_gcd_1( BYTE_ARR_CTS(R2) "ptr", R1, R3); + R1 = foreign "C" mpn_gcd_1( BYTE_ARR_CTS(R2) "ptr", R1, R3) []; /* Result parked in R1, return via info-pointer at TOS */ jump %ENTRY_CODE(Sp(0)); @@ -737,14 +755,14 @@ cmpIntegerzh_fast up = BYTE_ARR_CTS(R2); vp = BYTE_ARR_CTS(R4); - cmp = foreign "C" mpn_cmp(up "ptr", vp "ptr", size); + cmp = foreign "C" mpn_cmp(up "ptr", vp "ptr", size) []; - if (cmp == 0) { + if (cmp == 0 :: CInt) { R1 = 0; jump %ENTRY_CODE(Sp(0)); } - if (%lt(cmp,0) == %lt(usize,0)) { + if (%lt(cmp,0 :: CInt) == %lt(usize,0)) { R1 = 1; } else { R1 = (-1); @@ -791,14 +809,12 @@ integer2Wordzh_fast jump %ENTRY_CODE(Sp(0)); } -section "bss" { - exponent: W_; -} - decodeFloatzh_fast { W_ p; F_ arg; + FETCH_MP_TEMP(mp_tmp1); + FETCH_MP_TEMP(mp_tmp_w); /* arguments: F1 = Float# */ arg = F1; @@ -813,10 +829,10 @@ decodeFloatzh_fast MP_INT__mp_d(mp_tmp1) = BYTE_ARR_CTS(p); /* Perform the operation */ - foreign "C" __decodeFloat(mp_tmp1,exponent,arg); + foreign "C" __decodeFloat(mp_tmp1 "ptr",mp_tmp_w "ptr" ,arg) []; /* returns: (Int# (expn), Int#, ByteArray#) */ - RET_NNP(W_[exponent], MP_INT__mp_size(mp_tmp1), p); + RET_NNP(W_[mp_tmp_w], TO_W_(MP_INT__mp_size(mp_tmp1)), p); } #define DOUBLE_MANTISSA_SIZE SIZEOF_DOUBLE @@ -826,6 +842,8 @@ decodeDoublezh_fast { D_ arg; W_ p; + FETCH_MP_TEMP(mp_tmp1); + FETCH_MP_TEMP(mp_tmp_w); /* arguments: D1 = Double# */ arg = D1; @@ -840,10 +858,10 @@ decodeDoublezh_fast MP_INT__mp_d(mp_tmp1) = BYTE_ARR_CTS(p); /* Perform the operation */ - foreign "C" __decodeDouble(mp_tmp1,exponent,arg); + foreign "C" __decodeDouble(mp_tmp1 "ptr", mp_tmp_w "ptr",arg) []; /* returns: (Int# (expn), Int#, ByteArray#) */ - RET_NNP(W_[exponent], MP_INT__mp_size(mp_tmp1), p); + RET_NNP(W_[mp_tmp_w], TO_W_(MP_INT__mp_size(mp_tmp1)), p); } /* ----------------------------------------------------------------------------- @@ -856,13 +874,17 @@ forkzh_fast MAYBE_GC(R1_PTR, forkzh_fast); + foreign "C" ACQUIRE_LOCK(sched_mutex "ptr"); + // create it right now, return ThreadID in R1 "ptr" R1 = foreign "C" createIOThread( RtsFlags_GcFlags_initialStkSize(RtsFlags), R1 "ptr"); - foreign "C" scheduleThread(R1 "ptr"); + foreign "C" scheduleThreadLocked(R1 "ptr"); + + foreign "C" RELEASE_LOCK(sched_mutex "ptr"); // switch at the earliest opportunity - CInt[context_switch] = 1; + CInt[context_switch] = 1 :: CInt; RET_P(R1); } @@ -893,10 +915,453 @@ isCurrentThreadBoundzh_fast { /* no args */ W_ r; - r = foreign "C" isThreadBound(CurrentTSO); + r = foreign "C" isThreadBound(CurrentTSO) []; RET_N(r); } + +/* ----------------------------------------------------------------------------- + * TVar primitives + * -------------------------------------------------------------------------- */ + +#ifdef REG_R1 +#define SP_OFF 0 +#define IF_NOT_REG_R1(x) +#else +#define SP_OFF 1 +#define IF_NOT_REG_R1(x) x +#endif + +// Catch retry frame ------------------------------------------------------------ + +#define CATCH_RETRY_FRAME_ERROR(label) \ + label { foreign "C" barf("catch_retry_frame incorrectly entered!"); } + +CATCH_RETRY_FRAME_ERROR(stg_catch_retry_frame_0_ret) +CATCH_RETRY_FRAME_ERROR(stg_catch_retry_frame_1_ret) +CATCH_RETRY_FRAME_ERROR(stg_catch_retry_frame_2_ret) +CATCH_RETRY_FRAME_ERROR(stg_catch_retry_frame_3_ret) +CATCH_RETRY_FRAME_ERROR(stg_catch_retry_frame_4_ret) +CATCH_RETRY_FRAME_ERROR(stg_catch_retry_frame_5_ret) +CATCH_RETRY_FRAME_ERROR(stg_catch_retry_frame_6_ret) +CATCH_RETRY_FRAME_ERROR(stg_catch_retry_frame_7_ret) + +#if MAX_VECTORED_RTN > 8 +#error MAX_VECTORED_RTN has changed: please modify stg_catch_retry_frame too. +#endif + +#if defined(PROFILING) +#define CATCH_RETRY_FRAME_BITMAP 7 +#define CATCH_RETRY_FRAME_WORDS 6 +#else +#define CATCH_RETRY_FRAME_BITMAP 1 +#define CATCH_RETRY_FRAME_WORDS 4 +#endif + +INFO_TABLE_RET(stg_catch_retry_frame, + CATCH_RETRY_FRAME_WORDS, CATCH_RETRY_FRAME_BITMAP, + CATCH_RETRY_FRAME, + stg_catch_retry_frame_0_ret, + stg_catch_retry_frame_1_ret, + stg_catch_retry_frame_2_ret, + stg_catch_retry_frame_3_ret, + stg_catch_retry_frame_4_ret, + stg_catch_retry_frame_5_ret, + stg_catch_retry_frame_6_ret, + stg_catch_retry_frame_7_ret) +{ + W_ r, frame, trec, outer; + IF_NOT_REG_R1(W_ rval; rval = Sp(0); Sp_adj(1); ) + + frame = Sp; + trec = StgTSO_trec(CurrentTSO); + "ptr" outer = foreign "C" stmGetEnclosingTRec(trec "ptr") []; + r = foreign "C" stmCommitNestedTransaction(BaseReg "ptr", trec "ptr") []; + if (r) { + /* Succeeded (either first branch or second branch) */ + StgTSO_trec(CurrentTSO) = outer; + Sp = Sp + SIZEOF_StgCatchRetryFrame; + IF_NOT_REG_R1(Sp_adj(-1); Sp(0) = rval;) + jump %ENTRY_CODE(Sp(SP_OFF)); + } else { + /* Did not commit: retry */ + W_ new_trec; + "ptr" new_trec = foreign "C" stmStartTransaction(BaseReg "ptr", outer "ptr") []; + StgTSO_trec(CurrentTSO) = new_trec; + if (StgCatchRetryFrame_running_alt_code(frame)) { + R1 = StgCatchRetryFrame_alt_code(frame); + } else { + R1 = StgCatchRetryFrame_first_code(frame); + StgCatchRetryFrame_first_code_trec(frame) = new_trec; + } + Sp_adj(-1); + jump RET_LBL(stg_ap_v); + } +} + + +// Atomically frame ------------------------------------------------------------- + + +#define ATOMICALLY_FRAME_ERROR(label) \ + label { foreign "C" barf("atomically_frame incorrectly entered!"); } + +ATOMICALLY_FRAME_ERROR(stg_atomically_frame_0_ret) +ATOMICALLY_FRAME_ERROR(stg_atomically_frame_1_ret) +ATOMICALLY_FRAME_ERROR(stg_atomically_frame_2_ret) +ATOMICALLY_FRAME_ERROR(stg_atomically_frame_3_ret) +ATOMICALLY_FRAME_ERROR(stg_atomically_frame_4_ret) +ATOMICALLY_FRAME_ERROR(stg_atomically_frame_5_ret) +ATOMICALLY_FRAME_ERROR(stg_atomically_frame_6_ret) +ATOMICALLY_FRAME_ERROR(stg_atomically_frame_7_ret) + +#if MAX_VECTORED_RTN > 8 +#error MAX_VECTORED_RTN has changed: please modify stg_atomically_frame too. +#endif + +#if defined(PROFILING) +#define ATOMICALLY_FRAME_BITMAP 7 +#define ATOMICALLY_FRAME_WORDS 4 +#else +#define ATOMICALLY_FRAME_BITMAP 1 +#define ATOMICALLY_FRAME_WORDS 2 +#endif + + +INFO_TABLE_RET(stg_atomically_frame, + ATOMICALLY_FRAME_WORDS, ATOMICALLY_FRAME_BITMAP, + ATOMICALLY_FRAME, + stg_atomically_frame_0_ret, + stg_atomically_frame_1_ret, + stg_atomically_frame_2_ret, + stg_atomically_frame_3_ret, + stg_atomically_frame_4_ret, + stg_atomically_frame_5_ret, + stg_atomically_frame_6_ret, + stg_atomically_frame_7_ret) +{ + W_ frame, trec, valid; + IF_NOT_REG_R1(W_ rval; rval = Sp(0); Sp_adj(1); ) + + frame = Sp; + trec = StgTSO_trec(CurrentTSO); + if (StgAtomicallyFrame_waiting(frame)) { + /* The TSO is currently waiting: should we stop waiting? */ + valid = foreign "C" stmReWait(CurrentTSO "ptr"); + if (valid) { + /* Previous attempt is still valid: no point trying again yet */ + IF_NOT_REG_R1(Sp_adj(-2); + Sp(1) = stg_NO_FINALIZER_closure; + Sp(0) = stg_ut_1_0_unreg_info;) + jump stg_block_noregs; + } else { + /* Previous attempt is no longer valid: try again */ + "ptr" trec = foreign "C" stmStartTransaction(BaseReg "ptr", NO_TREC "ptr"); + StgTSO_trec(CurrentTSO) = trec; + StgAtomicallyFrame_waiting(frame) = 0 :: CInt; /* false; */ + R1 = StgAtomicallyFrame_code(frame); + Sp_adj(-1); + jump RET_LBL(stg_ap_v); + } + } else { + /* The TSO is not currently waiting: try to commit the transaction */ + valid = foreign "C" stmCommitTransaction(BaseReg "ptr", trec "ptr"); + if (valid) { + /* Transaction was valid: commit succeeded */ + StgTSO_trec(CurrentTSO) = NO_TREC; + Sp = Sp + SIZEOF_StgAtomicallyFrame; + IF_NOT_REG_R1(Sp_adj(-1); Sp(0) = rval;) + jump %ENTRY_CODE(Sp(SP_OFF)); + } else { + /* Transaction was not valid: try again */ + "ptr" trec = foreign "C" stmStartTransaction(BaseReg "ptr", NO_TREC "ptr"); + StgTSO_trec(CurrentTSO) = trec; + R1 = StgAtomicallyFrame_code(frame); + Sp_adj(-1); + jump RET_LBL(stg_ap_v); + } + } +} + + +// STM catch frame -------------------------------------------------------------- + +#define CATCH_STM_FRAME_ENTRY_TEMPLATE(label,ret) \ + label \ + { \ + IF_NOT_REG_R1(W_ rval; rval = Sp(0); Sp_adj(1); ) \ + Sp = Sp + SIZEOF_StgCatchSTMFrame; \ + IF_NOT_REG_R1(Sp_adj(-1); Sp(0) = rval;) \ + jump ret; \ + } + +#ifdef REG_R1 +#define SP_OFF 0 +#else +#define SP_OFF 1 +#endif + +CATCH_STM_FRAME_ENTRY_TEMPLATE(stg_catch_stm_frame_0_ret,%RET_VEC(Sp(SP_OFF),0)) +CATCH_STM_FRAME_ENTRY_TEMPLATE(stg_catch_stm_frame_1_ret,%RET_VEC(Sp(SP_OFF),1)) +CATCH_STM_FRAME_ENTRY_TEMPLATE(stg_catch_stm_frame_2_ret,%RET_VEC(Sp(SP_OFF),2)) +CATCH_STM_FRAME_ENTRY_TEMPLATE(stg_catch_stm_frame_3_ret,%RET_VEC(Sp(SP_OFF),3)) +CATCH_STM_FRAME_ENTRY_TEMPLATE(stg_catch_stm_frame_4_ret,%RET_VEC(Sp(SP_OFF),4)) +CATCH_STM_FRAME_ENTRY_TEMPLATE(stg_catch_stm_frame_5_ret,%RET_VEC(Sp(SP_OFF),5)) +CATCH_STM_FRAME_ENTRY_TEMPLATE(stg_catch_stm_frame_6_ret,%RET_VEC(Sp(SP_OFF),6)) +CATCH_STM_FRAME_ENTRY_TEMPLATE(stg_catch_stm_frame_7_ret,%RET_VEC(Sp(SP_OFF),7)) + +#if MAX_VECTORED_RTN > 8 +#error MAX_VECTORED_RTN has changed: please modify stg_catch_stm_frame too. +#endif + +#if defined(PROFILING) +#define CATCH_STM_FRAME_BITMAP 3 +#define CATCH_STM_FRAME_WORDS 3 +#else +#define CATCH_STM_FRAME_BITMAP 0 +#define CATCH_STM_FRAME_WORDS 1 +#endif + +/* Catch frames are very similar to update frames, but when entering + * one we just pop the frame off the stack and perform the correct + * kind of return to the activation record underneath us on the stack. + */ + +INFO_TABLE_RET(stg_catch_stm_frame, + CATCH_STM_FRAME_WORDS, CATCH_STM_FRAME_BITMAP, + CATCH_STM_FRAME, + stg_catch_stm_frame_0_ret, + stg_catch_stm_frame_1_ret, + stg_catch_stm_frame_2_ret, + stg_catch_stm_frame_3_ret, + stg_catch_stm_frame_4_ret, + stg_catch_stm_frame_5_ret, + stg_catch_stm_frame_6_ret, + stg_catch_stm_frame_7_ret) +CATCH_STM_FRAME_ENTRY_TEMPLATE(,%ENTRY_CODE(Sp(SP_OFF))) + + +// Primop definition ------------------------------------------------------------ + +atomicallyzh_fast +{ + W_ frame; + W_ old_trec; + W_ new_trec; + + // stmStartTransaction may allocate + MAYBE_GC (R1_PTR, atomicallyzh_fast); + + /* Args: R1 = m :: STM a */ + STK_CHK_GEN(SIZEOF_StgAtomicallyFrame + WDS(1), R1_PTR, atomicallyzh_fast); + + /* Set up the atomically frame */ + Sp = Sp - SIZEOF_StgAtomicallyFrame; + frame = Sp; + + SET_HDR(frame,stg_atomically_frame_info, W_[CCCS]); + StgAtomicallyFrame_waiting(frame) = 0 :: CInt; // False + StgAtomicallyFrame_code(frame) = R1; + + /* Start the memory transcation */ + old_trec = StgTSO_trec(CurrentTSO); + ASSERT(old_trec == NO_TREC); + "ptr" new_trec = foreign "C" stmStartTransaction(BaseReg "ptr", old_trec "ptr"); + StgTSO_trec(CurrentTSO) = new_trec; + + /* Apply R1 to the realworld token */ + Sp_adj(-1); + jump RET_LBL(stg_ap_v); +} + + +catchSTMzh_fast +{ + W_ frame; + + /* Args: R1 :: STM a */ + /* Args: R2 :: Exception -> STM a */ + STK_CHK_GEN(SIZEOF_StgCatchSTMFrame + WDS(1), R1_PTR & R2_PTR, catchSTMzh_fast); + + /* Set up the catch frame */ + Sp = Sp - SIZEOF_StgCatchSTMFrame; + frame = Sp; + + SET_HDR(frame, stg_catch_stm_frame_info, W_[CCCS]); + StgCatchSTMFrame_handler(frame) = R2; + + /* Apply R1 to the realworld token */ + Sp_adj(-1); + jump RET_LBL(stg_ap_v); +} + + +catchRetryzh_fast +{ + W_ frame; + W_ new_trec; + W_ trec; + + // stmStartTransaction may allocate + MAYBE_GC (R1_PTR & R2_PTR, catchRetryzh_fast); + + /* Args: R1 :: STM a */ + /* Args: R2 :: STM a */ + STK_CHK_GEN(SIZEOF_StgCatchRetryFrame + WDS(1), R1_PTR & R2_PTR, catchRetryzh_fast); + + /* Start a nested transaction within which to run the first code */ + trec = StgTSO_trec(CurrentTSO); + "ptr" new_trec = foreign "C" stmStartTransaction(BaseReg "ptr", trec "ptr"); + StgTSO_trec(CurrentTSO) = new_trec; + + /* Set up the catch-retry frame */ + Sp = Sp - SIZEOF_StgCatchRetryFrame; + frame = Sp; + + SET_HDR(frame, stg_catch_retry_frame_info, W_[CCCS]); + StgCatchRetryFrame_running_alt_code(frame) = 0 :: CInt; // false; + StgCatchRetryFrame_first_code(frame) = R1; + StgCatchRetryFrame_alt_code(frame) = R2; + StgCatchRetryFrame_first_code_trec(frame) = new_trec; + + /* Apply R1 to the realworld token */ + Sp_adj(-1); + jump RET_LBL(stg_ap_v); +} + + +retryzh_fast +{ + W_ frame_type; + W_ frame; + W_ trec; + W_ outer; + W_ r; + + MAYBE_GC (NO_PTRS, retryzh_fast); // STM operations may allocate + + // Find the enclosing ATOMICALLY_FRAME or CATCH_RETRY_FRAME +retry_pop_stack: + trec = StgTSO_trec(CurrentTSO); + "ptr" outer = foreign "C" stmGetEnclosingTRec(trec "ptr"); + StgTSO_sp(CurrentTSO) = Sp; + frame_type = foreign "C" findRetryFrameHelper(CurrentTSO "ptr"); + Sp = StgTSO_sp(CurrentTSO); + frame = Sp; + + if (frame_type == CATCH_RETRY_FRAME) { + // The retry reaches a CATCH_RETRY_FRAME before the atomic frame + ASSERT(outer != NO_TREC); + if (!StgCatchRetryFrame_running_alt_code(frame)) { + // Retry in the first code: try the alternative + "ptr" trec = foreign "C" stmStartTransaction(BaseReg "ptr", outer "ptr"); + StgTSO_trec(CurrentTSO) = trec; + StgCatchRetryFrame_running_alt_code(frame) = 1 :: CInt; // true; + R1 = StgCatchRetryFrame_alt_code(frame); + Sp_adj(-1); + jump RET_LBL(stg_ap_v); + } else { + // Retry in the alternative code: propagate + W_ other_trec; + other_trec = StgCatchRetryFrame_first_code_trec(frame); + r = foreign "C" stmCommitNestedTransaction(BaseReg "ptr", other_trec "ptr"); + if (r) { + r = foreign "C" stmCommitNestedTransaction(BaseReg "ptr", trec "ptr"); + } + if (r) { + // Merge between siblings succeeded: commit it back to enclosing transaction + // and then propagate the retry + StgTSO_trec(CurrentTSO) = outer; + Sp = Sp + SIZEOF_StgCatchRetryFrame; + goto retry_pop_stack; + } else { + // Merge failed: we musn't propagate the retry. Try both paths again. + "ptr" trec = foreign "C" stmStartTransaction(BaseReg "ptr", outer "ptr"); + StgCatchRetryFrame_first_code_trec(frame) = trec; + StgCatchRetryFrame_running_alt_code(frame) = 0 :: CInt; // false; + StgTSO_trec(CurrentTSO) = trec; + R1 = StgCatchRetryFrame_first_code(frame); + Sp_adj(-1); + jump RET_LBL(stg_ap_v); + } + } + } + + // We've reached the ATOMICALLY_FRAME: attempt to wait + ASSERT(frame_type == ATOMICALLY_FRAME); + ASSERT(outer == NO_TREC); + r = foreign "C" stmWait(BaseReg "ptr", CurrentTSO "ptr", trec "ptr"); + if (r) { + // Transaction was valid: stmWait put us on the TVars' queues, we now block + StgAtomicallyFrame_waiting(frame) = 1 :: CInt; // true + Sp = frame; + // Fix up the stack in the unregisterised case: the return convention is different. + IF_NOT_REG_R1(Sp_adj(-2); + Sp(1) = stg_NO_FINALIZER_closure; + Sp(0) = stg_ut_1_0_unreg_info;) + jump stg_block_noregs; + } else { + // Transaction was not valid: retry immediately + "ptr" trec = foreign "C" stmStartTransaction(BaseReg "ptr", outer "ptr"); + StgTSO_trec(CurrentTSO) = trec; + R1 = StgAtomicallyFrame_code(frame); + Sp = frame; + Sp_adj(-1); + jump RET_LBL(stg_ap_v); + } +} + + +newTVarzh_fast +{ + W_ tv; + W_ new_value; + + /* Args: R1 = initialisation value */ + + MAYBE_GC (R1_PTR, newTVarzh_fast); + new_value = R1; + tv = foreign "C" stmNewTVar(BaseReg "ptr", new_value "ptr"); + RET_P(tv); +} + + +readTVarzh_fast +{ + W_ trec; + W_ tvar; + W_ result; + + /* Args: R1 = TVar closure */ + + MAYBE_GC (R1_PTR, readTVarzh_fast); // Call to stmReadTVar may allocate + trec = StgTSO_trec(CurrentTSO); + tvar = R1; + "ptr" result = foreign "C" stmReadTVar(BaseReg "ptr", trec "ptr", tvar "ptr") []; + + RET_P(result); +} + + +writeTVarzh_fast +{ + W_ trec; + W_ tvar; + W_ new_value; + + /* Args: R1 = TVar closure */ + /* R2 = New value */ + + MAYBE_GC (R1_PTR & R2_PTR, writeTVarzh_fast); // Call to stmWriteTVar may allocate + trec = StgTSO_trec(CurrentTSO); + tvar = R1; + new_value = R2; + foreign "C" stmWriteTVar(BaseReg "ptr", trec "ptr", tvar "ptr", new_value "ptr") []; + + jump %ENTRY_CODE(Sp(0)); +} + + /* ----------------------------------------------------------------------------- * MVar primitives * @@ -971,7 +1436,6 @@ newMVarzh_fast StgTSO_sp(tso) = StgTSO_sp(tso) + WDS(3); \ lval = W_[StgTSO_sp(tso) - WDS(1)]; - takeMVarzh_fast { W_ mvar, val, info, tso; @@ -979,7 +1443,11 @@ takeMVarzh_fast /* args: R1 = MVar closure */ mvar = R1; +#if defined(SMP) + "ptr" info = foreign "C" lockClosure(mvar "ptr"); +#else info = GET_INFO(mvar); +#endif /* If the MVar is empty, put ourselves on its blocking queue, * and wait until we're woken up. @@ -1014,26 +1482,33 @@ takeMVarzh_fast #if defined(GRAN) || defined(PAR) /* ToDo: check 2nd arg (mvar) is right */ - "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar),mvar); + "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar),mvar) []; StgMVar_head(mvar) = tso; #else - "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr"); + "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr") []; StgMVar_head(mvar) = tso; #endif + if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) { StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure; } + +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info); +#endif RET_P(val); } else { /* No further putMVars, MVar is now empty */ - - /* do this last... we might have locked the MVar in the SMP case, - * and writing the info pointer will unlock it. - */ - SET_INFO(mvar,stg_EMPTY_MVAR_info); StgMVar_value(mvar) = stg_END_TSO_QUEUE_closure; + +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info); +#else + SET_INFO(mvar,stg_EMPTY_MVAR_info); +#endif + RET_P(val); } } @@ -1047,9 +1522,16 @@ tryTakeMVarzh_fast mvar = R1; +#if defined(SMP) + "ptr" info = foreign "C" lockClosure(mvar "ptr"); +#else info = GET_INFO(mvar); +#endif if (info == stg_EMPTY_MVAR_info) { +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info); +#endif /* HACK: we need a pointer to pass back, * so we abuse NO_FINALIZER_closure */ @@ -1060,6 +1542,7 @@ tryTakeMVarzh_fast val = StgMVar_value(mvar); if (StgMVar_head(mvar) != stg_END_TSO_QUEUE_closure) { + /* There are putMVar(s) waiting... * wake up the first thread on the queue */ @@ -1071,26 +1554,29 @@ tryTakeMVarzh_fast #if defined(GRAN) || defined(PAR) /* ToDo: check 2nd arg (mvar) is right */ - "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr", mvar "ptr"); + "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr", mvar "ptr") []; StgMVar_head(mvar) = tso; #else - "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr"); + "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr") []; StgMVar_head(mvar) = tso; #endif if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) { StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure; } +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info); +#endif } else { /* No further putMVars, MVar is now empty */ StgMVar_value(mvar) = stg_END_TSO_QUEUE_closure; - - /* do this last... we might have locked the MVar in the SMP case, - * and writing the info pointer will unlock it. - */ +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info); +#else SET_INFO(mvar,stg_EMPTY_MVAR_info); +#endif } RET_NP(1, val); @@ -1104,7 +1590,11 @@ putMVarzh_fast /* args: R1 = MVar, R2 = value */ mvar = R1; +#if defined(SMP) + "ptr" info = foreign "C" lockClosure(mvar "ptr"); +#else info = GET_INFO(mvar); +#endif if (info == stg_FULL_MVAR_info) { if (StgMVar_head(mvar) == stg_END_TSO_QUEUE_closure) { @@ -1121,6 +1611,7 @@ putMVarzh_fast } if (StgMVar_head(mvar) != stg_END_TSO_QUEUE_closure) { + /* There are takeMVar(s) waiting: wake up the first one */ ASSERT(StgTSO_why_blocked(StgMVar_head(mvar)) == BlockedOnMVar::I16); @@ -1131,10 +1622,10 @@ putMVarzh_fast #if defined(GRAN) || defined(PAR) /* ToDo: check 2nd arg (mvar) is right */ - "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr",mvar "ptr"); + "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr",mvar "ptr") []; StgMVar_head(mvar) = tso; #else - "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr"); + "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr") []; StgMVar_head(mvar) = tso; #endif @@ -1142,14 +1633,21 @@ putMVarzh_fast StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure; } +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info); +#endif jump %ENTRY_CODE(Sp(0)); } else { /* No further takes, the MVar is now full. */ StgMVar_value(mvar) = R2; - /* unlocks the MVar in the SMP case */ + +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info); +#else SET_INFO(mvar,stg_FULL_MVAR_info); +#endif jump %ENTRY_CODE(Sp(0)); } @@ -1164,13 +1662,21 @@ tryPutMVarzh_fast /* args: R1 = MVar, R2 = value */ mvar = R1; +#if defined(SMP) + "ptr" info = foreign "C" lockClosure(mvar "ptr"); +#else info = GET_INFO(mvar); +#endif if (info == stg_FULL_MVAR_info) { +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info); +#endif RET_N(0); } if (StgMVar_head(mvar) != stg_END_TSO_QUEUE_closure) { + /* There are takeMVar(s) waiting: wake up the first one */ ASSERT(StgTSO_why_blocked(StgMVar_head(mvar)) == BlockedOnMVar::I16); @@ -1181,10 +1687,10 @@ tryPutMVarzh_fast #if defined(GRAN) || defined(PAR) /* ToDo: check 2nd arg (mvar) is right */ - "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr",mvar "ptr"); + "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr",mvar "ptr") []; StgMVar_head(mvar) = tso; #else - "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr"); + "ptr" tso = foreign "C" unblockOne(StgMVar_head(mvar) "ptr") []; StgMVar_head(mvar) = tso; #endif @@ -1192,14 +1698,21 @@ tryPutMVarzh_fast StgMVar_tail(mvar) = stg_END_TSO_QUEUE_closure; } +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info); +#endif jump %ENTRY_CODE(Sp(0)); } else { /* No further takes, the MVar is now full. */ StgMVar_value(mvar) = R2; - /* unlocks the MVar in the SMP case */ + +#if defined(SMP) + foreign "C" unlockClosure(mvar "ptr", stg_FULL_MVAR_info); +#else SET_INFO(mvar,stg_FULL_MVAR_info); +#endif jump %ENTRY_CODE(Sp(0)); } @@ -1217,18 +1730,18 @@ makeStableNamezh_fast ALLOC_PRIM( SIZEOF_StgStableName, R1_PTR, makeStableNamezh_fast ); - index = foreign "C" lookupStableName(R1 "ptr"); + index = foreign "C" lookupStableName(R1 "ptr") []; /* Is there already a StableName for this heap object? - * stable_ptr_table is an array of snEntry structs. + * stable_ptr_table is a pointer to an array of snEntry structs. */ - if ( snEntry_sn_obj(stable_ptr_table + index*SIZEOF_snEntry) == NULL ) { + if ( snEntry_sn_obj(W_[stable_ptr_table] + index*SIZEOF_snEntry) == NULL ) { sn_obj = Hp - SIZEOF_StgStableName + WDS(1); SET_HDR(sn_obj, stg_STABLE_NAME_info, W_[CCCS]); StgStableName_sn(sn_obj) = index; - snEntry_sn_obj(stable_ptr_table + index*SIZEOF_snEntry) = sn_obj; + snEntry_sn_obj(W_[stable_ptr_table] + index*SIZEOF_snEntry) = sn_obj; } else { - sn_obj = snEntry_sn_obj(stable_ptr_table + index*SIZEOF_snEntry); + sn_obj = snEntry_sn_obj(W_[stable_ptr_table] + index*SIZEOF_snEntry); } RET_P(sn_obj); @@ -1240,7 +1753,7 @@ makeStablePtrzh_fast /* Args: R1 = a */ W_ sp; MAYBE_GC(R1_PTR, makeStablePtrzh_fast); - "ptr" sp = foreign "C" getStablePtr(R1 "ptr"); + "ptr" sp = foreign "C" getStablePtr(R1 "ptr") []; RET_N(sp); } @@ -1249,7 +1762,7 @@ deRefStablePtrzh_fast /* Args: R1 = the stable ptr */ W_ r, sp; sp = R1; - r = snEntry_addr(stable_ptr_table + sp*SIZEOF_snEntry); + r = snEntry_addr(W_[stable_ptr_table] + sp*SIZEOF_snEntry); RET_P(r); } @@ -1307,8 +1820,8 @@ mkApUpd0zh_fast // This function is *only* used to wrap zero-arity BCOs in an // updatable wrapper (see ByteCodeLink.lhs). An AP thunk is always // saturated and always points directly to a FUN or BCO. - ASSERT(%INFO_TYPE(%GET_STD_INFO(R1)) == BCO::I16 && - StgBCO_arity(R1) == 0::I16); + ASSERT(%INFO_TYPE(%GET_STD_INFO(R1)) == HALF_W_(BCO) && + StgBCO_arity(R1) == HALF_W_(0)); HP_CHK_GEN_TICKY(SIZEOF_StgAP, R1_PTR, mkApUpd0zh_fast); TICK_ALLOC_UP_THK(0, 0); @@ -1317,7 +1830,7 @@ mkApUpd0zh_fast ap = Hp - SIZEOF_StgAP + WDS(1); SET_HDR(ap, stg_AP_info, W_[CCCS]); - StgAP_n_args(ap) = 0::I16; + StgAP_n_args(ap) = HALF_W_(0); StgAP_fun(ap) = R1; RET_P(ap); @@ -1375,7 +1888,7 @@ waitWritezh_fast STRING(stg_delayzh_malloc_str, "delayzh_fast") delayzh_fast { -#ifdef mingw32_TARGET_OS +#ifdef mingw32_HOST_OS W_ ares; CInt reqID; #else @@ -1390,7 +1903,7 @@ delayzh_fast ASSERT(StgTSO_why_blocked(CurrentTSO) == NotBlocked::I16); StgTSO_why_blocked(CurrentTSO) = BlockedOnDelay::I16; -#ifdef mingw32_TARGET_OS +#ifdef mingw32_HOST_OS /* could probably allocate this on the heap instead */ "ptr" ares = foreign "C" stgMallocBytes(SIZEOF_StgAsyncIOResult, @@ -1411,9 +1924,9 @@ delayzh_fast #else - CInt time; + W_ time; time = foreign "C" getourtimeofday(); - target = (R1 / (TICK_MILLISECS*1000)) + TO_W_(time); + target = (R1 / (TICK_MILLISECS*1000)) + time; StgTSO_block_info(CurrentTSO) = target; /* Insert the new thread in the sleeping queue. */ @@ -1437,7 +1950,7 @@ while: } -#ifdef mingw32_TARGET_OS +#ifdef mingw32_HOST_OS STRING(stg_asyncReadzh_malloc_str, "asyncReadzh_fast") asyncReadzh_fast {