X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FPrimOps.hc;h=a860dc886da16f7a1d23115bf057d8eb599d0ad4;hb=49c120b93b0688863d46582eee6b20bfbed6c077;hp=aba7ed7e708029be353f58fde1098594f4dfdf90;hpb=662555be652742eed5e26898ad53c8c98b285cb7;p=ghc-hetmet.git diff --git a/ghc/rts/PrimOps.hc b/ghc/rts/PrimOps.hc index aba7ed7..a860dc8 100644 --- a/ghc/rts/PrimOps.hc +++ b/ghc/rts/PrimOps.hc @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: PrimOps.hc,v 1.91 2002/01/29 16:24:08 simonmar Exp $ + * $Id: PrimOps.hc,v 1.102 2002/10/22 11:01:19 simonmar Exp $ * * (c) The GHC Team, 1998-2000 * @@ -22,6 +22,12 @@ #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,40 +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); \ - size = sizeofW(StgArrWords)+ stuff_size; \ - p = (StgArrWords *)RET_STGCALL1(P_,allocatePinned,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) @@ -327,6 +350,60 @@ 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 -------------------------------------------------------------------------- */ @@ -774,11 +851,14 @@ FN_(gcdIntzh_fast) { /* R1 = the first Int#; R2 = the second Int# */ mp_limb_t aa; - I_ r; + 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)); - RET_N(r); + + R1.i = r; + /* Result parked in R1, return via info-pointer at TOS */ + JMP_(ENTRY_CODE(Sp[0])); FE_ } @@ -787,8 +867,11 @@ FN_(gcdIntegerIntzh_fast) /* R1 = s1; R2 = d1; R3 = the int */ I_ r; FB_ - r = RET_STGCALL3(I_,mpn_gcd_1,(mp_limb_t *)(BYTE_ARR_CTS(R2.p)), R1.i, R3.i); - RET_N(r); + 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_ } @@ -814,24 +897,26 @@ FN_(cmpIntegerIntzh_fast) } if (usize != vsize) { - RET_N(usize - vsize); + R1.i = usize - vsize; JMP_(ENTRY_CODE(Sp[0])); } if (usize == 0) { - RET_N(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) { - RET_N(0); + R1.i = 0; JMP_(ENTRY_CODE(Sp[0])); } if (u_digit > (mp_limb_t) (unsigned long) v_digit) { - RET_N(usize); + R1.i = usize; } else { - RET_N(-usize); + R1.i = -usize; } + + JMP_(ENTRY_CODE(Sp[0])); FE_ } @@ -850,11 +935,11 @@ FN_(cmpIntegerzh_fast) vsize = R3.i; if (usize != vsize) { - RET_N(usize - vsize); + R1.i = usize - vsize; JMP_(ENTRY_CODE(Sp[0])); } if (usize == 0) { - RET_N(0); + R1.i = 0; JMP_(ENTRY_CODE(Sp[0])); } size = abs(usize); @@ -865,14 +950,16 @@ FN_(cmpIntegerzh_fast) cmp = RET_STGCALL3(I_, mpn_cmp, (mp_limb_t *)up, (mp_limb_t *)vp, size); if (cmp == 0) { - RET_N(0); + R1.i = 0; JMP_(ENTRY_CODE(Sp[0])); } if ((cmp < 0) == (usize < 0)) { - RET_N(1); + R1.i = 1; } else { - RET_N(-1); + R1.i = (-1); } + /* Result parked in R1, return via info-pointer at TOS */ + JMP_(ENTRY_CODE(Sp[0])); FE_ } @@ -888,7 +975,9 @@ FN_(integer2Intzh_fast) r = ((mp_limb_t *) (BYTE_ARR_CTS(R2.p)))[0]; if (s < 0) r = -r; } - RET_N(r); + /* Result parked in R1, return via info-pointer at TOS */ + R1.i = r; + JMP_(ENTRY_CODE(Sp[0])); FE_ } @@ -905,7 +994,9 @@ FN_(integer2Wordzh_fast) r = ((mp_limb_t *) (BYTE_ARR_CTS(R2.p)))[0]; if (s < 0) r = -r; } - RET_N(r); + /* Result parked in R1, return via info-pointer at TOS */ + R1.w = r; + JMP_(ENTRY_CODE(Sp[0])); FE_ } @@ -985,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_ } @@ -1002,6 +1108,28 @@ 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 * @@ -1067,10 +1195,19 @@ FN_(newMVarzh_fast) FE_ } -#define PerformTake(tso, value) ({ \ - (tso)->sp[1] = (W_)value; \ +/* 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]; \