X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FPrimOps.hc;h=a860dc886da16f7a1d23115bf057d8eb599d0ad4;hb=6e5df3a4551b8d8b83e936b3f7b52edfc778ca8a;hp=711f53802c5899d284a96433ed514cada044552e;hpb=6d35596c37601a9bf608e32034c390d516454c29;p=ghc-hetmet.git diff --git a/ghc/rts/PrimOps.hc b/ghc/rts/PrimOps.hc index 711f538..a860dc8 100644 --- a/ghc/rts/PrimOps.hc +++ b/ghc/rts/PrimOps.hc @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: PrimOps.hc,v 1.71 2001/02/11 17:51:07 simonmar Exp $ + * $Id: PrimOps.hc,v 1.102 2002/10/22 11:01:19 simonmar Exp $ * * (c) The GHC Team, 1998-2000 * @@ -7,6 +7,7 @@ * * ---------------------------------------------------------------------------*/ +#include "Stg.h" #include "Rts.h" #include "RtsFlags.h" @@ -17,11 +18,16 @@ #include "Storage.h" #include "BlockAlloc.h" /* tmp */ #include "StablePriv.h" -#include "HeapStackCheck.h" #include "StgRun.h" #include "Itimer.h" #include "Prelude.h" +#ifdef HAVE_SYS_TYPES_H +# include +#endif + +#include + /* ** temporary ** classes CCallable and CReturnable don't really exist, but the @@ -244,22 +250,57 @@ StgWord GHC_ZCCReturnable_static_info[1]; #define BYTES_TO_STGWORDS(n) ((n) + sizeof(W_) - 1)/sizeof(W_) -FN_(newByteArrayzh_fast) \ - { \ - W_ size, stuff_size, n; \ - StgArrWords* p; \ - FB_ \ - MAYBE_GC(NO_PTRS,newByteArrayzh_fast); \ - n = R1.w; \ - stuff_size = BYTES_TO_STGWORDS(n); \ - size = sizeofW(StgArrWords)+ stuff_size; \ - p = (StgArrWords *)RET_STGCALL1(P_,allocate,size); \ - TICK_ALLOC_PRIM(sizeofW(StgArrWords),stuff_size,0); \ - SET_HDR(p, &stg_ARR_WORDS_info, CCCS); \ - p->words = stuff_size; \ - TICK_RET_UNBOXED_TUP(1) \ - RET_P(p); \ - FE_ \ +FN_(newByteArrayzh_fast) + { + W_ size, stuff_size, n; + StgArrWords* p; + FB_ + MAYBE_GC(NO_PTRS,newByteArrayzh_fast); + n = R1.w; + stuff_size = BYTES_TO_STGWORDS(n); + size = sizeofW(StgArrWords)+ stuff_size; + p = (StgArrWords *)RET_STGCALL1(P_,allocate,size); + TICK_ALLOC_PRIM(sizeofW(StgArrWords),stuff_size,0); + SET_HDR(p, &stg_ARR_WORDS_info, CCCS); + p->words = stuff_size; + TICK_RET_UNBOXED_TUP(1) + RET_P(p); + FE_ + } + +FN_(newPinnedByteArrayzh_fast) + { + W_ size, stuff_size, n; + StgArrWords* p; + FB_ + MAYBE_GC(NO_PTRS,newPinnedByteArrayzh_fast); + n = R1.w; + stuff_size = BYTES_TO_STGWORDS(n); + + // We want an 8-byte aligned array. allocatePinned() gives us + // 8-byte aligned memory by default, but we want to align the + // *goods* inside the ArrWords object, so we have to check the + // size of the ArrWords header and adjust our size accordingly. + size = sizeofW(StgArrWords)+ stuff_size; + if ((sizeof(StgArrWords) & 7) != 0) { + size++; + } + + p = (StgArrWords *)RET_STGCALL1(P_,allocatePinned,size); + TICK_ALLOC_PRIM(sizeofW(StgArrWords),stuff_size,0); + + // Again, if the ArrWords header isn't a multiple of 8 bytes, we + // have to push the object forward one word so that the goods + // fall on an 8-byte boundary. + if ((sizeof(StgArrWords) & 7) != 0) { + ((StgPtr)p)++; + } + + SET_HDR(p, &stg_ARR_WORDS_info, CCCS); + p->words = stuff_size; + TICK_RET_UNBOXED_TUP(1) + RET_P(p); + FE_ } FN_(newArrayzh_fast) @@ -309,12 +350,64 @@ FN_(newMutVarzh_fast) FE_ } +FN_(atomicModifyMutVarzh_fast) +{ + StgMutVar* mv; + StgClosure *z, *x, *y, *r; + FB_ + /* Args: R1.p :: MutVar#, R2.p :: a -> (a,b) */ + + /* If x is the current contents of the MutVar#, then + We want to make the new contents point to + + (sel_0 (f x)) + + and the return value is + + (sel_1 (f x)) + + obviously we can share (f x). + + z = [stg_ap_2 f x] (max (HS + 2) MIN_UPD_SIZE) + y = [stg_sel_0 z] (max (HS + 1) MIN_UPD_SIZE) + r = [stg_sel_1 z] (max (HS + 1) MIN_UPD_SIZE) + */ + +#define THUNK_SIZE(n) (sizeofW(StgHeader) + stg_max((n), MIN_UPD_SIZE)) +#define SIZE (THUNK_SIZE(2) + THUNK_SIZE(1) + THUNK_SIZE(1)) + + HP_CHK_GEN_TICKY(SIZE, R1_PTR|R2_PTR, atomicModifyMutVarzh_fast,); + CCS_ALLOC(CCCS,SIZE); + + x = ((StgMutVar *)R1.cl)->var; + + TICK_ALLOC_UP_THK(2,0); // XXX + z = (StgClosure *) Hp - THUNK_SIZE(2) + 1; + SET_HDR(z, &stg_ap_2_upd_info, CCCS); + z->payload[0] = R2.cl; + z->payload[1] = x; + + TICK_ALLOC_UP_THK(1,1); // XXX + y = (StgClosure *) (StgPtr)z - THUNK_SIZE(1); + SET_HDR(y, &stg_sel_0_upd_info, CCCS); + y->payload[0] = z; + + ((StgMutVar *)R1.cl)->var = y; + + TICK_ALLOC_UP_THK(1,1); // XXX + r = (StgClosure *) (StgPtr)y - THUNK_SIZE(1); + SET_HDR(r, &stg_sel_1_upd_info, CCCS); + r->payload[0] = z; + + RET_P(r); + JMP_(ENTRY_CODE(Sp[0])); + FE_ +} + /* ----------------------------------------------------------------------------- Foreign Object Primitives - -------------------------------------------------------------------------- */ -#ifndef PAR FN_(mkForeignObjzh_fast) { /* R1.p = ptr to foreign object, @@ -336,7 +429,6 @@ FN_(mkForeignObjzh_fast) RET_P(result); FE_ } -#endif /* These two are out-of-line for the benefit of the NCG */ FN_(unsafeThawArrayzh_fast) @@ -354,8 +446,6 @@ FN_(unsafeThawArrayzh_fast) Weak Pointer Primitives -------------------------------------------------------------------------- */ -#ifndef PAR - FN_(mkWeakzh_fast) { /* R1.p = key @@ -406,7 +496,25 @@ FN_(finalizzeWeakzh_fast) } /* kill it */ +#ifdef PROFILING + // @LDV profiling + // A weak pointer is inherently used, so we do not need to call + // LDV_recordDead_FILL_SLOP_DYNAMIC(): + // LDV_recordDead_FILL_SLOP_DYNAMIC((StgClosure *)w); + // or, LDV_recordDead(): + // LDV_recordDead((StgClosure *)w, sizeofW(StgWeak) - sizeofW(StgProfHeader)); + // Furthermore, when PROFILING is turned on, dead weak pointers are exactly as + // large as weak pointers, so there is no need to fill the slop, either. + // See stg_DEAD_WEAK_info in StgMiscClosures.hc. +#endif + // + // Todo: maybe use SET_HDR() and remove LDV_recordCreate()? + // w->header.info = &stg_DEAD_WEAK_info; +#ifdef PROFILING + // @LDV profiling + LDV_recordCreate((StgClosure *)w); +#endif f = ((StgWeak *)w)->finalizer; w->link = ((StgWeak *)w)->link; @@ -419,7 +527,24 @@ FN_(finalizzeWeakzh_fast) FE_ } -#endif /* !PAR */ +FN_(deRefWeakzh_fast) +{ + /* R1.p = weak ptr */ + StgWeak* w; + I_ code; + P_ val; + FB_ + w = (StgWeak*)R1.p; + if (w->header.info == &stg_WEAK_info) { + code = 1; + val = (P_)((StgWeak *)w)->value; + } else { + code = 0; + val = (P_)w; + } + RET_NP(code,val); + FE_ +} /* ----------------------------------------------------------------------------- Arbitrary-precision Integer operations. @@ -530,12 +655,12 @@ FN_(int64ToIntegerzh_fast) if ( val < 0LL ) { neg = 1; val = -val; - } + } hi = (W_)((LW_)val / 0x100000000ULL); if ( words_needed == 2 ) { - s = 2; + s = 2; Hp[-1] = (W_)val; Hp[0] = hi; } else if ( val != 0 ) { @@ -600,7 +725,7 @@ FN_(word64ToIntegerzh_fast) } -#endif /* HAVE_LONG_LONG */ +#endif /* SUPPORT_LONG_LONGS */ /* ToDo: this is shockingly inefficient */ @@ -721,6 +846,161 @@ GMP_TAKE1_RET1(complementIntegerzh_fast, mpz_com); GMP_TAKE2_RET2(quotRemIntegerzh_fast, mpz_tdiv_qr); GMP_TAKE2_RET2(divModIntegerzh_fast, mpz_fdiv_qr); + +FN_(gcdIntzh_fast) +{ + /* R1 = the first Int#; R2 = the second Int# */ + mp_limb_t aa; + I_ r; + FB_ + aa = (mp_limb_t)(R1.i); + r = RET_STGCALL3(StgInt, mpn_gcd_1, (mp_limb_t *)(&aa), 1, (mp_limb_t)(R2.i)); + + R1.i = r; + /* Result parked in R1, return via info-pointer at TOS */ + JMP_(ENTRY_CODE(Sp[0])); + FE_ +} + +FN_(gcdIntegerIntzh_fast) +{ + /* R1 = s1; R2 = d1; R3 = the int */ + I_ r; + FB_ + r = RET_STGCALL3(StgInt,mpn_gcd_1,(mp_limb_t *)(BYTE_ARR_CTS(R2.p)), R1.i, R3.i); + + R1.i = r; + /* Result parked in R1, return via info-pointer at TOS */ + JMP_(ENTRY_CODE(Sp[0])); + FE_ +} + +FN_(cmpIntegerIntzh_fast) +{ + /* R1 = s1; R2 = d1; R3 = the int */ + I_ usize; + I_ vsize; + I_ v_digit; + mp_limb_t u_digit; + FB_ + + usize = R1.i; + vsize = 0; + v_digit = R3.i; + + // paraphrased from mpz_cmp_si() in the GMP sources + if (v_digit > 0) { + vsize = 1; + } else if (v_digit < 0) { + vsize = -1; + v_digit = -v_digit; + } + + if (usize != vsize) { + R1.i = usize - vsize; JMP_(ENTRY_CODE(Sp[0])); + } + + if (usize == 0) { + R1.i = 0; JMP_(ENTRY_CODE(Sp[0])); + } + + u_digit = *(mp_limb_t *)(BYTE_ARR_CTS(R2.p)); + + if (u_digit == (mp_limb_t) (unsigned long) v_digit) { + R1.i = 0; JMP_(ENTRY_CODE(Sp[0])); + } + + if (u_digit > (mp_limb_t) (unsigned long) v_digit) { + R1.i = usize; + } else { + R1.i = -usize; + } + + JMP_(ENTRY_CODE(Sp[0])); + FE_ +} + +FN_(cmpIntegerzh_fast) +{ + /* R1 = s1; R2 = d1; R3 = s2; R4 = d2 */ + I_ usize; + I_ vsize; + I_ size; + StgPtr up, vp; + int cmp; + FB_ + + // paraphrased from mpz_cmp() in the GMP sources + usize = R1.i; + vsize = R3.i; + + if (usize != vsize) { + R1.i = usize - vsize; JMP_(ENTRY_CODE(Sp[0])); + } + + if (usize == 0) { + R1.i = 0; JMP_(ENTRY_CODE(Sp[0])); + } + + size = abs(usize); + + up = BYTE_ARR_CTS(R2.p); + vp = BYTE_ARR_CTS(R4.p); + + cmp = RET_STGCALL3(I_, mpn_cmp, (mp_limb_t *)up, (mp_limb_t *)vp, size); + + if (cmp == 0) { + R1.i = 0; JMP_(ENTRY_CODE(Sp[0])); + } + + if ((cmp < 0) == (usize < 0)) { + R1.i = 1; + } else { + R1.i = (-1); + } + /* Result parked in R1, return via info-pointer at TOS */ + JMP_(ENTRY_CODE(Sp[0])); + FE_ +} + +FN_(integer2Intzh_fast) +{ + /* R1 = s; R2 = d */ + I_ r, s; + FB_ + s = R1.i; + if (s == 0) + r = 0; + else { + r = ((mp_limb_t *) (BYTE_ARR_CTS(R2.p)))[0]; + if (s < 0) r = -r; + } + /* Result parked in R1, return via info-pointer at TOS */ + R1.i = r; + JMP_(ENTRY_CODE(Sp[0])); + FE_ +} + +FN_(integer2Wordzh_fast) +{ + /* R1 = s; R2 = d */ + I_ s; + W_ r; + FB_ + s = R1.i; + if (s == 0) + r = 0; + else { + r = ((mp_limb_t *) (BYTE_ARR_CTS(R2.p)))[0]; + if (s < 0) r = -r; + } + /* Result parked in R1, return via info-pointer at TOS */ + R1.w = r; + JMP_(ENTRY_CODE(Sp[0])); + FE_ +} + + FN_(decodeFloatzh_fast) { MP_INT mantissa; @@ -796,13 +1076,28 @@ FN_(forkzh_fast) /* create it right now, return ThreadID in R1 */ R1.t = RET_STGCALL2(StgTSO *, createIOThread, - RtsFlags.GcFlags.initialStkSize, R1.cl); + RtsFlags.GcFlags.initialStkSize, R1.cl); STGCALL1(scheduleThread, R1.t); /* switch at the earliest opportunity */ context_switch = 1; + RET_P(R1.t); + FE_ +} + +FN_(forkProcesszh_fast) +{ + pid_t pid; + + FB_ + /* args: none */ + /* result: Pid */ + + R1.i = RET_STGCALL1(StgInt, forkProcess, CurrentTSO); + JMP_(ENTRY_CODE(Sp[0])); + FE_ } @@ -813,6 +1108,71 @@ FN_(yieldzh_fast) FE_ } +FN_(myThreadIdzh_fast) +{ + /* no args. */ + FB_ + RET_P((P_)CurrentTSO); + FE_ +} + +FN_(labelThreadzh_fast) +{ + FB_ + /* args: + R1.p = ThreadId# + R2.p = Addr# */ +#ifdef DEBUG + STGCALL2(labelThread,R1.p,(char *)R2.p); +#endif + JMP_(ENTRY_CODE(Sp[0])); + FE_ +} + + +/* ----------------------------------------------------------------------------- + * MVar primitives + * + * take & putMVar work as follows. Firstly, an important invariant: + * + * If the MVar is full, then the blocking queue contains only + * threads blocked on putMVar, and if the MVar is empty then the + * blocking queue contains only threads blocked on takeMVar. + * + * takeMvar: + * MVar empty : then add ourselves to the blocking queue + * MVar full : remove the value from the MVar, and + * blocking queue empty : return + * blocking queue non-empty : perform the first blocked putMVar + * from the queue, and wake up the + * thread (MVar is now full again) + * + * putMVar is just the dual of the above algorithm. + * + * How do we "perform a putMVar"? Well, we have to fiddle around with + * the stack of the thread waiting to do the putMVar. See + * stg_block_putmvar and stg_block_takemvar in HeapStackCheck.c for + * the stack layout, and the PerformPut and PerformTake macros below. + * + * It is important that a blocked take or put is woken up with the + * take/put already performed, because otherwise there would be a + * small window of vulnerability where the thread could receive an + * exception and never perform its take or put, and we'd end up with a + * deadlock. + * + * -------------------------------------------------------------------------- */ + +FN_(isEmptyMVarzh_fast) +{ + /* args: R1 = MVar closure */ + I_ r; + FB_ + r = (I_)((GET_INFO((StgMVar*)(R1.p))) == &stg_EMPTY_MVAR_info); + RET_N(r); + FE_ +} + + FN_(newMVarzh_fast) { StgMVar *mvar; @@ -835,6 +1195,27 @@ FN_(newMVarzh_fast) FE_ } +/* If R1 isn't available, pass it on the stack */ +#ifdef REG_R1 +#define PerformTake(tso, value) ({ \ + (tso)->sp[1] = (W_)value; \ + (tso)->sp[0] = (W_)&stg_gc_unpt_r1_info; \ + }) +#else +#define PerformTake(tso, value) ({ \ + (tso)->sp[1] = (W_)value; \ + (tso)->sp[0] = (W_)&stg_ut_1_0_unreg_info; \ + }) +#endif + + +#define PerformPut(tso) ({ \ + StgClosure *val = (StgClosure *)(tso)->sp[2]; \ + (tso)->sp[2] = (W_)&stg_gc_noregs_info; \ + (tso)->sp += 2; \ + val; \ + }) + FN_(takeMVarzh_fast) { StgMVar *mvar; @@ -870,19 +1251,47 @@ FN_(takeMVarzh_fast) /* unlock the MVar */ mvar->header.info = &stg_EMPTY_MVAR_info; #endif - BLOCK(R1_PTR, takeMVarzh_fast); + JMP_(stg_block_takemvar); } + /* we got the value... */ val = mvar->value; - mvar->value = (StgClosure *)&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. - */ - SET_INFO(mvar,&stg_EMPTY_MVAR_info); + if (mvar->head != (StgTSO *)&stg_END_TSO_QUEUE_closure) { + /* There are putMVar(s) waiting... + * wake up the first thread on the queue + */ + ASSERT(mvar->head->why_blocked == BlockedOnMVar); - TICK_RET_UNBOXED_TUP(1); - RET_P(val); + /* actually perform the putMVar for the thread that we just woke up */ + mvar->value = PerformPut(mvar->head); + +#if defined(GRAN) || defined(PAR) + /* ToDo: check 2nd arg (mvar) is right */ + mvar->head = RET_STGCALL2(StgTSO *,unblockOne,mvar->head,mvar); +#else + mvar->head = RET_STGCALL1(StgTSO *,unblockOne,mvar->head); +#endif + if (mvar->head == (StgTSO *)&stg_END_TSO_QUEUE_closure) { + mvar->tail = (StgTSO *)&stg_END_TSO_QUEUE_closure; + } +#ifdef SMP + /* unlock in the SMP case */ + SET_INFO(mvar,&stg_FULL_MVAR_info); +#endif + TICK_RET_UNBOXED_TUP(1); + 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); + mvar->value = (StgClosure *)&stg_END_TSO_QUEUE_closure; + TICK_RET_UNBOXED_TUP(1); + RET_P(val); + } FE_ } @@ -906,24 +1315,53 @@ FN_(tryTakeMVarzh_fast) if (info == &stg_EMPTY_MVAR_info) { #ifdef SMP - /* unlock the MVar */ - mvar->header.info = &stg_EMPTY_MVAR_info; + /* unlock the MVar */ + SET_INFO(mvar,&stg_EMPTY_MVAR_info); #endif - /* HACK: we need a pointer to pass back, so we abuse NO_FINALIZER_closure */ - RET_NP(0, &stg_NO_FINALIZER_closure); + /* HACK: we need a pointer to pass back, + * so we abuse NO_FINALIZER_closure + */ + RET_NP(0, &stg_NO_FINALIZER_closure); } + /* we got the value... */ val = mvar->value; - mvar->value = (StgClosure *)&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. - */ - SET_INFO(mvar,&stg_EMPTY_MVAR_info); + if (mvar->head != (StgTSO *)&stg_END_TSO_QUEUE_closure) { + /* There are putMVar(s) waiting... + * wake up the first thread on the queue + */ + ASSERT(mvar->head->why_blocked == BlockedOnMVar); + + /* actually perform the putMVar for the thread that we just woke up */ + mvar->value = PerformPut(mvar->head); + +#if defined(GRAN) || defined(PAR) + /* ToDo: check 2nd arg (mvar) is right */ + mvar->head = RET_STGCALL2(StgTSO *,unblockOne,mvar->head,mvar); +#else + mvar->head = RET_STGCALL1(StgTSO *,unblockOne,mvar->head); +#endif + if (mvar->head == (StgTSO *)&stg_END_TSO_QUEUE_closure) { + mvar->tail = (StgTSO *)&stg_END_TSO_QUEUE_closure; + } +#ifdef SMP + /* unlock in the SMP case */ + SET_INFO(mvar,&stg_FULL_MVAR_info); +#endif + } else { + /* No further putMVars, MVar is now empty */ + mvar->value = (StgClosure *)&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. + */ + SET_INFO(mvar,&stg_EMPTY_MVAR_info); + } TICK_RET_UNBOXED_TUP(1); - RET_NP(1,val); + RET_NP((I_)1, val); FE_ } @@ -944,35 +1382,114 @@ FN_(putMVarzh_fast) #endif if (info == &stg_FULL_MVAR_info) { - R1.cl = (StgClosure *)PutFullMVar_closure; - JMP_(raisezh_fast); + if (mvar->head == (StgTSO *)&stg_END_TSO_QUEUE_closure) { + mvar->head = CurrentTSO; + } else { + mvar->tail->link = CurrentTSO; + } + CurrentTSO->link = (StgTSO *)&stg_END_TSO_QUEUE_closure; + CurrentTSO->why_blocked = BlockedOnMVar; + CurrentTSO->block_info.closure = (StgClosure *)mvar; + mvar->tail = CurrentTSO; + +#ifdef SMP + /* unlock the MVar */ + SET_INFO(mvar,&stg_FULL_MVAR_info); +#endif + JMP_(stg_block_putmvar); } - mvar->value = R2.cl; - - /* wake up the first thread on the queue, it will continue with the - * takeMVar operation and mark the MVar empty again. - */ if (mvar->head != (StgTSO *)&stg_END_TSO_QUEUE_closure) { - ASSERT(mvar->head->why_blocked == BlockedOnMVar); -#if defined(GRAN) - mvar->head = RET_STGCALL2(StgTSO *,unblockOne,mvar->head,mvar); -#elif defined(PAR) - // ToDo: check 2nd arg (mvar) is right - mvar->head = RET_STGCALL2(StgTSO *,unblockOne,mvar->head,mvar); + /* There are takeMVar(s) waiting: wake up the first one + */ + ASSERT(mvar->head->why_blocked == BlockedOnMVar); + + /* actually perform the takeMVar */ + PerformTake(mvar->head, R2.cl); + +#if defined(GRAN) || defined(PAR) + /* ToDo: check 2nd arg (mvar) is right */ + mvar->head = RET_STGCALL2(StgTSO *,unblockOne,mvar->head,mvar); #else - mvar->head = RET_STGCALL1(StgTSO *,unblockOne,mvar->head); + mvar->head = RET_STGCALL1(StgTSO *,unblockOne,mvar->head); #endif - if (mvar->head == (StgTSO *)&stg_END_TSO_QUEUE_closure) { - mvar->tail = (StgTSO *)&stg_END_TSO_QUEUE_closure; - } + if (mvar->head == (StgTSO *)&stg_END_TSO_QUEUE_closure) { + mvar->tail = (StgTSO *)&stg_END_TSO_QUEUE_closure; + } +#ifdef SMP + /* unlocks the MVar in the SMP case */ + SET_INFO(mvar,&stg_EMPTY_MVAR_info); +#endif + JMP_(ENTRY_CODE(Sp[0])); + } else { + /* No further takes, the MVar is now full. */ + mvar->value = R2.cl; + /* unlocks the MVar in the SMP case */ + SET_INFO(mvar,&stg_FULL_MVAR_info); + JMP_(ENTRY_CODE(Sp[0])); } - /* unlocks the MVar in the SMP case */ - SET_INFO(mvar,&stg_FULL_MVAR_info); + /* ToDo: yield afterward for better communication performance? */ + FE_ +} - /* ToDo: yield here for better communication performance? */ - JMP_(ENTRY_CODE(Sp[0])); +FN_(tryPutMVarzh_fast) +{ + StgMVar *mvar; + const StgInfoTable *info; + + FB_ + /* args: R1 = MVar, R2 = value */ + + mvar = (StgMVar *)R1.p; + +#ifdef SMP + info = LOCK_CLOSURE(mvar); +#else + info = GET_INFO(mvar); +#endif + + if (info == &stg_FULL_MVAR_info) { + +#ifdef SMP + /* unlock the MVar */ + mvar->header.info = &stg_FULL_MVAR_info; +#endif + + RET_N(0); + } + + if (mvar->head != (StgTSO *)&stg_END_TSO_QUEUE_closure) { + /* There are takeMVar(s) waiting: wake up the first one + */ + ASSERT(mvar->head->why_blocked == BlockedOnMVar); + + /* actually perform the takeMVar */ + PerformTake(mvar->head, R2.cl); + +#if defined(GRAN) || defined(PAR) + /* ToDo: check 2nd arg (mvar) is right */ + mvar->head = RET_STGCALL2(StgTSO *,unblockOne,mvar->head,mvar); +#else + mvar->head = RET_STGCALL1(StgTSO *,unblockOne,mvar->head); +#endif + if (mvar->head == (StgTSO *)&stg_END_TSO_QUEUE_closure) { + mvar->tail = (StgTSO *)&stg_END_TSO_QUEUE_closure; + } +#ifdef SMP + /* unlocks the MVar in the SMP case */ + SET_INFO(mvar,&stg_EMPTY_MVAR_info); +#endif + JMP_(ENTRY_CODE(Sp[0])); + } else { + /* No further takes, the MVar is now full. */ + mvar->value = R2.cl; + /* unlocks the MVar in the SMP case */ + SET_INFO(mvar,&stg_FULL_MVAR_info); + JMP_(ENTRY_CODE(Sp[0])); + } + + /* ToDo: yield afterward for better communication performance? */ FE_ } @@ -996,7 +1513,7 @@ FN_(makeStableNamezh_fast) /* Is there already a StableName for this heap object? */ if (stable_ptr_table[index].sn_obj == NULL) { sn_obj = (StgStableName *) (Hp - sizeofW(StgStableName) + 1); - sn_obj->header.info = &stg_STABLE_NAME_info; + SET_HDR(sn_obj,&stg_STABLE_NAME_info,CCCS); sn_obj->sn = index; stable_ptr_table[index].sn_obj = (StgClosure *)sn_obj; } else { @@ -1007,6 +1524,30 @@ FN_(makeStableNamezh_fast) RET_P(sn_obj); } + +FN_(makeStablePtrzh_fast) +{ + /* Args: R1 = a */ + StgStablePtr sp; + FB_ + MAYBE_GC(R1_PTR, makeStablePtrzh_fast); + sp = RET_STGCALL1(StgStablePtr,getStablePtr,R1.p); + RET_N(sp); + FE_ +} + +FN_(deRefStablePtrzh_fast) +{ + /* Args: R1 = the stable ptr */ + P_ r; + StgStablePtr sp; + FB_ + sp = (StgStablePtr)R1.w; + r = stable_ptr_table[(StgWord)sp].addr; + RET_P(r); + FE_ +} + /* ----------------------------------------------------------------------------- Bytecode object primitives ------------------------------------------------------------------------- */