X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FPrimOps.cmm;h=84b34d0aa2a6a7e450a01ca024141b331b99a20e;hb=85f3db842ae9bd547b3b21c18754b4987335fd38;hp=3ddb2bc901045d4e0d1c17654c7f333c4be8a869;hpb=b71926a46df2421f8d0927f188c7e2d28a141b9d;p=ghc-hetmet.git diff --git a/ghc/rts/PrimOps.cmm b/ghc/rts/PrimOps.cmm index 3ddb2bc..84b34d0 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; @@ -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]); @@ -135,7 +135,7 @@ unsafeThawArrayzh_fast // maintains this invariant. // if (%INFO_TYPE(%GET_STD_INFO(R1)) != HALF_W_(MUT_ARR_PTRS_FROZEN0)) { - foreign "C" recordMutable(R1 "ptr"); + foreign "C" recordMutableLock(R1 "ptr"); } SET_INFO(R1,stg_MUT_ARR_PTRS_info); @@ -183,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 @@ -202,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(); @@ -209,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; @@ -226,7 +230,11 @@ 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; + StgThunk_payload(r,0) = z; + +#if defined(SMP) + foreign "C" RELEASE_LOCK(sm_mutex "ptr"); +#endif RET_P(r); } @@ -281,7 +289,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); } @@ -519,6 +527,7 @@ word64ToIntegerzh_fast /* ToDo: this is shockingly inefficient */ +#ifndef SMP section "bss" { mp_tmp1: bits8 [SIZEOF_MP_INT]; @@ -530,101 +539,120 @@ section "bss" { } section "bss" { - result1: + mp_result1: bits8 [SIZEOF_MP_INT]; } section "bss" { - result2: + mp_result2: bits8 [SIZEOF_MP_INT]; } +#endif -#define GMP_TAKE2_RET1(name,mp_fun) \ -name \ -{ \ - CInt s1, s2; \ - W_ d1, d2; \ - \ - /* 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(result1); \ - \ - /* Perform the operation */ \ - foreign "C" mp_fun(result1,mp_tmp1,mp_tmp2); \ - \ - RET_NP(TO_W_(MP_INT__mp_size(result1)), \ - MP_INT__mp_d(result1) - SIZEOF_StgArrWords); \ -} - -#define GMP_TAKE1_RET1(name,mp_fun) \ -name \ -{ \ - CInt s1; \ - W_ d1; \ - \ - /* 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(result1); \ - \ - /* Perform the operation */ \ - foreign "C" mp_fun(result1,mp_tmp1); \ - \ - RET_NP(TO_W_(MP_INT__mp_size(result1)), \ - MP_INT__mp_d(result1) - SIZEOF_StgArrWords); \ -} +#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_RET2(name,mp_fun) \ -name \ -{ \ - CInt s1, s2; \ - W_ d1, d2; \ - \ - /* 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(result1); \ - foreign "C" mpz_init(result2); \ - \ - /* Perform the operation */ \ - foreign "C" mp_fun(result1,result2,mp_tmp1,mp_tmp2); \ - \ - RET_NPNP(TO_W_(MP_INT__mp_size(result1)), \ - MP_INT__mp_d(result1) - SIZEOF_StgArrWords, \ - TO_W_(MP_INT__mp_size(result2)), \ - MP_INT__mp_d(result2) - 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 \ +{ \ + 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 \ +{ \ + 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) @@ -642,17 +670,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 */ @@ -798,14 +829,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; @@ -820,10 +849,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], TO_W_(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 @@ -833,6 +862,8 @@ decodeDoublezh_fast { D_ arg; W_ p; + FETCH_MP_TEMP(mp_tmp1); + FETCH_MP_TEMP(mp_tmp_w); /* arguments: D1 = Double# */ arg = D1; @@ -847,10 +878,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], TO_W_(MP_INT__mp_size(mp_tmp1)), p); + RET_NNP(W_[mp_tmp_w], TO_W_(MP_INT__mp_size(mp_tmp1)), p); } /* ----------------------------------------------------------------------------- @@ -961,7 +992,7 @@ INFO_TABLE_RET(stg_catch_retry_frame, frame = Sp; trec = StgTSO_trec(CurrentTSO); "ptr" outer = foreign "C" stmGetEnclosingTRec(trec "ptr"); - r = foreign "C" stmCommitTransaction(trec "ptr"); + r = foreign "C" stmCommitNestedTransaction(BaseReg "ptr", trec "ptr"); if (r) { /* Succeeded (either first branch or second branch) */ StgTSO_trec(CurrentTSO) = outer; @@ -971,7 +1002,7 @@ INFO_TABLE_RET(stg_catch_retry_frame, } else { /* Did not commit: retry */ W_ new_trec; - "ptr" new_trec = foreign "C" stmStartTransaction(outer "ptr"); + "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); @@ -1041,7 +1072,7 @@ INFO_TABLE_RET(stg_atomically_frame, jump stg_block_noregs; } else { /* Previous attempt is no longer valid: try again */ - "ptr" trec = foreign "C" stmStartTransaction(NO_TREC "ptr"); + "ptr" trec = foreign "C" stmStartTransaction(BaseReg "ptr", NO_TREC "ptr"); StgTSO_trec(CurrentTSO) = trec; StgAtomicallyFrame_waiting(frame) = 0 :: CInt; /* false; */ R1 = StgAtomicallyFrame_code(frame); @@ -1050,7 +1081,7 @@ INFO_TABLE_RET(stg_atomically_frame, } } else { /* The TSO is not currently waiting: try to commit the transaction */ - valid = foreign "C" stmCommitTransaction(trec "ptr"); + valid = foreign "C" stmCommitTransaction(BaseReg "ptr", trec "ptr"); if (valid) { /* Transaction was valid: commit succeeded */ StgTSO_trec(CurrentTSO) = NO_TREC; @@ -1059,7 +1090,7 @@ INFO_TABLE_RET(stg_atomically_frame, jump %ENTRY_CODE(Sp(SP_OFF)); } else { /* Transaction was not valid: try again */ - "ptr" trec = foreign "C" stmStartTransaction(NO_TREC "ptr"); + "ptr" trec = foreign "C" stmStartTransaction(BaseReg "ptr", NO_TREC "ptr"); StgTSO_trec(CurrentTSO) = trec; R1 = StgAtomicallyFrame_code(frame); Sp_adj(-1); @@ -1134,6 +1165,9 @@ atomicallyzh_fast 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); @@ -1147,7 +1181,8 @@ atomicallyzh_fast /* Start the memory transcation */ old_trec = StgTSO_trec(CurrentTSO); - "ptr" new_trec = foreign "C" stmStartTransaction(old_trec "ptr"); + 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 */ @@ -1183,13 +1218,16 @@ catchRetryzh_fast 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(trec "ptr"); + "ptr" new_trec = foreign "C" stmStartTransaction(BaseReg "ptr", trec "ptr"); StgTSO_trec(CurrentTSO) = new_trec; /* Set up the catch-retry frame */ @@ -1232,7 +1270,7 @@ retry_pop_stack: ASSERT(outer != NO_TREC); if (!StgCatchRetryFrame_running_alt_code(frame)) { // Retry in the first code: try the alternative - "ptr" trec = foreign "C" stmStartTransaction(outer "ptr"); + "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); @@ -1242,9 +1280,9 @@ retry_pop_stack: // Retry in the alternative code: propagate W_ other_trec; other_trec = StgCatchRetryFrame_first_code_trec(frame); - r = foreign "C" stmMergeForWaiting(trec "ptr", other_trec "ptr"); + r = foreign "C" stmCommitNestedTransaction(BaseReg "ptr", other_trec "ptr"); if (r) { - r = foreign "C" stmCommitTransaction(trec "ptr"); + r = foreign "C" stmCommitNestedTransaction(BaseReg "ptr", trec "ptr"); } if (r) { // Merge between siblings succeeded: commit it back to enclosing transaction @@ -1254,7 +1292,7 @@ retry_pop_stack: goto retry_pop_stack; } else { // Merge failed: we musn't propagate the retry. Try both paths again. - "ptr" trec = foreign "C" stmStartTransaction(outer "ptr"); + "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; @@ -1268,7 +1306,7 @@ retry_pop_stack: // We've reached the ATOMICALLY_FRAME: attempt to wait ASSERT(frame_type == ATOMICALLY_FRAME); ASSERT(outer == NO_TREC); - r = foreign "C" stmWait(CurrentTSO "ptr", trec "ptr"); + 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 @@ -1280,7 +1318,7 @@ retry_pop_stack: jump stg_block_noregs; } else { // Transaction was not valid: retry immediately - "ptr" trec = foreign "C" stmStartTransaction(outer "ptr"); + "ptr" trec = foreign "C" stmStartTransaction(BaseReg "ptr", outer "ptr"); StgTSO_trec(CurrentTSO) = trec; R1 = StgAtomicallyFrame_code(frame); Sp = frame; @@ -1293,15 +1331,13 @@ retry_pop_stack: newTVarzh_fast { W_ tv; + W_ new_value; /* Args: R1 = initialisation value */ - ALLOC_PRIM( SIZEOF_StgTVar, R1_PTR, newTVarzh_fast); - tv = Hp - SIZEOF_StgTVar + WDS(1); - SET_HDR(tv,stg_TVAR_info,W_[CCCS]); - StgTVar_current_value(tv) = R1; - StgTVar_first_wait_queue_entry(tv) = stg_END_STM_WAIT_QUEUE_closure; - + MAYBE_GC (R1_PTR, newTVarzh_fast); + new_value = R1; + tv = foreign "C" stmNewTVar(BaseReg "ptr", new_value "ptr"); RET_P(tv); } @@ -1317,7 +1353,7 @@ readTVarzh_fast MAYBE_GC (R1_PTR, readTVarzh_fast); // Call to stmReadTVar may allocate trec = StgTSO_trec(CurrentTSO); tvar = R1; - "ptr" result = foreign "C" stmReadTVar(trec "ptr", tvar "ptr"); + "ptr" result = foreign "C" stmReadTVar(BaseReg "ptr", trec "ptr", tvar "ptr"); RET_P(result); } @@ -1336,7 +1372,7 @@ writeTVarzh_fast trec = StgTSO_trec(CurrentTSO); tvar = R1; new_value = R2; - foreign "C" stmWriteTVar(trec "ptr", tvar "ptr", new_value "ptr"); + foreign "C" stmWriteTVar(BaseReg "ptr", trec "ptr", tvar "ptr", new_value "ptr"); jump %ENTRY_CODE(Sp(0)); } @@ -1416,7 +1452,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; @@ -1424,7 +1459,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. @@ -1465,20 +1504,27 @@ takeMVarzh_fast "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); } } @@ -1492,9 +1538,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 */ @@ -1505,6 +1558,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 */ @@ -1526,16 +1580,19 @@ tryTakeMVarzh_fast 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); @@ -1549,7 +1606,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) { @@ -1566,6 +1627,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); @@ -1587,14 +1649,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)); } @@ -1609,13 +1678,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); @@ -1637,14 +1714,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)); } @@ -1665,15 +1749,15 @@ makeStableNamezh_fast 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); @@ -1694,7 +1778,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); }